From f862946c228f111e9572c6103faf526260fed04d Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Sat, 11 Jun 2016 22:48:18 +0200 Subject: Don't add qpa to CONFIG/QT_CONFIG in qconfig/qmodule.h anymore The flag is not used anywhere anymore, so let's simply get rid of it. Change-Id: I0c395d18e7f0ef5af03c352753ebb537f5ae27dc Reviewed-by: Oswald Buddenhagen --- configure | 8 -------- tools/configure/configureapp.cpp | 5 ----- 2 files changed, 13 deletions(-) diff --git a/configure b/configure index b17f02e113..0b28f6f77b 100755 --- a/configure +++ b/configure @@ -5546,11 +5546,6 @@ elif [ "$CFG_SHARED" = "no" ]; then QTCONFIG_CONFIG="$QTCONFIG_CONFIG static" fi -#FIXME: qpa is implicit this should all be removed -QMAKE_CONFIG="$QMAKE_CONFIG qpa" -QT_CONFIG="$QT_CONFIG qpa" -QTCONFIG_CONFIG="$QTCONFIG_CONFIG qpa" - if [ "$CFG_LARGEFILE" = "yes" ] && [ "$XPLATFORM_MINGW" != "yes" ]; then QMAKE_CONFIG="$QMAKE_CONFIG largefile" fi @@ -5914,9 +5909,6 @@ if [ "$CFG_DEV" = "yes" ]; then echo "#define QT_BUILD_INTERNAL" fi -# Add QPA to config.h -QCONFIG_FLAGS="$QCONFIG_FLAGS" - # Add turned on SQL drivers for DRIVER in $CFG_SQL_AVAILABLE; do eval "VAL=\$CFG_SQL_$DRIVER" diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index dfd90ee97f..12efc67325 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2791,8 +2791,6 @@ void Configure::generateOutputVars() if (dictionary[ "NATIVE_GESTURES" ] == "yes") qtConfig += "native-gestures"; - qtConfig += "qpa"; - if (dictionary["NIS"] == "yes") qtConfig += "nis"; @@ -3309,9 +3307,6 @@ void Configure::generateQConfigPri() if (dictionary["ANDROID_STYLE_ASSETS"] == "yes") configStream << " android-style-assets"; - // ### For compatibility only, should be removed later. - configStream << " qpa"; - configStream << endl; configStream << "host_build {" << endl; configStream << " QT_ARCH = " << dictionary["QT_HOST_ARCH"] << endl; -- cgit v1.2.3