AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure: Remove traces of "Snapshot" edition

Browse Source 
Change-Id: I7f2511e224d848bb820321be5dd190d8b3b8f1c4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Kai Koehne 2015-05-22 15:33:34 +02:00
parent 270313d068
commit e63dde4967
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/configure/configureapp.cpp
View File

@ -4389,7 +4389,7 @@ bool Configure::showLicense(QString orgLicenseFile)
bool showLgpl2 = true; bool showLgpl2 = true;
QString licenseFile = orgLicenseFile; QString licenseFile = orgLicenseFile;
QString theLicense; QString theLicense;
if (dictionary["EDITION"] == "OpenSource" || dictionary["EDITION"] == "Snapshot") { if (dictionary["EDITION"] == "OpenSource") {
if (platform() != ANDROID || dictionary["ANDROID_STYLE_ASSETS"] == "no") { if (platform() != ANDROID || dictionary["ANDROID_STYLE_ASSETS"] == "no") {
theLicense = "GNU Lesser General Public License (LGPL) version 2.1" theLicense = "GNU Lesser General Public License (LGPL) version 2.1"
"\nor the GNU Lesser General Public License (LGPL) version 3"; "\nor the GNU Lesser General Public License (LGPL) version 3";
@ -4412,7 +4412,7 @@ bool Configure::showLicense(QString orgLicenseFile)
cout << "You are licensed to use this software under the terms of" << endl cout << "You are licensed to use this software under the terms of" << endl
<< "the " << theLicense << "." << endl << "the " << theLicense << "." << endl
<< endl; << endl;
if (dictionary["EDITION"] == "OpenSource" || dictionary["EDITION"] == "Snapshot") { if (dictionary["EDITION"] == "OpenSource") {
cout << "Type '3' to view the Lesser GNU General Public License version 3 (LGPLv3)." << endl; cout << "Type '3' to view the Lesser GNU General Public License version 3 (LGPLv3)." << endl;
if (showLgpl2) if (showLgpl2)
cout << "Type 'L' to view the Lesser GNU General Public License version 2.1 (LGPLv2.1)." << endl; cout << "Type 'L' to view the Lesser GNU General Public License version 2.1 (LGPLv2.1)." << endl;
@ -4431,7 +4431,7 @@ bool Configure::showLicense(QString orgLicenseFile)
} else if (accept == 'n') { } else if (accept == 'n') {
return false; return false;
} else { } else {
if (dictionary["EDITION"] == "OpenSource" || dictionary["EDITION"] == "Snapshot") { if (dictionary["EDITION"] == "OpenSource") {
if (accept == '3') if (accept == '3')
licenseFile = orgLicenseFile + "/LICENSE.LGPLv3"; licenseFile = orgLicenseFile + "/LICENSE.LGPLv3";
else else