From 0b6002d1dcfb78599a2b0014c208428892e223f3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Mon, 12 May 2014 11:41:37 +0200 Subject: [PATCH] qtwayland-native: make qtwayland find qtwaylandscanner MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 | ^ | compilation terminated. [1] https://qt.gitorious.org/qt/qtbase/commit/0e1ce36ae67de940b2d499ec7f23e520dce0f112 (From meta-qt5 rev: 925fcf4ecfe5f0e8f6dd76a1cf6e4b719551e493) Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- meta-qt5/recipes-qt/qt5/qtwayland-native_git.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-qt5/recipes-qt/qt5/qtwayland-native_git.bb b/meta-qt5/recipes-qt/qt5/qtwayland-native_git.bb index 988aa98..b820665 100644 --- a/meta-qt5/recipes-qt/qt5/qtwayland-native_git.bb +++ b/meta-qt5/recipes-qt/qt5/qtwayland-native_git.bb @@ -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 +} -- 2.7.4