diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-09-01 22:43:48 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-09-01 22:43:48 (GMT) |
| commit | b52bfac9d05de835682b9c2b2e1d79e0246e708a (patch) | |
| tree | 456eb1b84771bb619877a9765bb9e431a073eb0b /tools | |
| parent | 93906071c31a5008625e727dad530a6f05441baa (diff) | |
| parent | add57539ec7cd24346e26b22a5298da50d81e91b (diff) | |
| download | Qt-b52bfac9d05de835682b9c2b2e1d79e0246e708a.zip Qt-b52bfac9d05de835682b9c2b2e1d79e0246e708a.tar.gz Qt-b52bfac9d05de835682b9c2b2e1d79e0246e708a.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index e8b810c..e5bfdc6 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3650,10 +3650,14 @@ bool Configure::showLicense(QString orgLicenseFile) return true; } + bool haveGpl3 = false; QString licenseFile = orgLicenseFile; QString theLicense; if (dictionary["EDITION"] == "OpenSource" || dictionary["EDITION"] == "Snapshot") { - theLicense = "GNU General Public License (GPL) version 3 \nor the GNU Lesser General Public License (LGPL) version 2.1"; + haveGpl3 = QFile::exists(orgLicenseFile + "/LICENSE.GPL3"); + theLicense = "GNU Lesser General Public License (LGPL) version 2.1"; + if (haveGpl3) + theLicense += "\nor the GNU General Public License (GPL) version 3"; } else { // the first line of the license file tells us which license it is QFile file(licenseFile); @@ -3670,7 +3674,8 @@ bool Configure::showLicense(QString orgLicenseFile) << "the " << theLicense << "." << endl << endl; if (dictionary["EDITION"] == "OpenSource" || dictionary["EDITION"] == "Snapshot") { - cout << "Type '3' to view the GNU General Public License version 3 (GPLv3)." << endl; + if (haveGpl3) + cout << "Type '3' to view the GNU General Public License version 3 (GPLv3)." << endl; cout << "Type 'L' to view the Lesser GNU General Public License version 2.1 (LGPLv2.1)." << endl; } else { cout << "Type '?' to view the " << theLicense << "." << endl; |