summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwayland
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2018-02-14 10:56:51 +0100
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2018-02-14 10:57:14 +0100
commitcad329560f7d1de4d16195eb258e43081d3b08c4 (patch)
treee741da19f9233a42a03d1af60080296082fbcf41 /recipes-qt/qt5/qtwayland
parenta7ed1887b82ee27c9ae6aef39a4a5067195fd129 (diff)
parentc58cb01cb560da122ea64ba76d6b68a183e2f457 (diff)
Merge remote-tracking branch 'agl/sandbox/ronan/rocko' into HEAD
* agl/sandbox/ronan/rocko: Remove weston virtual screen Fix most for kernel 4.14 Fix qtwayland patch Fix build of qtwayland 5.9 without evdev Remove backport patch from Qt5 to show cover art ninja,harfbuzz: Remove .bbappend libdbus-c++:Fix build error in GCC-7 qtbase: Remove -no-use-gold-linker option unicens-config: Add bash to rdeps libdbus-c++: Remove bbappend file opencv: Rename .bbappend to match new version from meta-openembedded Bug-AGL: SPEC-1181 Change-Id: Icc3062631994e8afbddeb18a52c72619156d219a Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'recipes-qt/qt5/qtwayland')
-rw-r--r--recipes-qt/qt5/qtwayland/0099_qtwayland_no_evdev.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwayland/0099_qtwayland_no_evdev.patch b/recipes-qt/qt5/qtwayland/0099_qtwayland_no_evdev.patch
new file mode 100644
index 000000000..99b519399
--- /dev/null
+++ b/recipes-qt/qt5/qtwayland/0099_qtwayland_no_evdev.patch
@@ -0,0 +1,14 @@
+diff --git a/tests/auto/compositor/compositor/compositor.pro b/tests/auto/compositor/compositor/compositor.pro
+index f0cdaf32..64b60218 100644
+--- a/tests/auto/compositor/compositor/compositor.pro
++++ b/tests/auto/compositor/compositor/compositor.pro
+@@ -7,9 +7,6 @@ QT += core-private gui-private waylandcompositor waylandcompositor-private
+
+ QMAKE_USE += wayland-client wayland-server
+
+-qtConfig(xkbcommon-evdev): \
+- QMAKE_USE += xkbcommon_evdev
+-
+ WAYLANDCLIENTSOURCES += \
+ ../../../../src/3rdparty/protocol/xdg-shell.xml \
+ ../../../../src/3rdparty/protocol/ivi-application.xml \