From 05500482c4b7f810bd4c073739bdedf0b8783738 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 21 Mar 2010 09:29:07 +0100 Subject: Autotests: if you use X11 libs, you must link to X11 libs explicitly. Solaris linker complains if you don't. Plus it's the right thing to do --- tests/auto/guiapplauncher/guiapplauncher.pro | 3 +++ tests/auto/qgl_threads/qgl_threads.pro | 3 +++ tests/auto/qwidget/qwidget.pro | 4 ++++ tests/auto/qwidget_window/qwidget_window.pro | 3 +++ 4 files changed, 13 insertions(+) diff --git a/tests/auto/guiapplauncher/guiapplauncher.pro b/tests/auto/guiapplauncher/guiapplauncher.pro index 2f81061..30f5cf4 100644 --- a/tests/auto/guiapplauncher/guiapplauncher.pro +++ b/tests/auto/guiapplauncher/guiapplauncher.pro @@ -16,3 +16,6 @@ HEADERS += windowmanager.h # process enumeration,etc. win32:LIBS+=-luser32 +x11 { + LIBS += $$QMAKE_LIBS_X11 +} diff --git a/tests/auto/qgl_threads/qgl_threads.pro b/tests/auto/qgl_threads/qgl_threads.pro index 9312c05..83d5d82 100644 --- a/tests/auto/qgl_threads/qgl_threads.pro +++ b/tests/auto/qgl_threads/qgl_threads.pro @@ -9,3 +9,6 @@ QT += opengl HEADERS += tst_openglthreading.h SOURCES += tst_openglthreading.cpp +x11 { + LIBS += $$QMAKE_LIBS_X11 +} diff --git a/tests/auto/qwidget/qwidget.pro b/tests/auto/qwidget/qwidget.pro index 61db2ee..e39431b 100644 --- a/tests/auto/qwidget/qwidget.pro +++ b/tests/auto/qwidget/qwidget.pro @@ -14,6 +14,10 @@ mac { OBJECTIVE_SOURCES += tst_qwidget_mac_helpers.mm } +x11 { + LIBS += $$QMAKE_LIBS_X11 +} + symbian { INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE LIBS += -leikcore -lcone -leikcoctl diff --git a/tests/auto/qwidget_window/qwidget_window.pro b/tests/auto/qwidget_window/qwidget_window.pro index e375fab..df7d687 100644 --- a/tests/auto/qwidget_window/qwidget_window.pro +++ b/tests/auto/qwidget_window/qwidget_window.pro @@ -1,4 +1,7 @@ load(qttest_p4) SOURCES += tst_qwidget_window.cpp +x11 { + LIBS += $$QMAKE_LIBS_X11 +} -- cgit v0.12