diff options
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.patch | 14 |
1 files changed, 7 insertions, 7 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 568d2a40..e67df401 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 @@ | |||
1 | From de9a457dacd9388e8ef145fce9cf4e1e1da6468b Mon Sep 17 00:00:00 2001 | 1 | From 566de5f3f4dc14bae25a1b77eb6859c820447a32 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/10] Add linux-oe-g++ platform | 4 | Subject: [PATCH 01/10] 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 | ||
54 | diff --git a/configure b/configure | 54 | diff --git a/configure b/configure |
55 | index 8a4c89e..dfbb111 100755 | 55 | index cea62fb..e1929e7 100755 |
56 | --- a/configure | 56 | --- a/configure |
57 | +++ b/configure | 57 | +++ b/configure |
58 | @@ -342,6 +342,16 @@ getQMakeConf() | 58 | @@ -342,6 +342,16 @@ getQMakeConf() |
@@ -120,7 +120,7 @@ index 8a4c89e..dfbb111 100755 | |||
120 | fi'` | 120 | fi'` |
121 | eval "$cmd" | 121 | eval "$cmd" |
122 | done | 122 | done |
123 | @@ -3337,7 +3347,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then | 123 | @@ -3350,7 +3360,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then |
124 | [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no | 124 | [ "$CFG_QGTKSTYLE" = "auto" ] && CFG_QGTKSTYLE=no |
125 | fi | 125 | fi |
126 | 126 | ||
@@ -129,7 +129,7 @@ index 8a4c89e..dfbb111 100755 | |||
129 | 129 | ||
130 | TEST_COMPILER=$QMAKE_CONF_COMPILER | 130 | TEST_COMPILER=$QMAKE_CONF_COMPILER |
131 | 131 | ||
132 | @@ -3394,7 +3404,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then | 132 | @@ -3407,7 +3417,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then |
133 | exit 1 | 133 | exit 1 |
134 | fi | 134 | fi |
135 | fi | 135 | fi |
@@ -138,7 +138,7 @@ index 8a4c89e..dfbb111 100755 | |||
138 | 138 | ||
139 | GCC_MACHINE_DUMP= | 139 | GCC_MACHINE_DUMP= |
140 | case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac | 140 | case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac |
141 | @@ -3896,6 +3906,14 @@ setBootstrapVariable() | 141 | @@ -3909,6 +3919,14 @@ setBootstrapVariable() |
142 | getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" | 142 | getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" |
143 | } | 143 | } |
144 | 144 | ||
@@ -153,7 +153,7 @@ index 8a4c89e..dfbb111 100755 | |||
153 | # build qmake | 153 | # build qmake |
154 | if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 154 | if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
155 | echo "Creating qmake..." | 155 | echo "Creating qmake..." |
156 | @@ -3934,14 +3952,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 156 | @@ -3947,14 +3965,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
157 | fi | 157 | fi |
158 | 158 | ||
159 | [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= | 159 | [ "$CFG_SILENT" = "yes" ] && CC_TRANSFORM='s,^,\@,' || CC_TRANSFORM= |
@@ -348,5 +348,5 @@ index 0000000..dd12003 | |||
348 | + | 348 | + |
349 | +#endif // QPLATFORMDEFS_H | 349 | +#endif // QPLATFORMDEFS_H |
350 | -- | 350 | -- |
351 | 2.5.0 | 351 | 2.5.3 |
352 | 352 | ||