summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2011-06-23 09:08:23 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2011-06-23 09:09:07 (GMT)
commit7338117720f90a2f9a9c9ba7dc36fa1210eb46bb (patch)
tree31d7b57f8860c7daa2d2a801c05d54b950b9508b /src/plugins
parent08c58237553b76378eb9e66c50c37cddba336d1a (diff)
downloadQt-7338117720f90a2f9a9c9ba7dc36fa1210eb46bb.zip
Qt-7338117720f90a2f9a9c9ba7dc36fa1210eb46bb.tar.gz
Qt-7338117720f90a2f9a9c9ba7dc36fa1210eb46bb.tar.bz2
Fix broken rpath on wayland
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/platforms/wayland/wayland.pro5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/platforms/wayland/wayland.pro b/src/plugins/platforms/wayland/wayland.pro
index dca72fd..5b20a87 100644
--- a/src/plugins/platforms/wayland/wayland.pro
+++ b/src/plugins/platforms/wayland/wayland.pro
@@ -34,7 +34,10 @@ LIBS += $$QMAKE_LIBS_WAYLAND
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_WAYLAND
!isEmpty(QMAKE_LFLAGS_RPATH) {
- !isEmpty(QMAKE_LIBDIR_WAYLAND):QMAKE_LFLAGS += $${QMAKE_LFLAGS_RPATH}$${QMAKE_LIBDIR_WAYLAND}
+ 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}
+ }
}
INCLUDEPATH += $$PWD