diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-01 16:36:14 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-01 16:36:14 (GMT) |
| commit | e4804c5d3d2e80cc7f57936591374d29478dbb2a (patch) | |
| tree | 76a85948ed5db925fda81028169e8dcde23b52b4 /tools | |
| parent | fc4c4071d6e5704e84a5cca4ae22548bedb7b19d (diff) | |
| parent | b2e91ecd641b9c891ea823cfc647f729af6228e8 (diff) | |
| download | Qt-e4804c5d3d2e80cc7f57936591374d29478dbb2a.zip Qt-e4804c5d3d2e80cc7f57936591374d29478dbb2a.tar.gz Qt-e4804c5d3d2e80cc7f57936591374d29478dbb2a.tar.bz2 | |
Merge branch '4.5' into 4.6
Conflicts:
src/network/access/qnetworkaccessbackend.cpp
src/network/access/qnetworkreplyimpl.cpp
tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
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 5b30b4e..25a4cb4 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3638,10 +3638,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); @@ -3658,7 +3662,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; |