summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@nokia.com>2010-10-28 15:18:24 (GMT)
committerRobert Griebl <robert.griebl@nokia.com>2010-11-03 18:31:51 (GMT)
commitf0c467b6c5dd060f25fdce08c480c3955d340998 (patch)
tree1c9c144f234787272e3d9e200203bbbd563ac84c /mkspecs
parent5fef7ab5fc29806742a8d32083a10c59733f4912 (diff)
downloadQt-f0c467b6c5dd060f25fdce08c480c3955d340998.zip
Qt-f0c467b6c5dd060f25fdce08c480c3955d340998.tar.gz
Qt-f0c467b6c5dd060f25fdce08c480c3955d340998.tar.bz2
There is no predefined qmake x11 scope for x11 builds.
All the autotests that are using a x11{} scope to add QMAKE_LIBS_X11 to LIBS are actually not adding anything at all, but just happen to build correctly because the standard GNU ld resolves symbols in shared libraries recursively (and libQtGui depends on all those X libs already). Building those tests with GNU gold will lead to undefined X* symbols, since gold doesn't use implicitly dependant libs to resolve symbols. Reviewed-by: Harald Fernengel
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/qttest_p4.prf3
1 files changed, 3 insertions, 0 deletions
diff --git a/mkspecs/features/qttest_p4.prf b/mkspecs/features/qttest_p4.prf
index d1c7c2b..2ee148b 100644
--- a/mkspecs/features/qttest_p4.prf
+++ b/mkspecs/features/qttest_p4.prf
@@ -1,6 +1,9 @@
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
+
qtAddLibrary(QtTest)
symbian:{