diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2020-01-13 15:42:26 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2020-01-13 15:57:32 +0200 |
commit | f6ebff397a53e9c2a23f67d1fc74b5fed11df4f9 (patch) | |
tree | d0094937e85e890e9379d1f1de769af62fb6e656 /recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch | |
parent | 9ff0a36249205d36bb44cc34a26cb6201180a89f (diff) | |
parent | 1b8e557011fffd0446e5f660d1b317c664a7cf08 (diff) | |
download | meta-qt5-f6ebff397a53e9c2a23f67d1fc74b5fed11df4f9.tar.gz |
Merge remote-tracking branch 'qt/upstream/master' into 5.14
* qt/upstream/master: (28 commits)
qtbase: Use pcre packages by default
qt5: use PACKAGECONFIG to disable tests and examples
qtlocation: use geoclue 2
qtbase: use offscreen platform plugin for tools
qtbase: add openssl PACKAGECONFIG for native nativesdk
qtbase-native: disable vulkan support
maliit-framework-qt5: fix test installations
qtenginio: remove obsolete module
ogl-runtime: update to v2.5.0 release
qtquick3d: add recipe
qtwebengine: refresh the patches and upload them to meta-qt5 forks on github for maintenance
qtbase: refresh the patches and upload them to meta-qt5 forks on github for maintenance
qt5: Update to Qt 5.14.0
qtbase: Fix patch fuzz detected with devtool
qtbase: Backport the patch from upstream gerrit
qt5-creator: Update musl patch to link qmldesigner with -lexecinfo
qtwebengine: Move CharAllocator definition to header
qt5-creator: Add missing dep on libz.so
qt5-creator: Make clang-format patch work with multiple clang versions
qtwebengine: Include cstddef for size_t definition
...
Change-Id: Ia71a5f1c53e8ce18a1a8b219f8c8ffee96723fb7
Diffstat (limited to 'recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch index 1f1ec8bd..c5a2a67f 100644 --- a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch +++ b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f01d43195be86fb5b06ad042551d65c54e34425a Mon Sep 17 00:00:00 2001 | 1 | From 716d70f9ac91725155f7e6c14727ab86fbdf44f4 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: Wed, 14 Feb 2018 17:08:43 -0800 | 3 | Date: Wed, 14 Feb 2018 17:08:43 -0800 |
4 | Subject: [PATCH] mkspecs/common/gcc-base.conf: Use -I instead of -isystem | 4 | Subject: [PATCH] mkspecs/common/gcc-base.conf: Use -I instead of -isystem |
@@ -22,7 +22,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
22 | 2 files changed, 2 insertions(+), 2 deletions(-) | 22 | 2 files changed, 2 insertions(+), 2 deletions(-) |
23 | 23 | ||
24 | diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf | 24 | diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf |
25 | index df210fe42d..79a3ddf2f8 100644 | 25 | index aead581478..8e06a069b4 100644 |
26 | --- a/mkspecs/common/clang.conf | 26 | --- a/mkspecs/common/clang.conf |
27 | +++ b/mkspecs/common/clang.conf | 27 | +++ b/mkspecs/common/clang.conf |
28 | @@ -18,7 +18,7 @@ QMAKE_PCH_OUTPUT_EXT = .pch | 28 | @@ -18,7 +18,7 @@ QMAKE_PCH_OUTPUT_EXT = .pch |
@@ -35,7 +35,7 @@ index df210fe42d..79a3ddf2f8 100644 | |||
35 | QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT} | 35 | QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT} |
36 | QMAKE_CFLAGS_LTCG = -flto=thin | 36 | QMAKE_CFLAGS_LTCG = -flto=thin |
37 | diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf | 37 | diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf |
38 | index 44b4267207..9756a02014 100644 | 38 | index 4d82321cba..0b03ec99a6 100644 |
39 | --- a/mkspecs/common/gcc-base.conf | 39 | --- a/mkspecs/common/gcc-base.conf |
40 | +++ b/mkspecs/common/gcc-base.conf | 40 | +++ b/mkspecs/common/gcc-base.conf |
41 | @@ -46,7 +46,7 @@ QMAKE_CFLAGS_DEBUG += -g | 41 | @@ -46,7 +46,7 @@ QMAKE_CFLAGS_DEBUG += -g |