diff options
| author | Donald Carr <donald.carr@nokia.com> | 2012-06-06 20:10:11 +0000 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2012-06-11 12:57:00 +0200 |
| commit | 4097fb07df32eb3c748b75088684dd17a15970c9 (patch) | |
| tree | 1f02160c17e5b699c8e7a9fa34e620d7a2402f9f /tests | |
| parent | b0a4355c5320eecdf008521e1b40cd221e8352f2 (diff) | |
Introduce standard pkg-config usage
Use our own qualified pkg-config mkspec feature rather than directly
executing the system binary
Change-Id: I4b162cd8d2d9a8bd5d0b3adb9ca935df9ff96a69
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/client/client.pro | 27 | ||||
| -rw-r--r-- | tests/auto/compositor/compositor.pro | 29 |
2 files changed, 8 insertions, 48 deletions
diff --git a/tests/auto/client/client.pro b/tests/auto/client/client.pro index 9a7e2c8c2..a92aa88b7 100644 --- a/tests/auto/client/client.pro +++ b/tests/auto/client/client.pro @@ -1,32 +1,13 @@ -CONFIG += testcase +CONFIG += testcase link_pkgconfig TARGET = tst_client QT += testlib QT += core-private gui-private !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="" -} - -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) { - QMAKE_LFLAGS += $${QMAKE_LFLAGS_RPATH}$${QMAKE_LIBS_WAYLAND} - } + PKGCONFIG += wayland-client wayland-server +} else { + LIBS += -lwayland-client -lwayland-server } SOURCES += tst_client.cpp \ diff --git a/tests/auto/compositor/compositor.pro b/tests/auto/compositor/compositor.pro index 68524f6cf..1da1ba25c 100644 --- a/tests/auto/compositor/compositor.pro +++ b/tests/auto/compositor/compositor.pro @@ -1,35 +1,14 @@ -CONFIG += testcase +CONFIG += testcase link_pkgconfig TARGET = tst_compositor QT += testlib QT += core-private gui-private compositor !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="" + PKGCONFIG += wayland-client wayland-server +} else { + LIBS += -lwayland-client -lwayland-server } -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 -} - -!isEmpty(QMAKE_LFLAGS_RPATH) { - !isEmpty(QMAKE_LIBDIR_WAYLAND) { - QMAKE_LFLAGS += $${QMAKE_LFLAGS_RPATH}$${QMAKE_LIBS_WAYLAND} - } -} - -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_WAYLAND - SOURCES += tst_compositor.cpp testcompositor.cpp mockclient.cpp HEADERS += testcompositor.h mockclient.h |