[oe] [meta-qt5][PATCH] Minor improvements: configure complains it can't find oe-device-extra.pri, and add libxkbcommon in the dependencies

[Herve Jourdain]

During configure, it complains it can't find oe-device-extra.pri, but it doesn't result in any error. Fix it, though, just in case.
In qtwayland, xkb should be optional, but it's not for the moment, so add it to the dependencies.

Signed-off-by: Herve Jourdain <herve.jourdain at neuf.fr>
---
 recipes-qt/qt5/qtbase_git.bb    | 3 +++
 recipes-qt/qt5/qtwayland_git.bb | 1 +
 2 files changed, 4 insertions(+)

diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 6541973..258c7ed 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -173,6 +173,9 @@ do_configure() {
         ln -sf ${OE_QMAKE_QMAKE_ORIG} ${B}/bin/qmake
     fi
 
+    # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory" during configuration
+    touch ${S}/mkspecs/oe-device-extra.pri
+
     ${S}/configure -v \
         -opensource -confirm-license \
         -sysroot ${STAGING_DIR_TARGET} \
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index e315924..51421d5 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -18,6 +18,7 @@ LIC_FILES_CHKSUM = " \
 
 #FIXME: xkb should be optional; we add it here to fix the build error without it
 #       (https://bugreports.qt.io/browse/QTBUG-54851)
+DEPENDS += "libxkbcommon"
 PACKAGECONFIG ?= " \
     compositor-api \
     wayland-egl \
-- 
2.7.4