From b9ec3e895f0af70bc78d8df64d3628d9b85fbec1 Mon Sep 17 00:00:00 2001 From: Kalle Viironen Date: Wed, 26 Feb 2014 15:32:35 +0200 Subject: [PATCH] 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 --- configure | 21 +-------------------- qmake/qmake.pri | 4 ---- tools/configure/configureapp.cpp | 16 ---------------- tools/configure/tools.cpp | 9 +-------- 4 files changed, 2 insertions(+), 48 deletions(-) diff --git a/configure b/configure index 88eaf9a3fd..1c1af57451 100755 --- a/configure +++ b/configure @@ -2776,7 +2776,6 @@ if [ -f "$relpath"/LICENSE.PREVIEW.COMMERCIAL ] && [ $COMMERCIAL_USER = "yes" ]; # Commercial preview release Licensee="Preview" Edition="Preview" - QT_EDITION="QT_EDITION_DESKTOP" LicenseType="Technology Preview" elif [ $COMMERCIAL_USER = "yes" ]; then # one of commercial editions @@ -2832,17 +2831,14 @@ elif [ $COMMERCIAL_USER = "yes" ]; then case $ProductCode in F) Edition="Universal" - QT_EDITION="QT_EDITION_UNIVERSAL" ;; B) Edition="FullFramework" EditionString="Full Framework" - QT_EDITION="QT_EDITION_DESKTOP" ;; L) Edition="GUIFramework" EditionString="GUI Framework" - QT_EDITION="QT_EDITION_DESKTOPLIGHT" ;; esac ;; @@ -2852,12 +2848,11 @@ elif [ $COMMERCIAL_USER = "yes" ]; then case $ProductCode in B) Edition="Evaluation" - QT_EDITION="QT_EDITION_EVALUATION" ;; esac ;; esac - if [ -z "$LicenseType" -o -z "$Edition" -o -z "$QT_EDITION" ]; then + if [ -z "$LicenseType" -o -z "$Edition" ]; then echo echo "Invalid license key. Please check the license key." exit 1 @@ -2927,7 +2922,6 @@ elif [ $COMMERCIAL_USER = "yes" ]; then esac Licensee="$Edition" EditionString="$Edition" - QT_EDITION="QT_EDITION_DESKTOP" fi case "$LicenseFeatureCode" in @@ -2981,7 +2975,6 @@ elif [ $COMMERCIAL_USER = "no" ]; then Licensee="Open Source" Edition="OpenSource" EditionString="Open Source" - QT_EDITION="QT_EDITION_OPENSOURCE" fi echo echo "This is the Qt ${EditionString} Edition." @@ -4034,9 +4027,6 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; echo "EXEEXT = $EXEEXT" >> "$mkfile" echo "RM_F = rm -f" >> "$mkfile" echo "RM_RF = rm -rf" >> "$mkfile" - if [ $QT_EDITION = "QT_EDITION_OPENSOURCE" ]; then - echo "EXTRA_CPPFLAGS = -DQMAKE_OPENSOURCE_EDITION" >> "$mkfile" - fi if [ "$BUILD_ON_MAC" = "yes" ]; then echo "EXTRA_CXXFLAGS += -MMD" >> "$mkfile" @@ -6247,10 +6237,6 @@ esac cat >>"$outpath/src/corelib/global/qconfig.h.new" <>"$outpath/src/corelib/global/qconfig.h.new" @@ -6505,7 +6491,6 @@ host_build { QMAKE_DEFAULT_LIBDIRS = `shellQuoteLines "$DEFAULT_LIBDIRS"` QMAKE_DEFAULT_INCDIRS = `shellQuoteLines "$DEFAULT_INCDIRS"` } -QT_EDITION = $Edition QT_CONFIG += $QT_CONFIG #versioning @@ -6632,10 +6617,6 @@ if [ -n "$QT_LFLAGS_TDS" ]; then echo "QT_LFLAGS_TDS = $QT_LFLAGS_TDS" >> "$QTMODULE.tmp" fi -if [ "$QT_EDITION" != "QT_EDITION_OPENSOURCE" ]; then - echo "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" >> "$QTMODULE.tmp" -fi - #dump in the OPENSSL_LIBS info if [ '!' -z "$OPENSSL_LIBS" ]; then echo "OPENSSL_LIBS = $OPENSSL_LIBS" >> "$QTMODULE.tmp" diff --git a/qmake/qmake.pri b/qmake/qmake.pri index acc9975843..73757ee086 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -29,10 +29,6 @@ HEADERS += project.h property.h \ generators/integrity/gbuild.h \ generators/win32/cesdkhandler.h -contains(QT_EDITION, OpenSource) { - DEFINES += QMAKE_OPENSOURCE_EDITION -} - bootstrap { #Qt code SOURCES+= \ qbitarray.cpp \ 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 &dictionary, QMap &dictionary, QMap &dictionary, QMap