diff options
| author | Robert Griebl <robert.griebl@nokia.com> | 2010-10-28 15:18:24 (GMT) |
|---|---|---|
| committer | Qt Commercial Integration <QtCommercial@digia.com> | 2012-01-31 10:24:54 (GMT) |
| commit | 1f9af6e135db4b0fa26ab7bac69a6c63ff083e59 (patch) | |
| tree | 6c46a9f2b34336c7d2c4577630f43698ac9dfca8 | |
| parent | 313c0c388524891c3887a29344135c452c4c301a (diff) | |
| download | Qt-1f9af6e135db4b0fa26ab7bac69a6c63ff083e59.zip Qt-1f9af6e135db4b0fa26ab7bac69a6c63ff083e59.tar.gz Qt-1f9af6e135db4b0fa26ab7bac69a6c63ff083e59.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
| -rw-r--r-- | mkspecs/features/qttest_p4.prf | 3 | ||||
| -rw-r--r-- | tests/auto/guiapplauncher/guiapplauncher.pro | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/mkspecs/features/qttest_p4.prf b/mkspecs/features/qttest_p4.prf index 5002058..5e1e8fd 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 |