diff options
| author | Kalle Viironen <kalle.viironen@digia.com> | 2014-02-26 15:32:35 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-13 13:27:46 +0100 |
| commit | b9ec3e895f0af70bc78d8df64d3628d9b85fbec1 (patch) | |
| tree | e0846831abdadf4bf605eb6a9ef98c203d2b1174 /tools/configure/tools.cpp | |
| parent | daff5656e2ffbec65db73cad3c0f997e6a1e7667 (diff) | |
Remove definition QT_EDITION
Remove definition QT_EDITION which was set in configure
since it is not used anywhere anymore.
Change-Id: I5c30ab47c6244fcb07707fd05e11decf2068f6d1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'tools/configure/tools.cpp')
| -rw-r--r-- | tools/configure/tools.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
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; |