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) | |
| download | meta-qt5-4c3d66f0b8a1f27c5ccb2027fa612eef2904ef6a.tar.gz | |
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> | |||
| 11 | create mode 100644 mkspecs/linux-oe-clang/qmake.conf | 11 | create mode 100644 mkspecs/linux-oe-clang/qmake.conf |
| 12 | create mode 100644 mkspecs/linux-oe-clang/qplatformdefs.h | 12 | create mode 100644 mkspecs/linux-oe-clang/qplatformdefs.h |
| 13 | 13 | ||
| 14 | diff --git a/mkspecs/linux-oe-clang/qmake.conf b/mkspecs/linux-oe-clang/qmake.conf | 14 | Index: git/mkspecs/linux-oe-clang/qmake.conf |
| 15 | new file mode 100644 | 15 | =================================================================== |
| 16 | index 0000000000..b0a5630fdd | ||
| 17 | --- /dev/null | 16 | --- /dev/null |
| 18 | +++ b/mkspecs/linux-oe-clang/qmake.conf | 17 | +++ git/mkspecs/linux-oe-clang/qmake.conf |
| 19 | @@ -0,0 +1,43 @@ | 18 | @@ -0,0 +1,42 @@ |
| 20 | +# | 19 | +# |
| 21 | +# qmake configuration for linux-g++ with modifications for building with OpenEmbedded | 20 | +# qmake configuration for linux-g++ with modifications for building with OpenEmbedded |
| 22 | +# | 21 | +# |
| @@ -30,7 +29,6 @@ index 0000000000..b0a5630fdd | |||
| 30 | +# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip | 29 | +# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar and strip |
| 31 | +QMAKE_AR = $$(OE_QMAKE_AR) cqs | 30 | +QMAKE_AR = $$(OE_QMAKE_AR) cqs |
| 32 | +QMAKE_STRIP = $$(OE_QMAKE_STRIP) | 31 | +QMAKE_STRIP = $$(OE_QMAKE_STRIP) |
| 33 | +QMAKE_WAYLAND_SCANNER = $$(OE_QMAKE_WAYLAND_SCANNER) | ||
| 34 | + | 32 | + |
| 35 | +include(../common/gcc-base-unix.conf) | 33 | +include(../common/gcc-base-unix.conf) |
| 36 | + | 34 | + |
| @@ -60,10 +58,9 @@ index 0000000000..b0a5630fdd | |||
| 60 | + | 58 | + |
| 61 | +load(device_config) | 59 | +load(device_config) |
| 62 | +load(qt_config) | 60 | +load(qt_config) |
| 63 | diff --git a/mkspecs/linux-oe-clang/qplatformdefs.h b/mkspecs/linux-oe-clang/qplatformdefs.h | 61 | Index: git/mkspecs/linux-oe-clang/qplatformdefs.h |
| 64 | new file mode 100644 | 62 | =================================================================== |
| 65 | index 0000000000..880c927b21 | ||
| 66 | --- /dev/null | 63 | --- /dev/null |
| 67 | +++ b/mkspecs/linux-oe-clang/qplatformdefs.h | 64 | +++ git/mkspecs/linux-oe-clang/qplatformdefs.h |
| 68 | @@ -0,0 +1 @@ | 65 | @@ -0,0 +1 @@ |
| 69 | +#include "../linux-clang/qplatformdefs.h" | 66 | +#include "../linux-clang/qplatformdefs.h" |