summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2010-12-14 16:08:55 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2011-01-04 14:18:23 (GMT)
commite90cb6992e35ed4b9c2aae85edb8d787c24a8a6c (patch)
treebbdb42dd38a7c68678d103153850eee216f83819 /mkspecs
parentd0414bd582190e205aa698f5cb24f1c6909d8222 (diff)
downloadQt-e90cb6992e35ed4b9c2aae85edb8d787c24a8a6c.zip
Qt-e90cb6992e35ed4b9c2aae85edb8d787c24a8a6c.tar.gz
Qt-e90cb6992e35ed4b9c2aae85edb8d787c24a8a6c.tar.bz2
Fix gstreamer phonon build on X11
I added an x11{ } clause in the pro file for the plugin. But as it turnes out the x11 clause is defined in gui.pro so it is not available for use in any other pro or pri files. Also fixed a missing !qpa in qttest_p4.prf
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/qttest_p4.prf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/qttest_p4.prf b/mkspecs/features/qttest_p4.prf
index 2ee148b..26f4b35 100644
--- a/mkspecs/features/qttest_p4.prf
+++ b/mkspecs/features/qttest_p4.prf
@@ -2,7 +2,7 @@ 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:!mac:!symbian:CONFIG += x11
+!win32:!embedded:!qpa:!mac:!symbian:CONFIG += x11
qtAddLibrary(QtTest)