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 /configure | |
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 'configure')
-rwxr-xr-x | configure | 21 |
1 files changed, 1 insertions, 20 deletions
@@ -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" <<EOF -/* Qt Edition */ -#ifndef QT_EDITION -# define QT_EDITION $QT_EDITION -#endif EOF echo '/* Compile time features */' >>"$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" |