diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-20 01:05:55 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-20 01:05:55 +0000 |
commit | c6be23d3b01b046d2142bb6fc017078f6154ddb5 (patch) | |
tree | edf25f5285e202a654be77201eb0e288f8b5bdb6 /recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch | |
parent | 201fcf27cf07d60b7d6ab89c7dcefe2190217745 (diff) | |
download | meta-qt5-c6be23d3b01b046d2142bb6fc017078f6154ddb5.tar.gz |
qt5: upgrade to latest revision in 5.12
* WIP: only qtbase now
* fixes #136
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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 e894f34c..e652f97e 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 2856cb239b64b7d0330bb016e080ed294f9bad3e Mon Sep 17 00:00:00 2001 | 1 | From 0ba4c8db7ec77d36e12fafd210ec189ccb176e96 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 0fb84bc1b3..68b49b5303 100644 | 25 | index 5800aaa5b4..7b4901ce46 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 | @@ -16,7 +16,7 @@ QMAKE_LINK_SHLIB = $$QMAKE_CXX | 28 | @@ -16,7 +16,7 @@ QMAKE_LINK_SHLIB = $$QMAKE_CXX |
@@ -35,7 +35,7 @@ index 0fb84bc1b3..68b49b5303 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 | 36 | QMAKE_CFLAGS_LTCG = -flto |
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 234f71d495..c7d81a902e 100644 | 38 | index c2669e4833..3fde8dc85f 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 |