1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't add qpa to CONFIG/QT_CONFIG in qconfig/qmodule.h anymore

Browse Source 
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:
Lars Knoll 2016-06-11 22:48:18 +02:00
parent 511790fd1a
commit f862946c22
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -5546,11 +5546,6 @@ elif [ "$CFG_SHARED" = "no" ]; then
QTCONFIG_CONFIG="$QTCONFIG_CONFIG static" QTCONFIG_CONFIG="$QTCONFIG_CONFIG static"
fi 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 if [ "$CFG_LARGEFILE" = "yes" ] && [ "$XPLATFORM_MINGW" != "yes" ]; then
QMAKE_CONFIG="$QMAKE_CONFIG largefile" QMAKE_CONFIG="$QMAKE_CONFIG largefile"
fi fi
@ -5914,9 +5909,6 @@ if [ "$CFG_DEV" = "yes" ]; then
echo "#define QT_BUILD_INTERNAL" echo "#define QT_BUILD_INTERNAL"
fi fi
# Add QPA to config.h
QCONFIG_FLAGS="$QCONFIG_FLAGS"
# Add turned on SQL drivers # Add turned on SQL drivers
for DRIVER in $CFG_SQL_AVAILABLE; do for DRIVER in $CFG_SQL_AVAILABLE; do
eval "VAL=\$CFG_SQL_$DRIVER" eval "VAL=\$CFG_SQL_$DRIVER"

5
tools/configure/configureapp.cpp
View File

@ -2791,8 +2791,6 @@ void Configure::generateOutputVars()
if (dictionary[ "NATIVE_GESTURES" ] == "yes") if (dictionary[ "NATIVE_GESTURES" ] == "yes")
qtConfig += "native-gestures"; qtConfig += "native-gestures";
qtConfig += "qpa";
if (dictionary["NIS"] == "yes") if (dictionary["NIS"] == "yes")
qtConfig += "nis"; qtConfig += "nis";
@ -3309,9 +3307,6 @@ void Configure::generateQConfigPri()
if (dictionary["ANDROID_STYLE_ASSETS"] == "yes") if (dictionary["ANDROID_STYLE_ASSETS"] == "yes")
configStream << " android-style-assets"; configStream << " android-style-assets";
// ### For compatibility only, should be removed later.
configStream << " qpa";
configStream << endl; configStream << endl;
configStream << "host_build {" << endl; configStream << "host_build {" << endl;
configStream << " QT_ARCH = " << dictionary["QT_HOST_ARCH"] << endl; configStream << " QT_ARCH = " << dictionary["QT_HOST_ARCH"] << endl;