From d21707ff60066d8ad95b66cbb718e9230540ab50 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 28 Sep 2017 15:54:49 +0300 Subject: qt5: remove use of OE_QMAKE_WAYLAND_SCANNER This was never defined for nativesdk, which then broke sdk which had nativesdk-qtwayland included. Rather than add it there, remove its use everywhere, since it was not adding anything meaningful to the build. Change-Id: I1a739c794be71614ebe65c8fc0bdd62582f6e442 Reviewed-by: Mikko Gronoff Reviewed-by: Samuli Piippo --- classes/qmake5_base.bbclass | 2 -- recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 9 ++++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index edff2c4e..538c9489 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -26,7 +26,6 @@ EXTRA_OEMAKE = " \ OE_QMAKE_LDFLAGS='${OE_QMAKE_LDFLAGS}' \ OE_QMAKE_AR='${OE_QMAKE_AR}' \ OE_QMAKE_STRIP='${OE_QMAKE_STRIP}' \ - OE_QMAKE_WAYLAND_SCANNER='${OE_QMAKE_WAYLAND_SCANNER}' \ OE_QMAKE_INCDIR_QT='${STAGING_DIR_TARGET}/${OE_QMAKE_PATH_HEADERS}' \ " @@ -40,7 +39,6 @@ export OE_QMAKE_LINK = "${CXX}" export OE_QMAKE_LDFLAGS = "${LDFLAGS}" export OE_QMAKE_AR = "${AR}" export OE_QMAKE_STRIP = "echo" -export OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner" # qmake reads if from shell environment export OE_QMAKE_QTCONF_PATH = "${WORKDIR}/qt.conf" diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index a8fe4338..4d555bec 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -23,9 +23,9 @@ Signed-off-by: Martin Jansa configure | 2 +- mkspecs/features/configure.prf | 4 ++-- mkspecs/features/qt_functions.prf | 2 +- - mkspecs/linux-oe-g++/qmake.conf | 43 ++++++++++++++++++++++++++++++++++++ + mkspecs/linux-oe-g++/qmake.conf | 42 ++++++++++++++++++++++++++++++++++++ mkspecs/linux-oe-g++/qplatformdefs.h | 1 + - 5 files changed, 48 insertions(+), 4 deletions(-) + 5 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 mkspecs/linux-oe-g++/qmake.conf create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h @@ -78,10 +78,10 @@ index c00fdb73f8..0cf4de7b49 100644 cmd = perl -w $$system_path($${cmd}.pl) diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf new file mode 100644 -index 0000000000..c1837e6d55 +index 0000000..30d31ed --- /dev/null +++ b/mkspecs/linux-oe-g++/qmake.conf -@@ -0,0 +1,43 @@ +@@ -0,0 +1,42 @@ +# +# qmake configuration for linux-g++ with modifications for building with OpenEmbedded +# @@ -95,7 +95,6 @@ index 0000000000..c1837e6d55 +# QMAKE_ (moc, uic, rcc) are gone, overwrite only ar and strip +QMAKE_AR = $$(OE_QMAKE_AR) cqs +QMAKE_STRIP = $$(OE_QMAKE_STRIP) -+QMAKE_WAYLAND_SCANNER = $$(OE_QMAKE_WAYLAND_SCANNER) + +include(../common/gcc-base-unix.conf) + -- cgit v1.2.3