mkspecs: Remove qpa conditionals.

Preparing removal of -qpa from configure.

Change-Id: Id2f784206f97729c739cf20504a2a9428ddc1cce
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf
index 5a9ab4b..b0de7b8 100644 (file)
--- a/mkspecs/features/qt_installs.prf
+++ b/mkspecs/features/qt_installs.prf
@@ -36,7 +36,7 @@ qt_install_headers {
     INSTALLS += private_headers
 }
 
-embedded|qpa: equals(TARGET, QtGui) {
+embedded: equals(TARGET, QtGui) {
     # install fonts for embedded
     INSTALLS += fonts
     fonts.path = $$[QT_INSTALL_LIBS]/fonts

diff --git a/mkspecs/features/qttest_p4.prf b/mkspecs/features/qttest_p4.prf
index ede9657..5002058 100644 (file)
--- a/mkspecs/features/qttest_p4.prf
+++ b/mkspecs/features/qttest_p4.prf
@@ -1,9 +1,6 @@
 isEmpty(TEMPLATE):TEMPLATE=app
 CONFIG += qt warn_on console depend_includepath testcase
 
-# x11 is not defined by configure (the following line is copied from gui.pro)
-!win32:!embedded:!qpa:!mac:!symbian:CONFIG += x11
-
 qtAddLibrary(QtTest)
 
 symbian:{