diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-05-03 12:24:15 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-05-03 12:25:44 +0300 |
commit | e26163d066a867ca8f630f7caffff207ef26b4a7 (patch) | |
tree | c55678478e7bb344459d9bdf2528f4e321e9c4d0 /recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch | |
parent | 0778f92089010ac7e2c3ee1f36c8c9d5c102bbf9 (diff) | |
parent | 89ac66bf3969b48eb771ef4c06a0b8df00fd178a (diff) | |
download | meta-qt5-e26163d066a867ca8f630f7caffff207ef26b4a7.tar.gz |
Merge remote-tracking branch 'qtyocto/5.12' into 5.13
* qtyocto/5.12:
89ac66b Merge remote-tracking branch 'qtyocto/upstream/warrior' into 5.12
f087aeb Revert "qtbase: Adjust target mkspec settings"
8586caf qt5: update SRCREVs after v5.12.3 tags were downmerged to 5.12 branch
7dc422d qtwayland: check also that the destination for private headers exists before installing them
84d647a qtwayland: improve manual header installation
3d60f9a qtwayland: workaround upstream bug: install missing headers manually
eb5d6da qtwayland: disable gold for all archs like in qtbase
e2707a0 qt5: upgrade to 5.12.3
0778424 qtbase: disable gold for all archs not just x86
4303873 qtbase-native: use QT_CONFIG_FLAGS variable like qtbase and nativesdk-qtbase
8895ea3 qtbase: Fix build with recent oe-core/pseudo on hosts with glibc >= 2.28
95974f4 qtbase, qtmultimedia: refresh patches to apply cleanly and update them on github.com/meta-qt5 forks
a4bf240 qtbase-native: add native libdir to search path
adf7f60 qt5: patch build paths from installed files
28d4bfd Upgrade to 5.12.2
5a32838 layer.conf: Add warrior to compatible release series
Conflicts:
recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
recipes-qt/qt5/qtbase_git.bb
recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
recipes-qt/qt5/qtwebengine/chromium/0001-chromium-Force-host-toolchain-configuration.patch
recipes-qt/qt5/qtwebengine/chromium/0003-chromium-Fix-build-with-gcc8.patch
recipes-qt/qt5/qtwebengine/chromium/0019-chromium-fix-build-with-clang.patch
recipes-qt/qt5/qtwebengine/chromium/0020-chromium-Check-for-__ARM_FP-2-before-using-__fp16.patch
recipes-qt/qt5/qtwebengine/chromium/0021-chromium-Exclude-CRC32-for-32bit-arm.patch
Change-Id: Iec1b6e65f8dfbb73ab96d68a91ff6a5e7d93c7de
Diffstat (limited to 'recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch | 6 |
1 files changed, 3 insertions, 3 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 5a9eb404..8498fd6a 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 289f366363eeca03c27fd718c8b3ae53dcc28586 Mon Sep 17 00:00:00 2001 | 1 | From d1198f3f6f3293c46db913d63518f625162b3ce5 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sun, 3 Sep 2017 09:11:44 -0700 | 3 | Date: Sun, 3 Sep 2017 09:11:44 -0700 |
4 | Subject: [PATCH] Add OE specific specs for clang compiler | 4 | Subject: [PATCH] Add OE specific specs for clang compiler |
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
13 | 13 | ||
14 | diff --git a/mkspecs/linux-oe-clang/qmake.conf b/mkspecs/linux-oe-clang/qmake.conf | 14 | diff --git a/mkspecs/linux-oe-clang/qmake.conf b/mkspecs/linux-oe-clang/qmake.conf |
15 | new file mode 100644 | 15 | new file mode 100644 |
16 | index 00000000000..db02ab5215f | 16 | index 0000000000..db02ab5215 |
17 | --- /dev/null | 17 | --- /dev/null |
18 | +++ b/mkspecs/linux-oe-clang/qmake.conf | 18 | +++ b/mkspecs/linux-oe-clang/qmake.conf |
19 | @@ -0,0 +1,39 @@ | 19 | @@ -0,0 +1,39 @@ |
@@ -58,7 +58,7 @@ index 00000000000..db02ab5215f | |||
58 | +load(qt_config) | 58 | +load(qt_config) |
59 | diff --git a/mkspecs/linux-oe-clang/qplatformdefs.h b/mkspecs/linux-oe-clang/qplatformdefs.h | 59 | diff --git a/mkspecs/linux-oe-clang/qplatformdefs.h b/mkspecs/linux-oe-clang/qplatformdefs.h |
60 | new file mode 100644 | 60 | new file mode 100644 |
61 | index 00000000000..880c927b218 | 61 | index 0000000000..880c927b21 |
62 | --- /dev/null | 62 | --- /dev/null |
63 | +++ b/mkspecs/linux-oe-clang/qplatformdefs.h | 63 | +++ b/mkspecs/linux-oe-clang/qplatformdefs.h |
64 | @@ -0,0 +1 @@ | 64 | @@ -0,0 +1 @@ |