From 3ae7c408f92bf3c6b378d10ae6d6a36bbb80fcec Mon Sep 17 00:00:00 2001
From: Donald Carr <donald.carr@nokia.com>
Date: Wed, 6 Jun 2012 20:10:11 +0000
Subject: [PATCH] Introduce standard pkg-config usage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 tests/auto/wayland/client.pro | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/tests/auto/wayland/client.pro b/tests/auto/wayland/client.pro
index 9a7e2c8c2b7..a92aa88b7e2 100644
--- a/tests/auto/wayland/client.pro
+++ b/tests/auto/wayland/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 \