diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-18 12:44:07 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-30 14:15:29 +0100 |
commit | 69b7d8f725b0c431d61a224dbf13a7575531404f (patch) | |
tree | 645ba6820f43750ca643ec997091a88fd92d210e /recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch | |
parent | 9a4c0b393bf031acace5c2cc00d625a24c639d1c (diff) | |
download | meta-qt5-69b7d8f725b0c431d61a224dbf13a7575531404f.tar.gz |
qt5: upgrade git recipes to 5.4-beta1
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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.patch | 12 |
1 files changed, 6 insertions, 6 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 60a23391..8f95ccb3 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 @@ | |||
1 | From 7a573e702d37f3e83b92f6b07345aaab05261e7b Mon Sep 17 00:00:00 2001 | 1 | From 71a2437e2ee5a1214ab88c8a3d1d0ddcc012698d Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 | 3 | Date: Mon, 15 Apr 2013 04:29:32 +0200 |
4 | Subject: [PATCH 01/11] Add linux-oe-g++ platform | 4 | Subject: [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 | ||
53 | diff --git a/configure b/configure | 53 | diff --git a/configure b/configure |
54 | index 1efb645..b1dfca9 100755 | 54 | index 7d6ba9f..1de01a9 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 1efb645..b1dfca9 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 | @@ -3141,7 +3159,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then | 121 | @@ -3167,7 +3185,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 1efb645..b1dfca9 100755 | |||
127 | 127 | ||
128 | TEST_COMPILER=$QMAKE_CONF_COMPILER | 128 | TEST_COMPILER=$QMAKE_CONF_COMPILER |
129 | 129 | ||
130 | @@ -3176,7 +3194,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then | 130 | @@ -3205,7 +3223,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 1efb645..b1dfca9 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 | @@ -3647,6 +3665,14 @@ setBootstrapVariable() | 139 | @@ -3676,6 +3694,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 1efb645..b1dfca9 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 | @@ -3685,14 +3711,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 154 | @@ -3714,14 +3740,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= |