GPL+Qt license support.
Brad Hards
bhards at bigpond.net.au
Mon Mar 15 05:14:11 UTC 2004
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
There seems to be some movement to adding a special addition to
the GPL for Qt. It'd be nice if KDevelop supported this - I've done a quick
patch that implements it. This also went to kdevelop at kdevelop.org, but
never showed up - maybe my posting address didn't match my
subscription address?
I'm not very experienced with complex KDE apps (and kdevelop in
particular), so I'd appreciate some feedback on whether this is OK
before I commit it, especially whether to hand-edit the XML UI file
to get it back to the 3.0 version.
Brad
Index: appwizarddlg.cpp
===================================================================
RCS file: /home/kde/kdevelop/parts/appwizard/appwizarddlg.cpp,v
retrieving revision 1.65
diff -u -4 -p -r1.65 appwizarddlg.cpp
- --- appwizarddlg.cpp 23 Jan 2004 15:10:29 -0000 1.65
+++ appwizarddlg.cpp 13 Mar 2004 09:31:53 -0000
@@ -320,8 +320,36 @@ void AppWizardDialog::licenseChanged()
" * You should have received a copy of the GNU Library General Public *\n"
" * License along with this program; if not, write to the *\n"
" * Free Software Foundation, Inc., *\n"
" * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *\n";
+ break;
+ case 4:
+ str +=
+ " * This program is free software; you can redistribute it and/or modify *\n"
+ " * it under the terms of the GNU General Public License as published by *\n"
+ " * the Free Software Foundation; either version 2 of the License, or *\n"
+ " * (at your option) any later version. *\n"
+ " * *\n"
+ " * This program is distributed in the hope that it will be useful, *\n"
+ " * but WITHOUT ANY WARRANTY; without even the implied warranty of *\n"
+ " * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *\n"
+ " * GNU General Public License for more details. *\n"
+ " * *\n"
+ " * You should have received a copy of the GNU General Public License *\n"
+ " * along with this program; if not, write to the *\n"
+ " * Free Software Foundation, Inc., *\n"
+ " * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *\n"
+ " * *\n"
+ " * In addition, as a special exception, the copyright holders give *\n"
+ " * permission to link the code of this program with any edition of *\n"
+ " * the Qt library by Trolltech AS, Norway (or with modified versions *\n"
+ " * of Qt that use the same license as Qt), and distribute linked *\n"
+ " * combinations including the two. You must obey the GNU General *\n"
+ " * Public License in all respects for all of the code used other than *\n"
+ " * Qt. If you modify this file, you may extend this exception to *\n"
+ " * your version of the file, but you are not obligated to do so. If *\n"
+ " * you do not wish to do so, delete this exception statement from *\n"
+ " * your version. *\n";
}
str += " ***************************************************************************/\n";
@@ -413,8 +441,9 @@ void AppWizardDialog::accept()
case 0: licensefile = "COPYING"; break;
case 1: licensefile = "LICENSE.BSD"; break;
case 2: licensefile = "LICENSE.QPL"; break;
case 3: licensefile = "COPYING.LIB"; break;
+ case 4: licensefile = "COPYING"; break;
default: ;
}
QStringList templateFiles;
Index: appwizarddlgbase.ui
===================================================================
RCS file: /home/kde/kdevelop/parts/appwizard/appwizarddlgbase.ui,v
retrieving revision 1.11
diff -u -4 -p -r1.11 appwizarddlgbase.ui
- --- appwizarddlgbase.ui 21 Oct 2003 09:51:05 -0000 1.11
+++ appwizarddlgbase.ui 13 Mar 2004 09:31:53 -0000
@@ -1,5 +1,5 @@
- -<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>AppWizardDialogBase</class>
<widget class="QWizard">
<property name="name">
<cstring>AppWizardDlgBase</cstring>
@@ -25,18 +25,17 @@
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
- -
<widget class="QListView" row="0" column="0" rowspan="2" colspan="1">
<column>
<property name="text">
<string></string>
</property>
<property name="clickable">
<bool>true</bool>
</property>
- - <property name="resizeable">
+ <property name="resizable">
<bool>true</bool>
</property>
</column>
<property name="name">
@@ -146,9 +145,8 @@
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
- -
<widget class="QLabel" row="1" column="0">
<property name="name">
<cstring>location_label</cstring>
</property>
@@ -243,8 +241,13 @@
</property>
</item>
<item>
<property name="text">
+ <string>GPL+Qt Exemption</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
<string>Custom</string>
</property>
</item>
<property name="name">
@@ -292,8 +295,10 @@
</widget>
</grid>
</widget>
</widget>
+<customwidgets>
+</customwidgets>
<connections>
<connection>
<sender>templates_listview</sender>
<signal>selectionChanged(QListViewItem*)</signal>
@@ -363,19 +368,23 @@
<tabstop>email_edit</tabstop>
<tabstop>version_edit</tabstop>
<tabstop>license_combo</tabstop>
</tabstops>
+<includes>
+ <include location="global" impldecl="in implementation">kdialog.h</include>
+ <include location="global" impldecl="in declaration">kurlrequester.h</include>
+</includes>
<slots>
<slot access="protected">licenseChanged()</slot>
<slot access="protected">destButtonClicked(const QString&)</slot>
<slot access="protected">projectLocationChanged()</slot>
<slot access="protected">projectNameChanged()</slot>
<slot access="protected">templatesTreeViewClicked( QListViewItem * )</slot>
<slot access="protected">textChanged()</slot>
</slots>
- -<includes>
- - <include location="global" impldecl="in implementation">kdialog.h</include>
- - <include location="global" impldecl="in declaration">kurlrequester.h</include>
- -</includes>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<includehints>
+ <includehint>klineedit.h</includehint>
+ <includehint>kpushbutton.h</includehint>
+</includehints>
</UI>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (GNU/Linux)
iD8DBQFAVS1xGwwszQ/PZzgRAkj7AKCCVOu9PteK6ye13goXq4YISfKgRgCgiGy2
iSa3PTwLI6AMB0Ql9gUBDg8=
=Qtbs
-----END PGP SIGNATURE-----
More information about the KDevelop-devel
mailing list