aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2016-07-27 17:25:07 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2016-08-05 11:03:12 +0200
commit1a42aa78af040d0fbecc960e4f9dd3f180ccb404 (patch)
tree8f824b3548f0af18b91ed4737b72bdf8a2bed7e1 /recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
parent85694b94aa0b1e536eda13e7239720bca114b000 (diff)
qt5: upgrade to latest revisions in 5.7 branch
* LIC_FILES_CHKSUM were changed because of this small change: commit 4343c4e731c3268614fc79c9c42b4e5e4d59d7e6 Author: Sze Howe Koh <szehowe.koh@gmail.com> Date: Tue Jun 14 19:12:35 2016 +0800 Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" * -no-nis option was removed from qtbase in: commit 644d0e75240811212ed9fd0c21e3bd05db3ba5db Author: Ralf Nolden <nolden@kde.org> Date: Fri May 20 22:03:39 2016 +0200 Cleanup NIS support leftover from Qt 3/4 * allow to disable eglfs independently from gles2, because eglfs-egldevice may be autodetected when libdrm was built before qtbase since this upstream commit: commit 5c6d27b8dfa695ab04766a1711b00421dba9c7d0 Author: Ralf Nolden <nolden@kde.org> Date: Tue May 17 12:38:44 2016 +0200 Make eglfs-egldevice check work with pkgconfig as well and then it fails to build, because libdrm could be removed from sysroot and drm.h is missing. * recipes-qt/qt5/qtquick1/0001-qdeclarativetextinput-update-to-match-QWidgetLineCon.patch was resolved in upstream commit: commit 26229cfa0b729313893af5674d604e8692dbb946 Author: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com> Date: Tue Apr 26 15:08:34 2016 +0200 QDeclarativeTextInput: update API to use setBlinkingCursorEnabled Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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.patch24
1 files changed, 12 insertions, 12 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 af85fe9d..b28ca8b6 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 @@
-From 79f881eaa0a4a980963ce4ea1bc4c5e26c640c9a Mon Sep 17 00:00:00 2001
+From d6c75f788e15fb552eacb08359698a1342a97f20 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] Add linux-oe-g++ platform
@@ -56,10 +56,10 @@ 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 b65c564..ffe6931 100755
+index 0ba0c31..052872e 100755
--- a/configure
+++ b/configure
-@@ -339,6 +339,16 @@ getQMakeConf()
+@@ -333,6 +333,16 @@ getQMakeConf()
getSingleQMakeVariable "$1" "$specvals"
}
@@ -76,8 +76,8 @@ index b65c564..ffe6931 100755
getXQMakeConf()
{
if [ -z "$xspecvals" ]; then
-@@ -348,6 +358,16 @@ getXQMakeConf()
- getSingleQMakeVariable "$1" "$xspecvals"
+@@ -357,6 +367,16 @@ testXConfig()
+ esac
}
+# OE qmake.conf is reading some variables from shell env
@@ -93,7 +93,7 @@ index b65c564..ffe6931 100755
compilerSupportsFlag()
{
cat >conftest.cpp <<EOF
-@@ -569,24 +589,14 @@ fi
+@@ -578,24 +598,14 @@ fi
# initalize variables
#-------------------------------------------------------------------------------
@@ -124,7 +124,7 @@ index b65c564..ffe6931 100755
fi'`
eval "$cmd"
done
-@@ -3428,7 +3438,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then
+@@ -3443,7 +3453,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then
[ "$CFG_GTK" = "auto" ] && CFG_GTK=no
fi
@@ -133,7 +133,7 @@ index b65c564..ffe6931 100755
TEST_COMPILER=$QMAKE_CONF_COMPILER
-@@ -3479,7 +3489,7 @@ if [ "$XPLATFORM_ANDROID" = "yes" ] ; then
+@@ -3494,7 +3504,7 @@ if [ "$XPLATFORM_ANDROID" = "yes" ] ; then
fi
fi
@@ -142,7 +142,7 @@ index b65c564..ffe6931 100755
GCC_MACHINE_DUMP=
case "$TEST_COMPILER" in *g++) GCC_MACHINE_DUMP=$($TEST_COMPILER -dumpmachine);; esac
-@@ -3878,6 +3888,14 @@ setBootstrapVariable()
+@@ -3893,6 +3903,14 @@ setBootstrapVariable()
getQMakeConf "$1" | echo ${2-$1} = `if [ -n "$3" ]; then sed "$3"; else cat; fi` >> "$mkfile"
}
@@ -157,7 +157,7 @@ index b65c564..ffe6931 100755
# build qmake
if true; then ###[ '!' -f "$outpath/bin/qmake" ];
echo "Creating qmake..."
-@@ -3977,6 +3995,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+@@ -3986,6 +4004,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
EXEEXT=
;;
esac
@@ -166,10 +166,10 @@ index b65c564..ffe6931 100755
echo "COCOA_LFLAGS =-framework Foundation -framework CoreServices" >>"$mkfile"
echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile"
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
-index 92c288c..f3019e0 100644
+index a890c7f..151630c 100644
--- a/mkspecs/features/configure.prf
+++ b/mkspecs/features/configure.prf
-@@ -63,14 +63,14 @@ defineTest(qtCompileTest) {
+@@ -71,14 +71,14 @@ defineTest(qtCompileTest) {
}
# Clean up after previous run