From b9ec3e895f0af70bc78d8df64d3628d9b85fbec1 Mon Sep 17 00:00:00 2001
From: Kalle Viironen <kalle.viironen@digia.com>
Date: Wed, 26 Feb 2014 15:32:35 +0200
Subject: 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>
---
 tools/configure/configureapp.cpp | 16 ----------------
 tools/configure/tools.cpp        |  9 +--------
 2 files changed, 1 insertion(+), 24 deletions(-)

(limited to 'tools/configure')

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index f71d0cf9a8..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";
 
@@ -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;
-- 
cgit v1.2.3