summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2019-05-02 12:55:00 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2019-05-03 11:03:12 +0300
commit89ac66bf3969b48eb771ef4c06a0b8df00fd178a (patch)
treeb929ba359171175a23f3c10bb4ba199b00c17f4a /recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch
parentf087aeb1e988fcb0597fcf2b27981b1803909276 (diff)
parent8586caf2f2f5c11fb2ddff29eefe5dd7fc08cf38 (diff)
downloadmeta-qt5-89ac66bf3969b48eb771ef4c06a0b8df00fd178a.tar.gz
Merge remote-tracking branch 'qtyocto/upstream/warrior' into 5.12
* qtyocto/upstream/warrior: 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/nativesdk-qtbase_git.bb recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch recipes-qt/qt5/qt3d_git.bb recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase/0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtcanvas3d_git.bb recipes-qt/qt5/qtcharts_git.bb recipes-qt/qt5/qtconnectivity_git.bb recipes-qt/qt5/qtdatavis3d_git.bb recipes-qt/qt5/qtdeclarative_git.bb recipes-qt/qt5/qtgamepad_git.bb recipes-qt/qt5/qtgraphicaleffects_git.bb recipes-qt/qt5/qtimageformats_git.bb recipes-qt/qt5/qtknx_git.bb recipes-qt/qt5/qtlocation_git.bb recipes-qt/qt5/qtmqtt_git.bb recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtnetworkauth_git.bb recipes-qt/qt5/qtopcua_git.bb recipes-qt/qt5/qtpurchasing_git.bb recipes-qt/qt5/qtquickcontrols2_git.bb recipes-qt/qt5/qtquickcontrols_git.bb recipes-qt/qt5/qtremoteobjects_git.bb recipes-qt/qt5/qtscript_git.bb recipes-qt/qt5/qtscxml_git.bb recipes-qt/qt5/qtsensors_git.bb recipes-qt/qt5/qtserialbus_git.bb recipes-qt/qt5/qtserialport_git.bb recipes-qt/qt5/qtsvg_git.bb recipes-qt/qt5/qttools_git.bb recipes-qt/qt5/qttranslations_git.bb recipes-qt/qt5/qtvirtualkeyboard_git.bb recipes-qt/qt5/qtwayland_git.bb recipes-qt/qt5/qtwebchannel_git.bb recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtwebglplugin_git.bb recipes-qt/qt5/qtwebsockets_git.bb recipes-qt/qt5/qtwebview_git.bb recipes-qt/qt5/qtx11extras_git.bb recipes-qt/qt5/qtxmlpatterns_git.bb Change-Id: I085dfdddbf7915f776bd48a6d26ecf96777d9d19
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.patch6
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 @@
1From 289f366363eeca03c27fd718c8b3ae53dcc28586 Mon Sep 17 00:00:00 2001 1From d1198f3f6f3293c46db913d63518f625162b3ce5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 3 Sep 2017 09:11:44 -0700 3Date: Sun, 3 Sep 2017 09:11:44 -0700
4Subject: [PATCH] Add OE specific specs for clang compiler 4Subject: [PATCH] Add OE specific specs for clang compiler
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
13 13
14diff --git a/mkspecs/linux-oe-clang/qmake.conf b/mkspecs/linux-oe-clang/qmake.conf 14diff --git a/mkspecs/linux-oe-clang/qmake.conf b/mkspecs/linux-oe-clang/qmake.conf
15new file mode 100644 15new file mode 100644
16index 00000000000..db02ab5215f 16index 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)
59diff --git a/mkspecs/linux-oe-clang/qplatformdefs.h b/mkspecs/linux-oe-clang/qplatformdefs.h 59diff --git a/mkspecs/linux-oe-clang/qplatformdefs.h b/mkspecs/linux-oe-clang/qplatformdefs.h
60new file mode 100644 60new file mode 100644
61index 00000000000..880c927b218 61index 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 @@