diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 22 | ||||
| -rw-r--r-- | tools/configure/tools.cpp | 9 |
2 files changed, 4 insertions, 27 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 9995fb179e..fddf99d2da 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2950,9 +2950,6 @@ void Configure::generateCachefile() moduleStream << "}" << endl; moduleStream << "QT_COORD_TYPE += " << dictionary["QREAL"] << endl; - if (dictionary["QT_EDITION"] != "QT_EDITION_OPENSOURCE") - moduleStream << "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" << endl; - if (dictionary["QT_XKBCOMMON"] == "no") moduleStream << "DEFINES += QT_NO_XKBCOMMON" << endl; @@ -3296,10 +3293,6 @@ void Configure::generateQConfigPri() configStream << " QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl; } configStream << "}" << endl; - if (dictionary["QT_EDITION"].contains("OPENSOURCE")) - configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; - else - configStream << "QT_EDITION = " << dictionary["EDITION"] << endl; configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl; configStream << "#versioning " << endl @@ -3398,11 +3391,6 @@ void Configure::generateConfigfiles() tmpStream << "#define QT_PRODUCT_LICENSEE \"" << licenseInfo[ "LICENSEE" ] << "\"" << endl; tmpStream << "#define QT_PRODUCT_LICENSE \"" << dictionary[ "EDITION" ] << "\"" << endl; tmpStream << endl; - tmpStream << "// Qt Edition" << endl; - tmpStream << "#ifndef QT_EDITION" << endl; - tmpStream << "# define QT_EDITION " << dictionary["QT_EDITION"] << endl; - tmpStream << "#endif" << endl; - tmpStream << endl; if (dictionary["BUILDDEV"] == "yes") { dictionary["QMAKE_INTERNAL"] = "yes"; tmpStream << "/* Used for example to export symbols for the certain autotests*/" << endl; @@ -4038,9 +4026,6 @@ void Configure::buildQmake() } else { stream << "QMAKESPEC = " << dictionary["QMAKESPEC"] << endl; } - if (dictionary["EDITION"] == "OpenSource" || - dictionary["QT_EDITION"].contains("OPENSOURCE")) - stream << "EXTRA_CPPFLAGS = -DQMAKE_OPENSOURCE_EDITION" << endl; stream << "\n\n"; @@ -4215,7 +4200,7 @@ bool Configure::showLicense(QString orgLicenseFile) QString licenseFile = orgLicenseFile; QString theLicense; if (dictionary["EDITION"] == "OpenSource" || dictionary["EDITION"] == "Snapshot") { - haveGpl3 = QFile::exists(orgLicenseFile + "/LICENSE.GPL3"); + haveGpl3 = QFile::exists(orgLicenseFile + "/LICENSE.GPL"); theLicense = "GNU Lesser General Public License (LGPL) version 2.1"; if (haveGpl3) theLicense += "\nor the GNU General Public License (GPL) version 3"; @@ -4255,7 +4240,7 @@ bool Configure::showLicense(QString orgLicenseFile) } else { if (dictionary["EDITION"] == "OpenSource" || dictionary["EDITION"] == "Snapshot") { if (accept == '3') - licenseFile = orgLicenseFile + "/LICENSE.GPL3"; + licenseFile = orgLicenseFile + "/LICENSE.GPL"; else licenseFile = orgLicenseFile + "/LICENSE.LGPL"; } @@ -4292,7 +4277,7 @@ void Configure::readLicense() dictionary["LICENSE FILE"] = sourcePath; bool openSource = false; - bool hasOpenSource = QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.GPL3") || QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.LGPL"); + bool hasOpenSource = QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.GPL") || QFile::exists(dictionary["LICENSE FILE"] + "/LICENSE.LGPL"); if (dictionary["BUILDTYPE"] == "commercial") { openSource = false; } else if (dictionary["BUILDTYPE"] == "opensource") { @@ -4319,7 +4304,6 @@ void Configure::readLicense() cout << endl << "This is the " << dictionary["PLATFORM NAME"] << " Open Source Edition." << endl; licenseInfo["LICENSEE"] = "Open Source"; dictionary["EDITION"] = "OpenSource"; - dictionary["QT_EDITION"] = "QT_EDITION_OPENSOURCE"; cout << endl; if (!showLicense(dictionary["LICENSE FILE"])) { cout << "Configuration aborted since license was not accepted"; diff --git a/tools/configure/tools.cpp b/tools/configure/tools.cpp index e9174bf102..07c3c82a0b 100644 --- a/tools/configure/tools.cpp +++ b/tools/configure/tools.cpp @@ -62,14 +62,12 @@ void Tools::checkLicense(QMap<QString,QString> &dictionary, QMap<QString,QString if (QFile::exists(tpLicense)) { dictionary["EDITION"] = "Preview"; dictionary["LICENSE FILE"] = tpLicense; - dictionary["QT_EDITION"] = "QT_EDITION_OPENSOURCE"; return; // No license key checking in Tech Preview } tpLicense = sourcePath + "/LICENSE.PREVIEW.COMMERCIAL"; if (QFile::exists(tpLicense)) { dictionary["EDITION"] = "Preview"; dictionary["LICENSE FILE"] = tpLicense; - dictionary["QT_EDITION"] = "QT_EDITION_DESKTOP"; return; // No license key checking in Tech Preview } @@ -127,18 +125,14 @@ void Tools::checkLicense(QMap<QString,QString> &dictionary, QMap<QString,QString licenseType = "Commercial"; if (products == 'F') { dictionary["EDITION"] = "Universal"; - dictionary["QT_EDITION"] = "QT_EDITION_UNIVERSAL"; } else if (products == 'B') { dictionary["EDITION"] = "FullFramework"; - dictionary["QT_EDITION"] = "QT_EDITION_DESKTOP"; } else { dictionary["EDITION"] = "GUIFramework"; - dictionary["QT_EDITION"] = "QT_EDITION_DESKTOPLIGHT"; } } else if (strcmp(licenseSchema,"Z4M") == 0 || strcmp(licenseSchema,"R4M") == 0 || strcmp(licenseSchema,"Q4M") == 0) { if (products == 'B') { dictionary["EDITION"] = "Evaluation"; - dictionary["QT_EDITION"] = "QT_EDITION_EVALUATION"; licenseType = "Evaluation"; } } @@ -212,8 +206,7 @@ void Tools::checkLicense(QMap<QString,QString> &dictionary, QMap<QString,QString dictionary["DONE"] = "error"; } if (licenseType.isEmpty() - || dictionary["EDITION"].isEmpty() - || dictionary["QT_EDITION"].isEmpty()) { + || dictionary["EDITION"].isEmpty()) { cout << "License file does not contain proper license key." << endl; dictionary["DONE"] = "error"; return; |