qtwayland-native: make qtwayland find qtwaylandscanner
authorAndreas Müller <schnitzeltony@googlemail.com>
Mon, 12 May 2014 09:41:37 +0000 (11:41 +0200)
committerPatrick Ohly <patrick.ohly@intel.com>
Fri, 9 Jan 2015 16:45:52 +0000 (08:45 -0800)
bindir/qt5 causes not building QtWaylandClient files.
See [1] for further explanation. This error was discoverd by building
hawaii-shell failing with:

| /home/superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/qt5/QtCompositor/5.3.0/QtCompositor/private/qwlinputdevice_p.h:56:58: fatal error: QtCompositor/private/qwayland
|  #include <QtCompositor/private/qwayland-server-wayland.h>
|                                                           ^
| compilation terminated.

[1] https://qt.gitorious.org/qt/qtbase/commit/0e1ce36ae67de940b2d499ec7f23e520dce0f112

(From meta-qt5 rev: 925fcf4ecfe5f0e8f6dd76a1cf6e4b719551e493)

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
meta-qt5/recipes-qt/qt5/qtwayland-native_git.bb

index 988aa98..b820665 100644 (file)
@@ -5,3 +5,8 @@ require ${PN}.inc
 # qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.1
 
 SRCREV = "a237778666666ab77c4e8e6b501cf0fbe7c9223e"
+
+# wayland-scanner and qtwaylandscanner must be in same path to work properly
+do_install_append() {
+    ln -sf ${D}${OE_QMAKE_PATH_QT_BINS}/qtwaylandscanner ${D}${bindir}/qtwaylandscanner
+}