Qt exemption, redux

[Brad Hards]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I have minimised the patch, and intend to commit in the next few
days unless I get some pushback on this. Now is your chance!

Index: parts/appwizard/appwizarddlg.cpp
===================================================================
RCS file: /home/kde/kdevelop/parts/appwizard/appwizarddlg.cpp,v
retrieving revision 1.65
diff -u -4 -p -r1.65 appwizarddlg.cpp
- --- parts/appwizard/appwizarddlg.cpp    23 Jan 2004 15:10:29 -0000      1.65
+++ parts/appwizard/appwizarddlg.cpp    29 Mar 2004 09:24:23 -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: parts/appwizard/appwizarddlgbase.ui
===================================================================
RCS file: /home/kde/kdevelop/parts/appwizard/appwizarddlgbase.ui,v
retrieving revision 1.11
diff -u -4 -p -r1.11 appwizarddlgbase.ui
- --- parts/appwizard/appwizarddlgbase.ui 21 Oct 2003 09:51:05 -0000      1.11
+++ parts/appwizard/appwizarddlgbase.ui 29 Mar 2004 09:24:23 -0000
@@ -243,8 +243,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">
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (GNU/Linux)

iD8DBQFAZ+vpGwwszQ/PZzgRAm7tAKCFHVhdCSiqmhuheoqcBEp7TBXX8QCeLTvk
bQ12ilhc0mSO7QvzfK3UfAo=
=OLH1
-----END PGP SIGNATURE-----