Merge remote-tracking branch 'qtyocto/upstream/master' into 5.9

* upstream/master:
  qtchooser: respect LDFLAGS
  qtbase-native: create empty oe-device-extra.pri
  qtwayland: update build without xkbcommon-evdev

Change-Id: Icafabee07696be98fd6e4fa145f42df6f53863d2

3 files changed, 37 insertions, 7 deletions

diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 7675eb04..ef217488 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -82,6 +82,9 @@ PACKAGECONFIG_CONFARGS = " \
 export OE_QMAKE_QTCONF_PATH = "foodummy"
 
 do_configure_prepend() {
+    # Avoid qmake error "Cannot read [...]/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory"
+    touch ${S}/mkspecs/oe-device-extra.pri
+
     MAKEFLAGS="${PARALLEL_MAKE}" ${S}/configure -opensource -confirm-license ${PACKAGECONFIG_CONFARGS} || die "Configuring qt failed. PACKAGECONFIG_CONFARGS was ${PACKAGECONFIG_CONFARGS}"
 }
 
diff --git a/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch b/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
index e1e978e8..555bb28f 100644
--- a/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
+++ b/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
@@ -1,13 +1,40 @@
-From c93dbe53e8a1b2203c750a66c7efe6fc9a326903 Mon Sep 17 00:00:00 2001
-From: Raphael Freudiger <raphael.freudiger@siemens.com>
-Date: Thu, 22 Dec 2016 13:54:31 +0100
+From 2b72ad7955fe19abb4a0b4ebb6bc7aa498e454bc Mon Sep 17 00:00:00 2001
+From: Raphael Freudiger <laser_b@gmx.ch>
+Date: Tue, 10 Jan 2017 15:49:55 +0100
 Subject: [PATCH] fix build without xkbcommon-evdev
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
 
-Signed-off-by: Raphael Freudiger <raphael.freudiger@siemens.com>
+Change-Id: I4f52c4ad741fdd7063a18b67f5777b52f03726fe
+Signed-off-by: Raphael Freudiger <laser_b@gmx.ch>
+Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com>
 ---
+ src/client/client.pro                              |  2 ++
+ src/compositor/compositor.pro                      |  2 ++
  src/compositor/compositor_api/qwaylandkeyboard.cpp | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
+ 3 files changed, 11 insertions(+), 6 deletions(-)
 
+diff --git a/src/client/client.pro b/src/client/client.pro
+index 7482cfd..cb3578c 100644
+--- a/src/client/client.pro
++++ b/src/client/client.pro
+@@ -120,3 +120,5 @@ MODULE_PLUGIN_TYPES = \
+             wayland-decoration-client \
+             wayland-shell-integration
+ load(qt_module)
++
++LIBS += -lxkbcommon
+diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro
+index dc9000d..4eebfd6 100644
+--- a/src/compositor/compositor.pro
++++ b/src/compositor/compositor.pro
+@@ -32,3 +32,5 @@ include ($$PWD/extensions/extensions.pri)
+ MODULE_PLUGIN_TYPES = \
+     wayland-graphics-integration-server
+ load(qt_module)
++
++LIBS += -lxkbcommon
 diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp
 index 55381b4..5c054c6 100644
 --- a/src/compositor/compositor_api/qwaylandkeyboard.cpp
@@ -40,5 +67,5 @@ index 55381b4..5c054c6 100644
  {
      Q_FOREACH (Resource *resource, resourceMap()) {
 -- 
-2.1.4
+2.9.3
 
diff --git a/recipes-qt/qtchooser/qtchooser_git.bb b/recipes-qt/qtchooser/qtchooser_git.bb
index 68b1c808..f7656450 100644
--- a/recipes-qt/qtchooser/qtchooser_git.bb
+++ b/recipes-qt/qtchooser/qtchooser_git.bb
@@ -16,7 +16,7 @@ PV = "39+git${SRCREV}"
 inherit pkgconfig
 
 do_compile() {
-    oe_runmake
+    oe_runmake LFLAGS='${LDFLAGS}'
 }
 
 do_install() {