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 | 17 |
1 files changed, 7 insertions, 10 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 284e0226..04e8739c 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,7 +1,7 @@ | |||
| 1 | From 516355ecd8ee54a8960c87c5f044b069221fa815 Mon Sep 17 00:00:00 2001 | 1 | From 79f881eaa0a4a980963ce4ea1bc4c5e26c640c9a 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] Add linux-oe-g++ platform |
| 5 | 5 | ||
| 6 | * This qmake.conf unlike other platforms reads most variables from | 6 | * This qmake.conf unlike other platforms reads most variables from |
| 7 | shell environment, because it's easier for qt recipes to export | 7 | shell environment, because it's easier for qt recipes to export |
| @@ -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 69d0a08..a53638a 100755 | 55 | index b65c564..ffe6931 100755 |
| 56 | --- a/configure | 56 | --- a/configure |
| 57 | +++ b/configure | 57 | +++ b/configure |
| 58 | @@ -339,6 +339,16 @@ getQMakeConf() | 58 | @@ -339,6 +339,16 @@ getQMakeConf() |
| @@ -120,7 +120,7 @@ index 69d0a08..a53638a 100755 | |||
| 120 | fi'` | 120 | fi'` |
| 121 | eval "$cmd" | 121 | eval "$cmd" |
| 122 | done | 122 | done |
| 123 | @@ -3430,7 +3440,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then | 123 | @@ -3428,7 +3438,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then |
| 124 | [ "$CFG_GTK" = "auto" ] && CFG_GTK=no | 124 | [ "$CFG_GTK" = "auto" ] && CFG_GTK=no |
| 125 | fi | 125 | fi |
| 126 | 126 | ||
| @@ -129,7 +129,7 @@ index 69d0a08..a53638a 100755 | |||
| 129 | 129 | ||
| 130 | TEST_COMPILER=$QMAKE_CONF_COMPILER | 130 | TEST_COMPILER=$QMAKE_CONF_COMPILER |
| 131 | 131 | ||
| 132 | @@ -3481,7 +3491,7 @@ if [ "$XPLATFORM_ANDROID" = "yes" ] ; then | 132 | @@ -3479,7 +3489,7 @@ if [ "$XPLATFORM_ANDROID" = "yes" ] ; then |
| 133 | fi | 133 | fi |
| 134 | fi | 134 | fi |
| 135 | 135 | ||
| @@ -138,7 +138,7 @@ index 69d0a08..a53638a 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 | @@ -3880,6 +3890,14 @@ setBootstrapVariable() | 141 | @@ -3878,6 +3888,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 69d0a08..a53638a 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 | @@ -3979,6 +3997,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; | 156 | @@ -3977,6 +3995,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
| 157 | EXEEXT= | 157 | EXEEXT= |
| 158 | ;; | 158 | ;; |
| 159 | esac | 159 | esac |
| @@ -336,6 +336,3 @@ index 0000000..dd12003 | |||
| 336 | +#endif | 336 | +#endif |
| 337 | + | 337 | + |
| 338 | +#endif // QPLATFORMDEFS_H | 338 | +#endif // QPLATFORMDEFS_H |
| 339 | -- | ||
| 340 | 2.7.1 | ||
| 341 | |||
