diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-28 10:43:07 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-31 20:34:43 +0100 |
| commit | ad996a4178772258a8ccf1a9eb9dd4f784b262d1 (patch) | |
| tree | 2c0712493734ba9e36c0cb80597eaff58cbe5923 | |
| parent | c9cd6cdbea078d704f13431e636f664085278ba2 (diff) | |
mkspecs: Remove qpa conditionals.
Preparing removal of -qpa from configure.
Change-Id: Id2f784206f97729c739cf20504a2a9428ddc1cce
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | mkspecs/features/qt_installs.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/qttest_p4.prf | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf index 5a9ab4ba0a..b0de7b8fd8 100644 --- 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 ede96575f3..50020586a4 100644 --- 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:{ |