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.patch14
1 files changed, 7 insertions, 7 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 1455c6b5..a1ce9f2f 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 cfab0821397f5c41e123590b388c6f9c6834b1be Mon Sep 17 00:00:00 2001 1From e04fdddaeb59006c2d599b8b261ce714341029ba 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/12] Add linux-oe-g++ platform 4Subject: [PATCH 01/12] Add linux-oe-g++ platform
@@ -52,7 +52,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
52 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h 52 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
53 53
54diff --git a/configure b/configure 54diff --git a/configure b/configure
55index 043d9fc..12fe2f0 100755 55index 6ce6753..0a00d6d 100755
56--- a/configure 56--- a/configure
57+++ b/configure 57+++ b/configure
58@@ -316,6 +316,16 @@ getQMakeConf() 58@@ -316,6 +316,16 @@ getQMakeConf()
@@ -119,7 +119,7 @@ index 043d9fc..12fe2f0 100755
119 # Use CC/CXX to run config.tests 119 # Use CC/CXX to run config.tests
120 mkdir -p "$outpath/config.tests" 120 mkdir -p "$outpath/config.tests"
121 rm -f "$outpath/config.tests/.qmake.cache" 121 rm -f "$outpath/config.tests/.qmake.cache"
122@@ -3173,7 +3191,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then 122@@ -3178,7 +3196,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then
123 [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no 123 [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no
124 fi 124 fi
125 125
@@ -128,7 +128,7 @@ index 043d9fc..12fe2f0 100755
128 128
129 TEST_COMPILER=$QMAKE_CONF_COMPILER 129 TEST_COMPILER=$QMAKE_CONF_COMPILER
130 130
131@@ -3211,7 +3229,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then 131@@ -3216,7 +3234,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then
132 exit 1 132 exit 1
133 fi 133 fi
134 fi 134 fi
@@ -137,7 +137,7 @@ index 043d9fc..12fe2f0 100755
137 137
138 GCC_MACHINE_DUMP= 138 GCC_MACHINE_DUMP=
139 case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac 139 case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac
140@@ -3682,6 +3700,14 @@ setBootstrapVariable() 140@@ -3687,6 +3705,14 @@ setBootstrapVariable()
141 getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" 141 getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
142 } 142 }
143 143
@@ -152,7 +152,7 @@ index 043d9fc..12fe2f0 100755
152 # build qmake 152 # build qmake
153 if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 153 if true; then ###[ '!' -f "$outpath/bin/qmake" ];
154 echo "Creating qmake..." 154 echo "Creating qmake..."
155@@ -3720,14 +3746,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 155@@ -3725,14 +3751,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
156 fi 156 fi
157 157
158 [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= 158 [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM=
@@ -347,5 +347,5 @@ index 0000000..dd12003
347+ 347+
348+#endif // QPLATFORMDEFS_H 348+#endif // QPLATFORMDEFS_H
349-- 349--
3502.3.0 3502.3.1
351 351