summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch')
-rw-r--r--recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
index 8f95ccb3..081bcac0 100644
--- a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch
@@ -1,4 +1,4 @@
1From 71a2437e2ee5a1214ab88c8a3d1d0ddcc012698d Mon Sep 17 00:00:00 2001 1From 81cd2947e9b1290498bdc2505a76fb053ff33be8 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 01/11] Add linux-oe-g++ platform 4Subject: [PATCH 01/11] Add linux-oe-g++ platform
@@ -51,7 +51,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
51 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h 51 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
52 52
53diff --git a/configure b/configure 53diff --git a/configure b/configure
54index 7d6ba9f..1de01a9 100755 54index 229fb4e..b7a6fe3 100755
55--- a/configure 55--- a/configure
56+++ b/configure 56+++ b/configure
57@@ -316,6 +316,16 @@ getQMakeConf() 57@@ -316,6 +316,16 @@ getQMakeConf()
@@ -118,7 +118,7 @@ index 7d6ba9f..1de01a9 100755
118 # Use CC/CXX to run config.tests 118 # Use CC/CXX to run config.tests
119 mkdir -p "$outpath/config.tests" 119 mkdir -p "$outpath/config.tests"
120 rm -f "$outpath/config.tests/.qmake.cache" 120 rm -f "$outpath/config.tests/.qmake.cache"
121@@ -3167,7 +3185,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then 121@@ -3173,7 +3191,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then
122 [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no 122 [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no
123 fi 123 fi
124 124
@@ -127,7 +127,7 @@ index 7d6ba9f..1de01a9 100755
127 127
128 TEST_COMPILER=$QMAKE_CONF_COMPILER 128 TEST_COMPILER=$QMAKE_CONF_COMPILER
129 129
130@@ -3205,7 +3223,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then 130@@ -3211,7 +3229,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
131 exit 1 131 exit 1
132 fi 132 fi
133 fi 133 fi
@@ -136,7 +136,7 @@ index 7d6ba9f..1de01a9 100755
136 136
137 GCC_MACHINE_DUMP= 137 GCC_MACHINE_DUMP=
138 case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac 138 case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac
139@@ -3676,6 +3694,14 @@ setBootstrapVariable() 139@@ -3682,6 +3700,14 @@ setBootstrapVariable()
140 getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" 140 getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
141 } 141 }
142 142
@@ -151,7 +151,7 @@ index 7d6ba9f..1de01a9 100755
151 # build qmake 151 # build qmake
152 if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 152 if true; then ###[ '!' -f "$outpath/bin/qmake" ];
153 echo "Creating qmake..." 153 echo "Creating qmake..."
154@@ -3714,14 +3740,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 154@@ -3720,14 +3746,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
155 fi 155 fi
156 156
157 [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= 157 [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
@@ -175,10 +175,10 @@ index 7d6ba9f..1de01a9 100755
175 if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then 175 if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then
176 setBootstrapVariable QMAKE_CFLAGS_RELEASE 176 setBootstrapVariable QMAKE_CFLAGS_RELEASE
177diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf 177diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
178index 05e10c9..213eeb8 100644 178index 6b37a04..dcf6025 100644
179--- a/mkspecs/features/configure.prf 179--- a/mkspecs/features/configure.prf
180+++ b/mkspecs/features/configure.prf 180+++ b/mkspecs/features/configure.prf
181@@ -60,12 +60,12 @@ defineTest(qtCompileTest) { 181@@ -63,12 +63,12 @@ defineTest(qtCompileTest) {
182 } 182 }
183 183
184 # Clean up after previous run 184 # Clean up after previous run
@@ -346,5 +346,5 @@ index 0000000..dd12003
346+ 346+
347+#endif // QPLATFORMDEFS_H 347+#endif // QPLATFORMDEFS_H
348-- 348--
3492.1.1 3492.1.3
350 350