diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2012-03-11 13:05:08 +0100 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2012-03-12 12:00:28 +0100 |
| commit | 36df41bb337028064a6e12eecc0e310f1027dd7c (patch) | |
| tree | ec8800b41e166980dbd81050a6657b65cfdc9668 /tests | |
| parent | 68e266b3f93fbf7f918a519f8e9198429ff1db07 (diff) | |
Make the module not depend on QtBase configure
This is convenient if we want to reconfigure without reconfiguring
QtBase.
Change-Id: I719ba0d89905287a557e962ed6d804514e44b7f5
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/client/client.pro | 35 | ||||
| -rw-r--r-- | tests/auto/compositor/compositor.pro | 26 |
2 files changed, 42 insertions, 19 deletions
diff --git a/tests/auto/client/client.pro b/tests/auto/client/client.pro index 12dad3550..6bfe82b78 100644 --- a/tests/auto/client/client.pro +++ b/tests/auto/client/client.pro @@ -4,24 +4,29 @@ TARGET = tst_client QT += testlib QT += core-private gui-private -use_pkgconfig { - CONFIG += link_pkgconfig - PKGCONFIG += wayland-server +!contains(QT_CONFIG, no-pkg-config) { + #If Qt uses pkg-config then override pkgconfig from mkspec + QMAKE_CFLAGS_WAYLAND=$$system(pkg-config --cflags wayland-client 2>/dev/null) + QMAKE_LIBS_WAYLAND_CLIENT=$$system(pkg-config --libs-only-l wayland-client 2>/dev/null) + QMAKE_LIBS_WAYLAND_SERVER=$$system(pkg-config --libs-only-l wayland-server 2>/dev/null) + QMAKE_INCDIR_WAYLAND=$$system("pkg-config --cflags-only-I wayland-client 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'") + QMAKE_LIBDIR_WAYLAND=$$system("pkg-config --libs-only-L wayland-client 2>/dev/null | sed -e 's,^-L,,g' -e 's, -L, ,g'") + QMAKE_DEFINES_WAYLAND="" +} - #set the rpath - !isEmpty(QMAKE_LFLAGS_RPATH) { - WAYLAND_NEEDS_RPATH = $$system(pkg-config --libs-only-L wayland-server) - !isEmpty(WAYLAND_NEEDS_RPATH) { - WAYLAND_LIBDIR = $$system(pkg-config --variable=libdir wayland-server) - !isEmpty(WAYLAND_LIBDIR):QMAKE_LFLAGS += $${QMAKE_LFLAGS_RPATH}$${WAYLAND_LIBDIR} - } - } -} else { - INCLUDEPATH += $$QMAKE_INCDIR_WAYLAND +QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_WAYLAND +QMAKE_CFLAGS += $$QMAKE_CFLAGS_WAYLAND +DEFINES += $$QMAKE_DEFINES_WAYLAND +LIBS += $$QMAKE_LIBS_WAYLAND_CLIENT +LIBS += $$QMAKE_LIBS_WAYLAND_SERVER +!isEmpty(QMAKE_LIBDIR_WAYLAND) { + LIBS += -L$$QMAKE_LIBDIR_WAYLAND +} + +!isEmpty(QMAKE_LFLAGS_RPATH) { !isEmpty(QMAKE_LIBDIR_WAYLAND) { - LIBS += -L$$QMAKE_LIBDIR_WAYLAND + QMAKE_LFLAGS += $${QMAKE_LFLAGS_RPATH}$${QMAKE_LIBS_WAYLAND} } - LIBS += -lwayland-server -lffi } SOURCES += tst_client.cpp \ diff --git a/tests/auto/compositor/compositor.pro b/tests/auto/compositor/compositor.pro index 26a3cb8a1..68524f6cf 100644 --- a/tests/auto/compositor/compositor.pro +++ b/tests/auto/compositor/compositor.pro @@ -4,11 +4,29 @@ TARGET = tst_compositor QT += testlib QT += core-private gui-private compositor -INCLUDEPATH += $$QMAKE_INCDIR_WAYLAND +!contains(QT_CONFIG, no-pkg-config) { + #If Qt uses pkg-config then override pkgconfig from mkspec + QMAKE_CFLAGS_WAYLAND=$$system(pkg-config --cflags wayland-server 2>/dev/null) + QMAKE_LIBS_WAYLAND_SERVER=$$system(pkg-config --libs-only-l wayland-server 2>/dev/null) + QMAKE_LIBS_WAYLAND_CLIENT=$$system(pkg-config --libs-only-l wayland-client 2>/dev/null) + QMAKE_INCDIR_WAYLAND=$$system("pkg-config --cflags-only-I wayland-server 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'") + QMAKE_LIBDIR_WAYLAND=$$system("pkg-config --libs-only-L wayland-server 2>/dev/null | sed -e 's,^-L,,g' -e 's, -L, ,g'") + QMAKE_DEFINES_WAYLAND="" +} + +QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_WAYLAND +QMAKE_CFLAGS += $$QMAKE_CFLAGS_WAYLAND +DEFINES += $$QMAKE_DEFINES_WAYLAND +LIBS += $$QMAKE_LIBS_WAYLAND_SERVER +LIBS += $$QMAKE_LIBS_WAYLAND_CLIENT +!isEmpty(QMAKE_LIBDIR_WAYLAND) { + LIBS += -L$$QMAKE_LIBDIR_WAYLAND +} -LIBS += $$QMAKE_LIBS_WAYLAND -mac { - LIBS += -lwayland-client +!isEmpty(QMAKE_LFLAGS_RPATH) { + !isEmpty(QMAKE_LIBDIR_WAYLAND) { + QMAKE_LFLAGS += $${QMAKE_LFLAGS_RPATH}$${QMAKE_LIBS_WAYLAND} + } } QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_WAYLAND |