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 @@ -From 516355ecd8ee54a8960c87c5f044b069221fa815 Mon Sep 17 00:00:00 2001 +From 79f881eaa0a4a980963ce4ea1bc4c5e26c640c9a Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Mon, 15 Apr 2013 04:29:32 +0200 -Subject: [PATCH 01/10] Add linux-oe-g++ platform +Subject: [PATCH] Add linux-oe-g++ platform * This qmake.conf unlike other platforms reads most variables from shell environment, because it's easier for qt recipes to export @@ -52,7 +52,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h diff --git a/configure b/configure -index 69d0a08..a53638a 100755 +index b65c564..ffe6931 100755 --- a/configure +++ b/configure @@ -339,6 +339,16 @@ getQMakeConf() @@ -120,7 +120,7 @@ index 69d0a08..a53638a 100755 fi'` eval "$cmd" done -@@ -3430,7 +3440,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then +@@ -3428,7 +3438,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then [ "$CFG_GTK" = "auto" ] && CFG_GTK=no fi @@ -129,7 +129,7 @@ index 69d0a08..a53638a 100755 TEST_COMPILER=$QMAKE_CONF_COMPILER -@@ -3481,7 +3491,7 @@ if [ "$XPLATFORM_ANDROID" = "yes" ] ; then +@@ -3479,7 +3489,7 @@ if [ "$XPLATFORM_ANDROID" = "yes" ] ; then fi fi @@ -138,7 +138,7 @@ index 69d0a08..a53638a 100755 GCC_MACHINE_DUMP= case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac -@@ -3880,6 +3890,14 @@ setBootstrapVariable() +@@ -3878,6 +3888,14 @@ setBootstrapVariable() getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile" } @@ -153,7 +153,7 @@ index 69d0a08..a53638a 100755 # build qmake if true; then ###[ '!' -f "$outpath/bin/qmake" ]; echo "Creating qmake..." -@@ -3979,6 +3997,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; +@@ -3977,6 +3995,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; EXEEXT= ;; esac @@ -336,6 +336,3 @@ index 0000000..dd12003 +#endif + +#endif // QPLATFORMDEFS_H --- -2.7.1 - |