diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2017-09-28 15:54:49 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-10-10 09:45:39 +0000 |
| commit | d21707ff60066d8ad95b66cbb718e9230540ab50 (patch) | |
| tree | a7adc2fd987d56f786e76d325ebf61899c3a02ae /classes | |
| parent | 779b531c368246a55f75ae6df82611abd6e358bb (diff) | |
| download | meta-qt5-d21707ff60066d8ad95b66cbb718e9230540ab50.tar.gz | |
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 <mikko.gronoff@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/qmake5_base.bbclass | 2 |
1 files changed, 0 insertions, 2 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 = " \ | |||
| 26 | OE_QMAKE_LDFLAGS='${OE_QMAKE_LDFLAGS}' \ | 26 | OE_QMAKE_LDFLAGS='${OE_QMAKE_LDFLAGS}' \ |
| 27 | OE_QMAKE_AR='${OE_QMAKE_AR}' \ | 27 | OE_QMAKE_AR='${OE_QMAKE_AR}' \ |
| 28 | OE_QMAKE_STRIP='${OE_QMAKE_STRIP}' \ | 28 | OE_QMAKE_STRIP='${OE_QMAKE_STRIP}' \ |
| 29 | OE_QMAKE_WAYLAND_SCANNER='${OE_QMAKE_WAYLAND_SCANNER}' \ | ||
| 30 | OE_QMAKE_INCDIR_QT='${STAGING_DIR_TARGET}/${OE_QMAKE_PATH_HEADERS}' \ | 29 | OE_QMAKE_INCDIR_QT='${STAGING_DIR_TARGET}/${OE_QMAKE_PATH_HEADERS}' \ |
| 31 | " | 30 | " |
| 32 | 31 | ||
| @@ -40,7 +39,6 @@ export OE_QMAKE_LINK = "${CXX}" | |||
| 40 | export OE_QMAKE_LDFLAGS = "${LDFLAGS}" | 39 | export OE_QMAKE_LDFLAGS = "${LDFLAGS}" |
| 41 | export OE_QMAKE_AR = "${AR}" | 40 | export OE_QMAKE_AR = "${AR}" |
| 42 | export OE_QMAKE_STRIP = "echo" | 41 | export OE_QMAKE_STRIP = "echo" |
| 43 | export OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner" | ||
| 44 | 42 | ||
| 45 | # qmake reads if from shell environment | 43 | # qmake reads if from shell environment |
| 46 | export OE_QMAKE_QTCONF_PATH = "${WORKDIR}/qt.conf" | 44 | export OE_QMAKE_QTCONF_PATH = "${WORKDIR}/qt.conf" |
