summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-09-24 03:24:19 -0700
committerMartin Jansa <Martin.Jansa@gmail.com>2018-09-25 09:50:40 +0000
commitd0cd7a7a70d3fe3b3041d41391c5c082d8f23a0d (patch)
tree727231310f8a41b47e8c5697f33df0266c8ce9a2 /recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
parent81239229dfda6d9a4b72dc44245fdfb9f10e6fcb (diff)
downloadmeta-qt5-d0cd7a7a70d3fe3b3041d41391c5c082d8f23a0d.tar.gz
qtbase: Fix errors due to -isystem
empty out QMAKE_CFLAGS_ISYSTEM this will ensure that -isystem is not used instead it will use -I to include internal QT headers Dont hardcode QMAKE_DEFAULT_INCDIRS when cross compile Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch')
-rw-r--r--recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
index a793ab49..acb0a7d4 100644
--- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
@@ -1,4 +1,4 @@
1From 4c54d7c45a47a9a63530e821468f7bc76dd78f77 Mon Sep 17 00:00:00 2001 1From a6f4987a281315dacc7b8b55928b9c0793cd0813 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 15 Apr 2013 04:29:32 +0200 3Date: Mon, 15 Apr 2013 04:29:32 +0200
4Subject: [PATCH] Add linux-oe-g++ platform 4Subject: [PATCH] Add linux-oe-g++ platform
@@ -103,7 +103,7 @@ index 1903e509c8..c093dd4592 100644
103 cmd = perl -w $$system_path($${cmd}.pl) 103 cmd = perl -w $$system_path($${cmd}.pl)
104diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf 104diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf
105new file mode 100644 105new file mode 100644
106index 0000000000..d90dfeb448 106index 0000000000..f34a66599a
107--- /dev/null 107--- /dev/null
108+++ b/mkspecs/linux-oe-g++/qmake.conf 108+++ b/mkspecs/linux-oe-g++/qmake.conf
109@@ -0,0 +1,40 @@ 109@@ -0,0 +1,40 @@
@@ -139,7 +139,7 @@ index 0000000000..d90dfeb448
139+QMAKE_LINK_SHLIB = $$(OE_QMAKE_LINK) 139+QMAKE_LINK_SHLIB = $$(OE_QMAKE_LINK)
140+QMAKE_LINK_C = $$(OE_QMAKE_LINK) 140+QMAKE_LINK_C = $$(OE_QMAKE_LINK)
141+QMAKE_LINK_C_SHLIB = $$(OE_QMAKE_LINK) 141+QMAKE_LINK_C_SHLIB = $$(OE_QMAKE_LINK)
142+ 142+QMAKE_CFLAGS_ISYSTEM =
143+# for the SDK 143+# for the SDK
144+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$(OE_QMAKE_QT_CONFIG) 144+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$(OE_QMAKE_QT_CONFIG)
145+ 145+