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>
This commit is contained in:
parent
511790fd1a
commit
f862946c22
8
configure
vendored
8
configure
vendored
@ -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"
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user