diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2018-01-19 11:19:12 +0100 |
|---|---|---|
| committer |   ronan <ronan.lemartret@gmail.com> | 2018-02-13 17:22:38 +0100 |
| commit | a96b1e5d3e04add535e50fa521e86aab4707ac0e (patch) | |
| tree | baa293bca0465c42349462a7e255b85105009ebe /recipes-qt | |
| parent | c8d5b2d65771178736b873c5070b8dfbc1b8c6f2 (diff) | |
Fix build of qtwayland 5.9 without evdev
This fixes a FTBS due to no evdev present.
Change-Id: If00dff352e4b270b2dbd1d7df15869d984c883b8
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'recipes-qt')
| -rw-r--r-- | recipes-qt/qt5/qtwayland/0099_qtwayland_no_evdev.patch | 14 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwayland_%.bbappend | 2 |
2 files changed, 16 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 00000000..e243ef2f --- /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 \ diff --git a/recipes-qt/qt5/qtwayland_%.bbappend b/recipes-qt/qt5/qtwayland_%.bbappend index a6a8f00b..9807840c 100644 --- a/recipes-qt/qt5/qtwayland_%.bbappend +++ b/recipes-qt/qt5/qtwayland_%.bbappend @@ -32,3 +32,5 @@ SRC_URI_append_checkforkrogoth = "\ DEPENDS_append_koelsch = " libegl gles-user-module" DEPENDS_append_porter = " ${@base_conditional('PREFERRED_PROVIDER_virtual/egl', 'mesa', 'mesa', 'libegl gles-user-module', d)}" + +SRC_URI_append = " file://0099_qtwayland_no_evdev.patch " |