From f0c467b6c5dd060f25fdce08c480c3955d340998 Mon Sep 17 00:00:00 2001 From: Robert Griebl Date: Thu, 28 Oct 2010 17:18:24 +0200 Subject: 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 --- mkspecs/features/qttest_p4.prf | 3 +++ tests/auto/guiapplauncher/guiapplauncher.pro | 1 + 2 files changed, 4 insertions(+) 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:{ diff --git a/tests/auto/guiapplauncher/guiapplauncher.pro b/tests/auto/guiapplauncher/guiapplauncher.pro index 30f5cf4..1fe9c8b 100644 --- a/tests/auto/guiapplauncher/guiapplauncher.pro +++ b/tests/auto/guiapplauncher/guiapplauncher.pro @@ -3,6 +3,7 @@ # ------------------------------------------------- # Link against gui for X11,etc. +load(qttest_p4) DEFINES += SRCDIR=\\\"$$PWD/\\\" TARGET = tst_guiapplauncher -- cgit v0.12