diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-29 19:09:25 (GMT) |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-29 19:09:25 (GMT) |
| commit | 53c7142463d065cace71bd42909fe4941bc59fc7 (patch) | |
| tree | feaccae2699cefb5758a08a0c9387dc7f22db683 /src/plugins/platforms | |
| parent | ffce38caefab278e7088f5156c1be2ae4f402af6 (diff) | |
| parent | 09def0110c6e91ed219ba0ef4d2d9acb8f563241 (diff) | |
| download | Qt-53c7142463d065cace71bd42909fe4941bc59fc7.zip Qt-53c7142463d065cace71bd42909fe4941bc59fc7.tar.gz Qt-53c7142463d065cace71bd42909fe4941bc59fc7.tar.bz2 | |
Merge remote-tracking branch 'review/master'
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/wayland/wayland.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/wayland/wayland.pro b/src/plugins/platforms/wayland/wayland.pro index 5b20a87..cbd67ea 100644 --- a/src/plugins/platforms/wayland/wayland.pro +++ b/src/plugins/platforms/wayland/wayland.pro @@ -33,7 +33,7 @@ INCLUDEPATH += $$QMAKE_INCDIR_WAYLAND LIBS += $$QMAKE_LIBS_WAYLAND QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_WAYLAND -!isEmpty(QMAKE_LFLAGS_RPATH) { +!isEmpty(QMAKE_LFLAGS_RPATH):!contains(QT_CONFIG, no-pkg-config) { WAYLAND_NEEDS_RPATH = $$system(pkg-config --libs-only-L wayland-client) !isEmpty(WAYLAND_NEEDS_RPATH) { !isEmpty(QMAKE_LIBDIR_WAYLAND):QMAKE_LFLAGS += $${QMAKE_LFLAGS_RPATH}$${QMAKE_LIBDIR_WAYLAND} |