summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@qt.io>2017-02-07 12:03:43 +0100
committerPaul Olav Tvete <paul.tvete@qt.io>2017-03-28 07:16:26 +0000
commit518ea708037507cb06b3877711838aab62369656 (patch)
tree5dfff6df83a23d944187cdede76913b52e4e7a16
parent1e1785c8d2b077c34a8ca1d4f93e5a75b269eac8 (diff)
downloadqtwayland-518ea708037507cb06b3877711838aab62369656.tar.gz
Don't redefine symbols from system libraries
The system library versions may contain driver-specific functionality. Change-Id: Iaaa71bff7d2c305cb47798920a5977aaa2a3ac8a Task-number: QTBUG-58299 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
-rw-r--r--src/client/client.pro4
-rw-r--r--src/compositor/wayland_wrapper/wayland_wrapper.pri2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/client/client.pro b/src/client/client.pro
index 015bfcd4..eae7ad52 100644
--- a/src/client/client.pro
+++ b/src/client/client.pro
@@ -23,7 +23,6 @@ QMAKE_USE += wayland-client
INCLUDEPATH += $$PWD/../shared
WAYLANDCLIENTSOURCES += \
- ../3rdparty/protocol/wayland.xml \
../extensions/surface-extension.xml \
../extensions/touch-extension.xml \
../extensions/qtkey-extension.xml \
@@ -32,6 +31,9 @@ WAYLANDCLIENTSOURCES += \
../3rdparty/protocol/xdg-shell.xml \
../3rdparty/protocol/xdg-shell-unstable-v6.xml \
+WAYLANDCLIENTSOURCES_SYSTEM += \
+ ../3rdparty/protocol/wayland.xml \
+
SOURCES += qwaylandintegration.cpp \
qwaylandnativeinterface.cpp \
qwaylandshmbackingstore.cpp \
diff --git a/src/compositor/wayland_wrapper/wayland_wrapper.pri b/src/compositor/wayland_wrapper/wayland_wrapper.pri
index 8698e597..e19ea253 100644
--- a/src/compositor/wayland_wrapper/wayland_wrapper.pri
+++ b/src/compositor/wayland_wrapper/wayland_wrapper.pri
@@ -1,5 +1,5 @@
CONFIG += wayland-scanner
-WAYLANDSERVERSOURCES += \
+WAYLANDSERVERSOURCES_SYSTEM += \
../3rdparty/protocol/wayland.xml \
HEADERS += \