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 /src/plugins/platforms/wayland/wayland.pro | |
| 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 'src/plugins/platforms/wayland/wayland.pro')
| -rw-r--r-- | src/plugins/platforms/wayland/wayland.pro | 34 |
1 files changed, 7 insertions, 27 deletions
diff --git a/src/plugins/platforms/wayland/wayland.pro b/src/plugins/platforms/wayland/wayland.pro index 92a04c07f..20598260a 100644 --- a/src/plugins/platforms/wayland/wayland.pro +++ b/src/plugins/platforms/wayland/wayland.pro @@ -2,7 +2,7 @@ TARGET = qwayland load(qt_plugin) load(qt_module) -CONFIG += qpa/genericunixfontdatabase +CONFIG += link_pkgconfig qpa/genericunixfontdatabase DESTDIR = $$QT.gui.plugins/platforms @@ -61,13 +61,10 @@ DEFINES += Q_PLATFORM_WAYLAND contains(config_test_xkbcommon,yes) { !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 } else { DEFINES += QT_NO_WAYLAND_XKB } @@ -85,26 +82,9 @@ OTHER_FILES += wayland.json INCLUDEPATH += $$PWD/../../../shared !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_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 -!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 +} else { + LIBS += -lwayland-client } target.path += $$[QT_INSTALL_PLUGINS]/platforms |