diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-03-20 12:23:26 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-03-20 12:32:50 +0200 |
| commit | bd7a586d835d1dd0a5b201338e223fb94adc4380 (patch) | |
| tree | 2ec50ae595f291ccc80f046f6824c7f03d7b1f2a /recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch | |
| parent | 26205f49f51b5727d75bf8f02a894e04bf7b7942 (diff) | |
| parent | 0b0a608ddc55acf1f817aee03e65a06017239bed (diff) | |
| download | meta-qt5-bd7a586d835d1dd0a5b201338e223fb94adc4380.tar.gz | |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.12
* upstream/master:
0b0a608 qtbase: let user decide how to link openssl to Qt5 libraries
47d1132 qtbase: fix target mkspec adjustment
87f0462 qttools/cmake: use OE_QMAKE_PATH_EXTERNAL_HOST_BINS
fe88b99 nativesdk-qtbase: use rpath for nativesdk Qt tools
92c34de qt5: cleanup mkspecs
e117b58 qtbase: Fix test builds with clang/x86_64
6280bef qtscript: add fix for build with gcc 8.3
77ed8fb qtbase: Adjust target mkspec settings
75c7d00 qt5-creator: Do not ship two desktop files
6629131 packagegroup-qt5-toolchain-target: add qtbase-tools
Conflicts:
recipes-qt/qt5/nativesdk-qtbase_git.bb
recipes-qt/qt5/qtbase-native_git.bb
recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
recipes-qt/qt5/qtbase/0009-Add-OE-specific-specs-for-clang-compiler.patch
recipes-qt/qt5/qtbase_git.bb
Change-Id: Iaa69404f2d91bd492eea527548b7cf7c504b7bde
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 fe5746e2..5a9eb404 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 4486a9740b07aa7902f638efe23a51ee619f9600 Mon Sep 17 00:00:00 2001 | 1 | From 289f366363eeca03c27fd718c8b3ae53dcc28586 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 0000000000..db02ab5215 | 16 | index 00000000000..db02ab5215f |
| 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 0000000000..db02ab5215 | |||
| 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 0000000000..880c927b21 | 61 | index 00000000000..880c927b218 |
| 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 @@ |