diff options
| author | Khem Raj <raj.khem@gmail.com> | 2018-12-06 16:56:47 -0800 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-20 00:55:36 +0000 |
| commit | 4c3d66f0b8a1f27c5ccb2027fa612eef2904ef6a (patch) | |
| tree | 319ad7eb61a9a9543382fb6fc86d7e953afd8b6f | |
| parent | f2d7b948c11e7dc3e4ea58b4dd5b0b2ebdbe13d0 (diff) | |
qtbase: Drop QMAKE_WAYLAND_SCANNER from clang mkspecs file
This is to complete the fix that was sent last year to remove
QMAKE_WAYLAND_SCANNER
https://patchwork.openembedded.org/patch/145672/
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch index ca74f0f7..14493376 100644 --- a/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch +++ b/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch @@ -11,12 +11,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> create mode 100644 mkspecs/linux-oe-clang/qmake.conf create mode 100644 mkspecs/linux-oe-clang/qplatformdefs.h -diff --git a/mkspecs/linux-oe-clang/qmake.conf b/mkspecs/linux-oe-clang/qmake.conf -new file mode 100644 -index 0000000000..b0a5630fdd +Index: git/mkspecs/linux-oe-clang/qmake.conf +=================================================================== --- /dev/null -+++ b/mkspecs/linux-oe-clang/qmake.conf -@@ -0,0 +1,43 @@ ++++ git/mkspecs/linux-oe-clang/qmake.conf +@@ -0,0 +1,42 @@ +# +# qmake configuration for linux-g++ with modifications for building with OpenEmbedded +# @@ -30,7 +29,6 @@ index 0000000000..b0a5630fdd +# QMAKE_<TOOL> (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) + @@ -60,10 +58,9 @@ index 0000000000..b0a5630fdd + +load(device_config) +load(qt_config) -diff --git a/mkspecs/linux-oe-clang/qplatformdefs.h b/mkspecs/linux-oe-clang/qplatformdefs.h -new file mode 100644 -index 0000000000..880c927b21 +Index: git/mkspecs/linux-oe-clang/qplatformdefs.h +=================================================================== --- /dev/null -+++ b/mkspecs/linux-oe-clang/qplatformdefs.h ++++ git/mkspecs/linux-oe-clang/qplatformdefs.h @@ -0,0 +1 @@ +#include "../linux-clang/qplatformdefs.h" |