t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-02 19:12:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

qtbase: Drop QMAKE_WAYLAND_SCANNER from clang mkspecs file

Browse Source 
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>
This commit is contained in:
Khem Raj
2018-12-06 16:56:47 -08:00
committed by Martin Jansa
parent f2d7b948c1
commit 4c3d66f0b8
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch
View File

@@ -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"