summaryrefslogtreecommitdiff
path: root/config.tests
diff options
context:
space:
mode:
authorDonald Carr <donald.carr@nokia.com>2012-06-06 20:10:11 +0000
committerJørgen Lind <jorgen.lind@nokia.com>2012-06-11 12:57:00 +0200
commit4097fb07df32eb3c748b75088684dd17a15970c9 (patch)
tree1f02160c17e5b699c8e7a9fa34e620d7a2402f9f /config.tests
parentb0a4355c5320eecdf008521e1b40cd221e8352f2 (diff)
downloadqtwayland-4097fb07df32eb3c748b75088684dd17a15970c9.tar.gz
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 'config.tests')
-rw-r--r--config.tests/xkbcommon/xkbcommon.pro11
1 files changed, 5 insertions, 6 deletions
diff --git a/config.tests/xkbcommon/xkbcommon.pro b/config.tests/xkbcommon/xkbcommon.pro
index facc28e5..e21015b4 100644
--- a/config.tests/xkbcommon/xkbcommon.pro
+++ b/config.tests/xkbcommon/xkbcommon.pro
@@ -4,14 +4,13 @@ QT = core
DEPENDPATH += .
INCLUDEPATH += .
+CONFIG += link_pkgconfig
+
!contains(QT_CONFIG, no-pkg-config) {
- QMAKE_CFLAGS_XKBCOMMON=$$system(pkg-config --cflags xkbcommon 2>/dev/null)
- QMAKE_LIBS_XKBCOMMON=$$system(pkg-config --libs xkbcommon 2>/dev/null)
+ PKGCONFIG += xkbcommon
+} else {
+ LIBS += -lxkbcommon
}
-QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XKBCOMMON
-QMAKE_CFLAGS += $$QMAKE_CFLAGS_XKBCOMMON
-LIBS += $$QMAKE_LIBS_XKBCOMMON
-
# Input
SOURCES += main.cpp