summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2016-06-11 22:48:18 +0200
committerLars Knoll <lars.knoll@qt.io>2016-06-14 17:10:23 +0000
commitf862946c228f111e9572c6103faf526260fed04d (patch)
tree784cc5188ec80e08d85a302638da9f49d4c54bf9 /configure
parent511790fd1af1e2886a0e2e8dd4308099705cd815 (diff)
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 <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure8
1 files changed, 0 insertions, 8 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"