summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-07-26 09:51:15 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-03 03:02:27 +0200
commit621e434ffeb7b43ee49a751def8a6eb79173f89b (patch)
tree4bb82a90a3792991149abf44a4d653160fad3015
parent187ea846a6e63797e9f56e579d58b9fa4db2b113 (diff)
Remove unused Q_WS_QPA define.
Change-Id: Ie77526000cf93ad6901e28abe2558d254ccf8f1a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
-rwxr-xr-xconfigure2
-rw-r--r--tools/configure/configureapp.cpp3
2 files changed, 1 insertions, 4 deletions
diff --git a/configure b/configure
index 6eb700d418..e93a523152 100755
--- a/configure
+++ b/configure
@@ -5711,7 +5711,7 @@ if [ "$CFG_DEV" = "yes" ]; then
fi
# Add QPA to config.h
-QCONFIG_FLAGS="$QCONFIG_FLAGS Q_WS_QPA"
+QCONFIG_FLAGS="$QCONFIG_FLAGS"
if [ "${CFG_USE_FLOATMATH}" = "yes" ]; then
QCONFIG_FLAGS="${QCONFIG_FLAGS} QT_USE_MATH_H_FLOATS"
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 087863fb82..3f92a91e94 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3109,9 +3109,6 @@ void Configure::generateConfigfiles()
tmpStream << endl;
}
- // ### For compatibility only, should be removed later.
- tmpStream << endl << "#define Q_WS_QPA" << endl;
-
tmpStream << endl << "// Compile time features" << endl;
QStringList qconfigList;