summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5')
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qt5-git.inc2
-rw-r--r--recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch18
-rw-r--r--recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch8
-rw-r--r--recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch28
-rw-r--r--recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch8
-rw-r--r--recipes-qt/qt5/qtbase-git/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch10
-rw-r--r--recipes-qt/qt5/qtbase-git/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch8
-rw-r--r--recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch4
-rw-r--r--recipes-qt/qt5/qtbase-git/0008-configure-bump-path-length-from-256-to-512-character.patch8
-rw-r--r--recipes-qt/qt5/qtbase-git/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch6
-rw-r--r--recipes-qt/qt5/qtbase-git/0010-QOpenGLPaintDevice-sub-area-support.patch17
-rw-r--r--recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch8
-rw-r--r--recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch8
-rw-r--r--recipes-qt/qt5/qtbase-git/0012-configure-preserve-built-qmake-and-swap-with-native-.patch8
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch4
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb2
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb2
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb2
-rw-r--r--recipes-qt/qt5/qtmultimedia-git/0001-Initial-porting-effort-to-GStreamer-1.0.patch28
-rw-r--r--recipes-qt/qt5/qtmultimedia-git/0002-qtmultimedia.pro-Respect-OE_GSTREAMER_ENABLED-OE_GST.patch4
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtquick1_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb2
-rw-r--r--recipes-qt/qt5/qtscript_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialport_git.bb2
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb2
-rw-r--r--recipes-qt/qt5/qtsystems.inc5
-rw-r--r--recipes-qt/qt5/qtsystems_5.3.2+git.bb20
-rw-r--r--recipes-qt/qt5/qtsystems_git.bb11
-rw-r--r--recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch4
-rw-r--r--recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch4
-rw-r--r--recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch4
-rw-r--r--recipes-qt/qt5/qttools-native_git.bb2
-rw-r--r--recipes-qt/qt5/qttools_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland-git/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch4
-rw-r--r--recipes-qt/qt5/qtwayland-git/0001-examples-wayland-include-server-buffer-only-when-bui.patch4
-rw-r--r--recipes-qt/qt5/qtwayland-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch12
-rw-r--r--recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch29
-rw-r--r--recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Try-to-add-_moc-suffix.patch34
-rw-r--r--recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch29
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb19
-rw-r--r--recipes-qt/qt5/qtwebkit-git/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch4
-rw-r--r--recipes-qt/qt5/qtwebkit_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
51 files changed, 223 insertions, 177 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 96d86dbc..ac865c0a 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -32,7 +32,7 @@ SRC_URI += " \
32 file://0012-configure-preserve-built-qmake-and-swap-with-native-.patch \ 32 file://0012-configure-preserve-built-qmake-and-swap-with-native-.patch \
33" 33"
34 34
35SRCREV = "06e706bdbb826b521389409b53079483fda5584a" 35SRCREV = "cc23ebace8b7f343aca6e10f9ebd31b87c17c782"
36 36
37LICENSE = "GFDL-1.3 & LGPL-2.1 | LGPL-3.0" 37LICENSE = "GFDL-1.3 & LGPL-2.1 | LGPL-3.0"
38LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ 38LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index 4f8fa987..8631e107 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -10,7 +10,7 @@ SRC_URI += " \
10 10
11S = "${WORKDIR}/git" 11S = "${WORKDIR}/git"
12 12
13PV = "5.3.99+5.4.0-beta1+git${SRCPV}" 13PV = "5.3.99+5.4.0-rc1+git${SRCPV}"
14 14
15FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:" 15FILESEXTRAPATHS =. "${FILE_DIRNAME}/${BPN}-git:"
16 16
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 8f95ccb3..081bcac0 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 @@
1From 71a2437e2ee5a1214ab88c8a3d1d0ddcc012698d Mon Sep 17 00:00:00 2001 1From 81cd2947e9b1290498bdc2505a76fb053ff33be8 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 15 Apr 2013 04:29:32 +0200 3Date: Mon, 15 Apr 2013 04:29:32 +0200
4Subject: [PATCH 01/11] Add linux-oe-g++ platform 4Subject: [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
53diff --git a/configure b/configure 53diff --git a/configure b/configure
54index 7d6ba9f..1de01a9 100755 54index 229fb4e..b7a6fe3 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 7d6ba9f..1de01a9 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@@ -3167,7 +3185,7 @@ if [ "$XPLATFORM_MAC" = "yes" ]; then 121@@ -3173,7 +3191,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 7d6ba9f..1de01a9 100755
127 127
128 TEST_COMPILER=$QMAKE_CONF_COMPILER 128 TEST_COMPILER=$QMAKE_CONF_COMPILER
129 129
130@@ -3205,7 +3223,7 @@ if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then 130@@ -3211,7 +3229,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 7d6ba9f..1de01a9 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@@ -3676,6 +3694,14 @@ setBootstrapVariable() 139@@ -3682,6 +3700,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 7d6ba9f..1de01a9 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@@ -3714,14 +3740,14 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 154@@ -3720,14 +3746,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=
@@ -175,10 +175,10 @@ index 7d6ba9f..1de01a9 100755
175 if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then 175 if [ "$CFG_RELEASE_QMAKE" = "yes" ]; then
176 setBootstrapVariable QMAKE_CFLAGS_RELEASE 176 setBootstrapVariable QMAKE_CFLAGS_RELEASE
177diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf 177diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
178index 05e10c9..213eeb8 100644 178index 6b37a04..dcf6025 100644
179--- a/mkspecs/features/configure.prf 179--- a/mkspecs/features/configure.prf
180+++ b/mkspecs/features/configure.prf 180+++ b/mkspecs/features/configure.prf
181@@ -60,12 +60,12 @@ defineTest(qtCompileTest) { 181@@ -63,12 +63,12 @@ defineTest(qtCompileTest) {
182 } 182 }
183 183
184 # Clean up after previous run 184 # Clean up after previous run
@@ -346,5 +346,5 @@ index 0000000..dd12003
346+ 346+
347+#endif // QPLATFORMDEFS_H 347+#endif // QPLATFORMDEFS_H
348-- 348--
3492.1.1 3492.1.3
350 350
diff --git a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
index e4ef88c4..bae0dd3b 100644
--- a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -1,4 +1,4 @@
1From 1e7e18bca925638cb381edbba3f10ce79799d460 Mon Sep 17 00:00:00 2001 1From aae38b0ff226f287ad40f6eb423f1b974f548b73 Mon Sep 17 00:00:00 2001
2From: Holger Freyther <zecke@selfish.org> 2From: Holger Freyther <zecke@selfish.org>
3Date: Wed, 26 Sep 2012 17:22:30 +0200 3Date: Wed, 26 Sep 2012 17:22:30 +0200
4Subject: [PATCH 02/11] qlibraryinfo: allow to set qt.conf from the outside 4Subject: [PATCH 02/11] qlibraryinfo: allow to set qt.conf from the outside
@@ -19,10 +19,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
19 1 file changed, 4 insertions(+), 1 deletion(-) 19 1 file changed, 4 insertions(+), 1 deletion(-)
20 20
21diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp 21diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
22index c3ec2bc..1be2659 100644 22index 7ca0aa7..d68c51b 100644
23--- a/src/corelib/global/qlibraryinfo.cpp 23--- a/src/corelib/global/qlibraryinfo.cpp
24+++ b/src/corelib/global/qlibraryinfo.cpp 24+++ b/src/corelib/global/qlibraryinfo.cpp
25@@ -147,7 +147,10 @@ QLibrarySettings::QLibrarySettings() 25@@ -139,7 +139,10 @@ QLibrarySettings::QLibrarySettings()
26 26
27 QSettings *QLibraryInfoPrivate::findConfiguration() 27 QSettings *QLibraryInfoPrivate::findConfiguration()
28 { 28 {
@@ -35,5 +35,5 @@ index c3ec2bc..1be2659 100644
35 if(!QFile::exists(qtconfig)) 35 if(!QFile::exists(qtconfig))
36 qtconfig = qt_libraryInfoFile(); 36 qtconfig = qt_libraryInfoFile();
37-- 37--
382.1.1 382.1.3
39 39
diff --git a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch
index 7c54008b..c633ea70 100644
--- a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch
@@ -1,4 +1,4 @@
1From 8f5a3f5b5d8f50661a2c69d5741a9df237600094 Mon Sep 17 00:00:00 2001 1From f2d51e50a7fbdf485696d1b8b2d29e64c729c76b Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 6 Apr 2013 13:15:07 +0200 3Date: Sat, 6 Apr 2013 13:15:07 +0200
4Subject: [PATCH 03/11] Add -external-hostbindir option 4Subject: [PATCH 03/11] Add -external-hostbindir option
@@ -28,17 +28,17 @@ Signed-off-by: Jonathan Liu <net147@gmail.com>
28 mkspecs/features/qt_functions.prf | 6 +++++- 28 mkspecs/features/qt_functions.prf | 6 +++++-
29 mkspecs/features/qt_tool.prf | 4 ++-- 29 mkspecs/features/qt_tool.prf | 4 ++--
30 qmake/property.cpp | 1 + 30 qmake/property.cpp | 1 +
31 qtbase.pro | 14 +++++++++++--- 31 qtbase.pro | 13 ++++++++++---
32 src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++--- 32 src/corelib/Qt5CoreConfigExtras.cmake.in | 6 +++---
33 src/corelib/global/qlibraryinfo.cpp | 3 ++- 33 src/corelib/global/qlibraryinfo.cpp | 3 ++-
34 src/corelib/global/qlibraryinfo.h | 1 + 34 src/corelib/global/qlibraryinfo.h | 1 +
35 src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++-- 35 src/dbus/Qt5DBusConfigExtras.cmake.in | 4 ++--
36 src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- 36 src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +-
37 tools/configure/configureapp.cpp | 8 ++++++++ 37 tools/configure/configureapp.cpp | 8 ++++++++
38 11 files changed, 51 insertions(+), 13 deletions(-) 38 11 files changed, 50 insertions(+), 13 deletions(-)
39 39
40diff --git a/configure b/configure 40diff --git a/configure b/configure
41index 1de01a9..7d7a98a 100755 41index b7a6fe3..d715f6c 100755
42--- a/configure 42--- a/configure
43+++ b/configure 43+++ b/configure
44@@ -769,6 +769,7 @@ QT_HOST_BINS= 44@@ -769,6 +769,7 @@ QT_HOST_BINS=
@@ -67,7 +67,7 @@ index 1de01a9..7d7a98a 100755
67 pkg-config) 67 pkg-config)
68 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then 68 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
69 CFG_PKGCONFIG="$VAL" 69 CFG_PKGCONFIG="$VAL"
70@@ -2260,6 +2265,10 @@ Installation options: 70@@ -2265,6 +2270,10 @@ Installation options:
71 -hostdatadir <dir> . Data used by qmake will be installed to <dir> 71 -hostdatadir <dir> . Data used by qmake will be installed to <dir>
72 (default HOSTPREFIX) 72 (default HOSTPREFIX)
73 73
@@ -78,7 +78,7 @@ index 1de01a9..7d7a98a 100755
78 Configure options: 78 Configure options:
79 79
80 The defaults (*) are usually acceptable. A plus (+) denotes a default value 80 The defaults (*) are usually acceptable. A plus (+) denotes a default value
81@@ -2939,6 +2948,11 @@ fi 81@@ -2944,6 +2953,11 @@ fi
82 # command line and environment validation 82 # command line and environment validation
83 #------------------------------------------------------------------------------- 83 #-------------------------------------------------------------------------------
84 84
@@ -90,7 +90,7 @@ index 1de01a9..7d7a98a 100755
90 # update QT_CONFIG to show our current predefined configuration 90 # update QT_CONFIG to show our current predefined configuration
91 CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h 91 CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h
92 case "$CFG_QCONFIG" in 92 case "$CFG_QCONFIG" in
93@@ -3638,6 +3652,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = { 93@@ -3644,6 +3658,7 @@ static const char qt_configure_prefix_path_strs[][256 + 12] = {
94 "qt_hbinpath=$QT_HOST_BINS", 94 "qt_hbinpath=$QT_HOST_BINS",
95 "qt_hlibpath=$QT_HOST_LIBS", 95 "qt_hlibpath=$QT_HOST_LIBS",
96 "qt_hdatpath=$QT_HOST_DATA", 96 "qt_hdatpath=$QT_HOST_DATA",
@@ -146,7 +146,7 @@ index 051e056..50da6ed 100644
146 { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, 146 { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true },
147 }; 147 };
148diff --git a/qtbase.pro b/qtbase.pro 148diff --git a/qtbase.pro b/qtbase.pro
149index d6861cf..7fb58a3 100644 149index 6d0de44..ddf7478 100644
150--- a/qtbase.pro 150--- a/qtbase.pro
151+++ b/qtbase.pro 151+++ b/qtbase.pro
152@@ -69,18 +69,25 @@ CONFIG -= qt 152@@ -69,18 +69,25 @@ CONFIG -= qt
@@ -210,10 +210,10 @@ index 9bda70e..6e3605a 100644
210 _qt5_Core_check_file_exists(${imported_location}) 210 _qt5_Core_check_file_exists(${imported_location})
211 211
212diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp 212diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
213index 1be2659..6c3718a 100644 213index d68c51b..7191159 100644
214--- a/src/corelib/global/qlibraryinfo.cpp 214--- a/src/corelib/global/qlibraryinfo.cpp
215+++ b/src/corelib/global/qlibraryinfo.cpp 215+++ b/src/corelib/global/qlibraryinfo.cpp
216@@ -357,7 +357,7 @@ QLibraryInfo::isDebugBuild() 216@@ -349,7 +349,7 @@ QLibraryInfo::isDebugBuild()
217 */ 217 */
218 218
219 static const struct { 219 static const struct {
@@ -222,7 +222,7 @@ index 1be2659..6c3718a 100644
222 } qtConfEntries[] = { 222 } qtConfEntries[] = {
223 { "Prefix", "." }, 223 { "Prefix", "." },
224 { "Documentation", "doc" }, // should be ${Data}/doc 224 { "Documentation", "doc" }, // should be ${Data}/doc
225@@ -383,6 +383,7 @@ static const struct { 225@@ -375,6 +375,7 @@ static const struct {
226 { "HostBinaries", "bin" }, 226 { "HostBinaries", "bin" },
227 { "HostLibraries", "lib" }, 227 { "HostLibraries", "lib" },
228 { "HostData", "." }, 228 { "HostData", "." },
@@ -278,7 +278,7 @@ index 99d87e2..5621dc0 100644
278 _qt5_Widgets_check_file_exists(${imported_location}) 278 _qt5_Widgets_check_file_exists(${imported_location})
279 279
280diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp 280diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
281index 99ecc7b..6e0f4da 100644 281index 92422c2..d0a62c8 100644
282--- a/tools/configure/configureapp.cpp 282--- a/tools/configure/configureapp.cpp
283+++ b/tools/configure/configureapp.cpp 283+++ b/tools/configure/configureapp.cpp
284@@ -1191,6 +1191,13 @@ void Configure::parseCmdLine() 284@@ -1191,6 +1191,13 @@ void Configure::parseCmdLine()
@@ -295,7 +295,7 @@ index 99ecc7b..6e0f4da 100644
295 else if (configCmdLine.at(i) == "-make-tool") { 295 else if (configCmdLine.at(i) == "-make-tool") {
296 ++i; 296 ++i;
297 if (i == argCount) 297 if (i == argCount)
298@@ -3994,6 +4001,7 @@ void Configure::generateQConfigCpp() 298@@ -3995,6 +4002,7 @@ void Configure::generateQConfigCpp()
299 << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl 299 << " \"qt_hbinpath=" << formatPath(dictionary["QT_HOST_BINS"]) << "\"," << endl
300 << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl 300 << " \"qt_hlibpath=" << formatPath(dictionary["QT_HOST_LIBS"]) << "\"," << endl
301 << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl 301 << " \"qt_hdatpath=" << formatPath(dictionary["QT_HOST_DATA"]) << "\"," << endl
@@ -304,5 +304,5 @@ index 99ecc7b..6e0f4da 100644
304 << " \"qt_hostspec=" << hostSpec << "\"," << endl 304 << " \"qt_hostspec=" << hostSpec << "\"," << endl
305 << "#endif" << endl 305 << "#endif" << endl
306-- 306--
3072.1.1 3072.1.3
308 308
diff --git a/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
index b5b77464..83694b7d 100644
--- a/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
+++ b/recipes-qt/qt5/qtbase-git/0004-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch
@@ -1,4 +1,4 @@
1From e74a3790f613771099e3373f8e6df506c3520b73 Mon Sep 17 00:00:00 2001 1From 13a61389aa33fdfd5d9a1adf824d98c5ebf1cdff Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 27 Apr 2013 22:33:33 +0200 3Date: Sat, 27 Apr 2013 22:33:33 +0200
4Subject: [PATCH 04/11] configureapp: Prefix default LIBDIRS and INCDIRS with 4Subject: [PATCH 04/11] configureapp: Prefix default LIBDIRS and INCDIRS with
@@ -11,10 +11,10 @@ Upstream-Status: Pending
11 1 file changed, 2 insertions(+), 2 deletions(-) 11 1 file changed, 2 insertions(+), 2 deletions(-)
12 12
13diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp 13diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
14index 6e0f4da..d72c302 100644 14index d0a62c8..b3f3ff8 100644
15--- a/tools/configure/configureapp.cpp 15--- a/tools/configure/configureapp.cpp
16+++ b/tools/configure/configureapp.cpp 16+++ b/tools/configure/configureapp.cpp
17@@ -3383,8 +3383,8 @@ void Configure::generateQConfigPri() 17@@ -3384,8 +3384,8 @@ void Configure::generateQConfigPri()
18 configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl; 18 configStream << " QT_ARCH = " << dictionary["QT_ARCH"] << endl;
19 if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { 19 if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) {
20 // FIXME: add detection 20 // FIXME: add detection
@@ -26,5 +26,5 @@ index 6e0f4da..d72c302 100644
26 configStream << "}" << endl; 26 configStream << "}" << endl;
27 configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl; 27 configStream << "QT_CONFIG += " << qtConfig.join(' ') << endl;
28-- 28--
292.1.1 292.1.3
30 30
diff --git a/recipes-qt/qt5/qtbase-git/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase-git/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
index 46616066..a6e90894 100644
--- a/recipes-qt/qt5/qtbase-git/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
+++ b/recipes-qt/qt5/qtbase-git/0005-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
@@ -1,4 +1,4 @@
1From 9f7dd27bb14cf0c3425c2c8fdec2f6d0df3852f9 Mon Sep 17 00:00:00 2001 1From 5778f98f990781710e72be8275dae32a7999330d Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 27 Apr 2013 23:15:37 +0200 3Date: Sat, 27 Apr 2013 23:15:37 +0200
4Subject: [PATCH 05/11] qt_module: Fix pkgconfig and libtool replacements 4Subject: [PATCH 05/11] qt_module: Fix pkgconfig and libtool replacements
@@ -67,7 +67,7 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
67 2 files changed, 16 insertions(+), 1 deletion(-) 67 2 files changed, 16 insertions(+), 1 deletion(-)
68 68
69diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf 69diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
70index ebc5f00..46319d8 100644 70index af9d6ca..a4781d6 100644
71--- a/mkspecs/features/qt_common.prf 71--- a/mkspecs/features/qt_common.prf
72+++ b/mkspecs/features/qt_common.prf 72+++ b/mkspecs/features/qt_common.prf
73@@ -33,7 +33,7 @@ contains(TEMPLATE, .*lib) { 73@@ -33,7 +33,7 @@ contains(TEMPLATE, .*lib) {
@@ -80,10 +80,10 @@ index ebc5f00..46319d8 100644
80 lib_replace.CONFIG = path 80 lib_replace.CONFIG = path
81 QMAKE_PRL_INSTALL_REPLACE += lib_replace 81 QMAKE_PRL_INSTALL_REPLACE += lib_replace
82diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf 82diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
83index 8599a47..7da73a6 100644 83index d213f9e..915c596 100644
84--- a/mkspecs/features/qt_module.prf 84--- a/mkspecs/features/qt_module.prf
85+++ b/mkspecs/features/qt_module.prf 85+++ b/mkspecs/features/qt_module.prf
86@@ -190,10 +190,25 @@ unix|mingw { 86@@ -192,10 +192,25 @@ unix|mingw {
87 QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt, "Qt ") module 87 QMAKE_PKGCONFIG_DESCRIPTION = $$replace(TARGET, ^Qt, "Qt ") module
88 QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace 88 QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace
89 89
@@ -110,5 +110,5 @@ index 8599a47..7da73a6 100644
110 } 110 }
111 111
112-- 112--
1132.1.1 1132.1.3
114 114
diff --git a/recipes-qt/qt5/qtbase-git/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch b/recipes-qt/qt5/qtbase-git/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
index 6e47e815..042d7638 100644
--- a/recipes-qt/qt5/qtbase-git/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
+++ b/recipes-qt/qt5/qtbase-git/0006-Revert-eglfs-Print-the-chosen-config-in-debug-mode.patch
@@ -1,4 +1,4 @@
1From 4b6778e44b35d97bd08baded4e5d1f570693ae05 Mon Sep 17 00:00:00 2001 1From 4a067c162d08596e3ec89dcfb3ecdf197b1bf22a Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 21 Apr 2014 19:22:04 +0200 3Date: Mon, 21 Apr 2014 19:22:04 +0200
4Subject: [PATCH 06/11] Revert "eglfs: Print the chosen config in debug mode" 4Subject: [PATCH 06/11] Revert "eglfs: Print the chosen config in debug mode"
@@ -51,7 +51,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
51 2 files changed, 3 insertions(+), 8 deletions(-) 51 2 files changed, 3 insertions(+), 8 deletions(-)
52 52
53diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp 53diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp
54index 1fdeec3..0fa3d88 100644 54index c1a491c..7a0fc87 100644
55--- a/src/platformsupport/eglconvenience/qeglconvenience.cpp 55--- a/src/platformsupport/eglconvenience/qeglconvenience.cpp
56+++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp 56+++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp
57@@ -443,9 +443,11 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config) 57@@ -443,9 +443,11 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config)
@@ -66,7 +66,7 @@ index 1fdeec3..0fa3d88 100644
66+ qWarning("\n"); 66+ qWarning("\n");
67 } 67 }
68 68
69 #ifdef Q_OS_LINUX 69 #ifdef Q_OS_UNIX
70diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp 70diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
71index 7cc3300..ccbd974 100644 71index 7cc3300..ccbd974 100644
72--- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp 72--- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
@@ -93,5 +93,5 @@ index 7cc3300..ccbd974 100644
93 } 93 }
94 94
95-- 95--
962.1.1 962.1.3
97 97
diff --git a/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch b/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch
index ddc541a7..c528f0c9 100644
--- a/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch
+++ b/recipes-qt/qt5/qtbase-git/0007-qeglplatformintegration-Undefine-CursorShape-from-X..patch
@@ -1,4 +1,4 @@
1From 2ec9a882cd9a0893f2060ef36d28e0568416f9fe Mon Sep 17 00:00:00 2001 1From 8e152449beb18454347cfdb300c50d113fa48383 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 19 Mar 2014 18:32:28 +0100 3Date: Wed, 19 Mar 2014 18:32:28 +0100
4Subject: [PATCH 07/11] qeglplatformintegration: Undefine CursorShape from X.h 4Subject: [PATCH 07/11] qeglplatformintegration: Undefine CursorShape from X.h
@@ -26,5 +26,5 @@ index 4d7adce..c9b6873 100644
26 26
27 class QEGLPlatformScreen; 27 class QEGLPlatformScreen;
28-- 28--
292.1.1 292.1.3
30 30
diff --git a/recipes-qt/qt5/qtbase-git/0008-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase-git/0008-configure-bump-path-length-from-256-to-512-character.patch
index 508f9f98..c20d6f15 100644
--- a/recipes-qt/qt5/qtbase-git/0008-configure-bump-path-length-from-256-to-512-character.patch
+++ b/recipes-qt/qt5/qtbase-git/0008-configure-bump-path-length-from-256-to-512-character.patch
@@ -1,4 +1,4 @@
1From 00906b6ca765e7e71d354bf675b27b3862af535c Mon Sep 17 00:00:00 2001 1From 3a31a14c9c244a22337f22d083a680f69a1b1ce8 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com> 2From: Denys Dmytriyenko <denys@ti.com>
3Date: Mon, 11 Nov 2013 20:27:30 -0500 3Date: Mon, 11 Nov 2013 20:27:30 -0500
4Subject: [PATCH 08/11] configure: bump path length from 256 to 512 characters 4Subject: [PATCH 08/11] configure: bump path length from 256 to 512 characters
@@ -12,10 +12,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
12 1 file changed, 1 insertion(+), 1 deletion(-) 12 1 file changed, 1 insertion(+), 1 deletion(-)
13 13
14diff --git a/configure b/configure 14diff --git a/configure b/configure
15index 7d7a98a..3f05383 100755 15index d715f6c..bd43281 100755
16--- a/configure 16--- a/configure
17+++ b/configure 17+++ b/configure
18@@ -3616,7 +3616,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ 18@@ -3622,7 +3622,7 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$
19 static const char qt_configure_installation [12+11] = "qt_instdate=`date +%Y-%m-%d`"; 19 static const char qt_configure_installation [12+11] = "qt_instdate=`date +%Y-%m-%d`";
20 20
21 /* Installation Info */ 21 /* Installation Info */
@@ -25,5 +25,5 @@ index 7d7a98a..3f05383 100755
25 "qt_prfxpath=$QT_SYSROOT_PREFIX", 25 "qt_prfxpath=$QT_SYSROOT_PREFIX",
26 "qt_docspath=$QT_SYSROOT_DOCS", 26 "qt_docspath=$QT_SYSROOT_DOCS",
27-- 27--
282.1.1 282.1.3
29 29
diff --git a/recipes-qt/qt5/qtbase-git/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch b/recipes-qt/qt5/qtbase-git/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
index 0f663304..200864a9 100644
--- a/recipes-qt/qt5/qtbase-git/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
+++ b/recipes-qt/qt5/qtbase-git/0009-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch
@@ -1,4 +1,4 @@
1From 46cf3a50908de0ccec31de6705674a4c69fb8d6c Mon Sep 17 00:00:00 2001 1From 621d867223a135a9babd452d4918200bc6d0463b Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Wed, 5 Feb 2014 18:35:08 +0100 3Date: Wed, 5 Feb 2014 18:35:08 +0100
4Subject: [PATCH 09/11] eglfs: fix egl error for platforms only supporting one 4Subject: [PATCH 09/11] eglfs: fix egl error for platforms only supporting one
@@ -27,7 +27,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
27 1 file changed, 15 insertions(+), 1 deletion(-) 27 1 file changed, 15 insertions(+), 1 deletion(-)
28 28
29diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp 29diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp
30index c83b894..b937881 100644 30index f5839e0..5ebde6d 100644
31--- a/src/plugins/platforms/eglfs/qeglfswindow.cpp 31--- a/src/plugins/platforms/eglfs/qeglfswindow.cpp
32+++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp 32+++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp
33@@ -66,6 +66,15 @@ void QEglFSWindow::create() 33@@ -66,6 +66,15 @@ void QEglFSWindow::create()
@@ -68,5 +68,5 @@ index c83b894..b937881 100644
68 68
69 if (isRaster()) { 69 if (isRaster()) {
70-- 70--
712.1.1 712.1.3
72 72
diff --git a/recipes-qt/qt5/qtbase-git/0010-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase-git/0010-QOpenGLPaintDevice-sub-area-support.patch
index 51a244d7..986d2a93 100644
--- a/recipes-qt/qt5/qtbase-git/0010-QOpenGLPaintDevice-sub-area-support.patch
+++ b/recipes-qt/qt5/qtbase-git/0010-QOpenGLPaintDevice-sub-area-support.patch
@@ -1,4 +1,4 @@
1From e7b9af7232c4f7eb50933dde208e58438bedd964 Mon Sep 17 00:00:00 2001 1From 46074ffb4525e8217acd78c9cbe29f3d62f85c78 Mon Sep 17 00:00:00 2001
2From: Jani Hautakangas <jani.hautakangas@ixonos.com> 2From: Jani Hautakangas <jani.hautakangas@ixonos.com>
3Date: Thu, 16 May 2013 09:52:07 +0300 3Date: Thu, 16 May 2013 09:52:07 +0300
4Subject: [PATCH 10/11] QOpenGLPaintDevice sub-area support 4Subject: [PATCH 10/11] QOpenGLPaintDevice sub-area support
@@ -21,7 +21,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
21 6 files changed, 23 insertions(+), 3 deletions(-) 21 6 files changed, 23 insertions(+), 3 deletions(-)
22 22
23diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp 23diff --git a/src/gui/opengl/qopenglpaintdevice.cpp b/src/gui/opengl/qopenglpaintdevice.cpp
24index e908fd8..8f0ef56 100644 24index a08d26f..cff3155 100644
25--- a/src/gui/opengl/qopenglpaintdevice.cpp 25--- a/src/gui/opengl/qopenglpaintdevice.cpp
26+++ b/src/gui/opengl/qopenglpaintdevice.cpp 26+++ b/src/gui/opengl/qopenglpaintdevice.cpp
27@@ -135,6 +135,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height) 27@@ -135,6 +135,12 @@ QOpenGLPaintDevice::QOpenGLPaintDevice(int width, int height)
@@ -50,18 +50,17 @@ index e908fd8..8f0ef56 100644
50 Returns the pixel size of the paint device. 50 Returns the pixel size of the paint device.
51 51
52diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h 52diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h
53index dda3bfe..9965553 100644 53index 10cee84..a6683c5 100644
54--- a/src/gui/opengl/qopenglpaintdevice.h 54--- a/src/gui/opengl/qopenglpaintdevice.h
55+++ b/src/gui/opengl/qopenglpaintdevice.h 55+++ b/src/gui/opengl/qopenglpaintdevice.h
56@@ -53,6 +53,7 @@ public: 56@@ -53,12 +53,14 @@ public:
57 QOpenGLPaintDevice(); 57 QOpenGLPaintDevice();
58 explicit QOpenGLPaintDevice(const QSize &size); 58 explicit QOpenGLPaintDevice(const QSize &size);
59 QOpenGLPaintDevice(int width, int height); 59 QOpenGLPaintDevice(int width, int height);
60+ QOpenGLPaintDevice(int x, int y, int width, int height); 60+ QOpenGLPaintDevice(int x, int y, int width, int height);
61 QOpenGLPaintDevice(QOpenGLPaintDevicePrivate *dd);
62 virtual ~QOpenGLPaintDevice(); 61 virtual ~QOpenGLPaintDevice();
63 62
64@@ -60,6 +61,7 @@ public: 63 int devType() const { return QInternal::OpenGL; }
65 QPaintEngine *paintEngine() const; 64 QPaintEngine *paintEngine() const;
66 65
67 QOpenGLContext *context() const; 66 QOpenGLContext *context() const;
@@ -141,10 +140,10 @@ index 5ef0366..c5b517d 100644
141 QOpenGLContext *ctx; 140 QOpenGLContext *ctx;
142 EngineMode mode; 141 EngineMode mode;
143diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp 142diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp
144index 6e16b2d..ddec9bb 100644 143index cd268cd..997bc35 100644
145--- a/src/gui/opengl/qopengltextureglyphcache.cpp 144--- a/src/gui/opengl/qopengltextureglyphcache.cpp
146+++ b/src/gui/opengl/qopengltextureglyphcache.cpp 145+++ b/src/gui/opengl/qopengltextureglyphcache.cpp
147@@ -308,7 +308,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height) 146@@ -310,7 +310,7 @@ void QOpenGLTextureGlyphCache::resizeTextureData(int width, int height)
148 funcs->glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo); 147 funcs->glBindFramebuffer(GL_FRAMEBUFFER, (GLuint)oldFbo);
149 148
150 if (pex != 0) { 149 if (pex != 0) {
@@ -154,5 +153,5 @@ index 6e16b2d..ddec9bb 100644
154 } else { 153 } else {
155 if (m_vao.isCreated()) { 154 if (m_vao.isCreated()) {
156-- 155--
1572.1.1 1562.1.3
158 157
diff --git a/recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch b/recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch
index 8ef6eaa2..86bf90d7 100644
--- a/recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch
+++ b/recipes-qt/qt5/qtbase-git/0011-Always-build-uic.patch
@@ -1,4 +1,4 @@
1From 8a3493c260f8b0580f9dd0ab2dafbf968c14e019 Mon Sep 17 00:00:00 2001 1From d48323aae1bee4b2398d61e1777815ffac15ccce Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 16 Nov 2013 00:32:30 +0100 3Date: Sat, 16 Nov 2013 00:32:30 +0100
4Subject: [PATCH 11/12] Always build uic 4Subject: [PATCH 11/12] Always build uic
@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/src/src.pro b/src/src.pro 16diff --git a/src/src.pro b/src/src.pro
17index ab93641..a48606b 100644 17index 81f4fa5..74ec23d 100644
18--- a/src/src.pro 18--- a/src/src.pro
19+++ b/src/src.pro 19+++ b/src/src.pro
20@@ -161,7 +161,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent 20@@ -162,7 +162,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
21 } 21 }
22 } 22 }
23 } 23 }
@@ -27,5 +27,5 @@ index ab93641..a48606b 100644
27 nacl: SUBDIRS -= src_network src_testlib 27 nacl: SUBDIRS -= src_network src_testlib
28 28
29-- 29--
302.1.1 302.1.3
31 31
diff --git a/recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch b/recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
index 1e701c7d..21e0987b 100644
--- a/recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
+++ b/recipes-qt/qt5/qtbase-git/0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch
@@ -1,4 +1,4 @@
1From d750936020f354b8c59bbfcbf3930115c390d36d Mon Sep 17 00:00:00 2001 1From ee542556da221be99fa3344630b78529555be2bc Mon Sep 17 00:00:00 2001
2From: Michael Krelin <hacker@klever.net> 2From: Michael Krelin <hacker@klever.net>
3Date: Mon, 29 Oct 2012 20:07:49 -0700 3Date: Mon, 29 Oct 2012 20:07:49 -0700
4Subject: [PATCH 11/11] qmake: don't build it in configure, but allow to build 4Subject: [PATCH 11/11] qmake: don't build it in configure, but allow to build
@@ -20,10 +20,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
20 2 files changed, 3 insertions(+), 1 deletion(-) 20 2 files changed, 3 insertions(+), 1 deletion(-)
21 21
22diff --git a/configure b/configure 22diff --git a/configure b/configure
23index 3f05383..05ae996 100755 23index bd43281..5d1b3aa 100755
24--- a/configure 24--- a/configure
25+++ b/configure 25+++ b/configure
26@@ -3718,7 +3718,7 @@ setBootstrapEvalVariable() 26@@ -3724,7 +3724,7 @@ setBootstrapEvalVariable()
27 27
28 28
29 # build qmake 29 # build qmake
@@ -46,5 +46,5 @@ index 89d6ea5..7c605b9 100644
46 VPATH += \ 46 VPATH += \
47 ../src/corelib/global \ 47 ../src/corelib/global \
48-- 48--
492.1.1 492.1.3
50 50
diff --git a/recipes-qt/qt5/qtbase-git/0012-configure-preserve-built-qmake-and-swap-with-native-.patch b/recipes-qt/qt5/qtbase-git/0012-configure-preserve-built-qmake-and-swap-with-native-.patch
index d89f3446..6a428ed2 100644
--- a/recipes-qt/qt5/qtbase-git/0012-configure-preserve-built-qmake-and-swap-with-native-.patch
+++ b/recipes-qt/qt5/qtbase-git/0012-configure-preserve-built-qmake-and-swap-with-native-.patch
@@ -1,4 +1,4 @@
1From 36b89f6e50e2b28d8646a5e77cdac36ecbd6ba4f Mon Sep 17 00:00:00 2001 1From 9089bf90632ffc983625816c5b0f2f2509ffc176 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com> 2From: Denys Dmytriyenko <denys@ti.com>
3Date: Mon, 11 Nov 2013 20:22:34 -0500 3Date: Mon, 11 Nov 2013 20:22:34 -0500
4Subject: [PATCH 12/12] configure: preserve built qmake and swap with native 4Subject: [PATCH 12/12] configure: preserve built qmake and swap with native
@@ -13,10 +13,10 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
13 1 file changed, 2 insertions(+) 13 1 file changed, 2 insertions(+)
14 14
15diff --git a/configure b/configure 15diff --git a/configure b/configure
16index 3f05383..d6ff774 100755 16index bd43281..d331711 100755
17--- a/configure 17--- a/configure
18+++ b/configure 18+++ b/configure
19@@ -3868,6 +3868,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; 19@@ -3874,6 +3874,8 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
20 20
21 (cd "$outpath/qmake"; "$MAKE") || exit 2 21 (cd "$outpath/qmake"; "$MAKE") || exit 2
22 fi # Build qmake 22 fi # Build qmake
@@ -26,5 +26,5 @@ index 3f05383..d6ff774 100755
26 echo "Running configuration tests..." 26 echo "Running configuration tests..."
27 27
28-- 28--
292.1.1 292.1.3
30 30
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 5853731f..9d7baed6 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -30,7 +30,7 @@ do_install_append() {
30 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt 30 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
31} 31}
32 32
33SRCREV = "06e706bdbb826b521389409b53079483fda5584a" 33SRCREV = "cc23ebace8b7f343aca6e10f9ebd31b87c17c782"
34 34
35LICENSE = "GFDL-1.3 & LGPL-2.1 | LGPL-3.0" 35LICENSE = "GFDL-1.3 & LGPL-2.1 | LGPL-3.0"
36LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ 36LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 443f64a1..f1366518 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -24,7 +24,7 @@ SRC_URI += "\
24 file://0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \ 24 file://0011-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \
25" 25"
26 26
27SRCREV = "06e706bdbb826b521389409b53079483fda5584a" 27SRCREV = "cc23ebace8b7f343aca6e10f9ebd31b87c17c782"
28 28
29LICENSE = "GFDL-1.3 & LGPL-2.1 | LGPL-3.0" 29LICENSE = "GFDL-1.3 & LGPL-2.1 | LGPL-3.0"
30LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ 30LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 7bf6b307..4e7323bd 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -1,7 +1,7 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${BPN}.inc 2require ${BPN}.inc
3 3
4SRCREV = "4a6d4e8682384887d1b30b9c3107f47c57d7ee3f" 4SRCREV = "73563f571e6dfd37a0e4cf90f4679d9901b9233c"
5 5
6LICENSE += "| GPL-2.0" 6LICENSE += "| GPL-2.0"
7LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed" 7LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed"
diff --git a/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch
index 2c0b3b69..acff84f7 100644
--- a/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch
+++ b/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch
@@ -1,4 +1,4 @@
1From 74983b3dfdf23880ce63d7ecb866a9e08bff923d Mon Sep 17 00:00:00 2001 1From a5a0646f185a8062f6d257afba37f589a223b058 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> 2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
3Date: Sun, 26 May 2013 14:26:19 +0200 3Date: Sun, 26 May 2013 14:26:19 +0200
4Subject: [PATCH] qmltestexample: fix link 4Subject: [PATCH] qmltestexample: fix link
@@ -84,5 +84,5 @@ index 1bb913e..56f2dd5 100644
84 84
85 load(qt_tool) 85 load(qt_tool)
86-- 86--
872.1.1 872.1.3
88 88
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 1cdbee5c..e7f8871b 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -1,7 +1,7 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "d767254ee09e9fd773bd40c93395609ac8bbf7e6" 4SRCREV = "be6c91acc3ee5ebb8336b9e79df195662ac11788"
5 5
6LICENSE += "| GPL-2.0" 6LICENSE += "| GPL-2.0"
7LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed" 7LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index b73fa851..1923f87f 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -1,7 +1,7 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "fef13b3b4c1a8af83086ecf49430903778e63624" 4SRCREV = "9141782adabcfd374285c3a52b7c386b9b90aa9a"
5 5
6LICENSE += "| GPL-2.0" 6LICENSE += "| GPL-2.0"
7LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed" 7LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 133c188c..35b06dd9 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -1,7 +1,7 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "eebf55a6919dff9eec4dd8529223aae6f6d0f569" 4SRCREV = "486874134b83672ae46bce315f632943829d5303"
5 5
6LICENSE += "| GPL-2.0" 6LICENSE += "| GPL-2.0"
7LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed" 7LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed"
diff --git a/recipes-qt/qt5/qtmultimedia-git/0001-Initial-porting-effort-to-GStreamer-1.0.patch b/recipes-qt/qt5/qtmultimedia-git/0001-Initial-porting-effort-to-GStreamer-1.0.patch
index 5c12cbd3..ab819f26 100644
--- a/recipes-qt/qt5/qtmultimedia-git/0001-Initial-porting-effort-to-GStreamer-1.0.patch
+++ b/recipes-qt/qt5/qtmultimedia-git/0001-Initial-porting-effort-to-GStreamer-1.0.patch
@@ -1,4 +1,4 @@
1From b16e42196969a6277e7b8902488fad1950a52d0d Mon Sep 17 00:00:00 2001 1From 4af76880d63e8d392eb8add8b8999e3f5031675a Mon Sep 17 00:00:00 2001
2From: Yoann Lopes <yoann.lopes@digia.com> 2From: Yoann Lopes <yoann.lopes@digia.com>
3Date: Thu, 31 Oct 2013 15:06:30 +0100 3Date: Thu, 31 Oct 2013 15:06:30 +0100
4Subject: [PATCH 1/2] Initial porting effort to GStreamer 1.0. 4Subject: [PATCH 1/2] Initial porting effort to GStreamer 1.0.
@@ -612,7 +612,7 @@ index 3ed539e..ed0ed3c 100644
612+ 612+
613+#endif 613+#endif
614diff --git a/src/gsttools/qgstappsrc.cpp b/src/gsttools/qgstappsrc.cpp 614diff --git a/src/gsttools/qgstappsrc.cpp b/src/gsttools/qgstappsrc.cpp
615index 148366b..cf9be45 100644 615index 561a96f..d5e106f 100644
616--- a/src/gsttools/qgstappsrc.cpp 616--- a/src/gsttools/qgstappsrc.cpp
617+++ b/src/gsttools/qgstappsrc.cpp 617+++ b/src/gsttools/qgstappsrc.cpp
618@@ -147,23 +147,44 @@ void QGstAppSrc::pushDataToAppSrc() 618@@ -147,23 +147,44 @@ void QGstAppSrc::pushDataToAppSrc()
@@ -1032,7 +1032,7 @@ index a373dcc..587b010 100644
1032 1032
1033 if (caps) { 1033 if (caps) {
1034diff --git a/src/gsttools/qgstutils.cpp b/src/gsttools/qgstutils.cpp 1034diff --git a/src/gsttools/qgstutils.cpp b/src/gsttools/qgstutils.cpp
1035index 8d484aa..b0e377b 100644 1035index 556fc03..5ea2c59 100644
1036--- a/src/gsttools/qgstutils.cpp 1036--- a/src/gsttools/qgstutils.cpp
1037+++ b/src/gsttools/qgstutils.cpp 1037+++ b/src/gsttools/qgstutils.cpp
1038@@ -89,8 +89,13 @@ static void addTagToMap(const GstTagList *list, 1038@@ -89,8 +89,13 @@ static void addTagToMap(const GstTagList *list,
@@ -1083,7 +1083,7 @@ index 8d484aa..b0e377b 100644
1083 1083
1084 /*! 1084 /*!
1085 Builds GstCaps for an audio format. 1085 Builds GstCaps for an audio format.
1086@@ -564,7 +587,7 @@ int QGstUtils::cameraOrientation(const QString &device, GstElementFactory * fact 1086@@ -579,7 +602,7 @@ QByteArray QGstUtils::cameraDriver(const QString &device, GstElementFactory *fac
1087 1087
1088 void qt_gst_object_ref_sink(gpointer object) 1088 void qt_gst_object_ref_sink(gpointer object)
1089 { 1089 {
@@ -1514,10 +1514,10 @@ index 81e5764..c9fdb5c 100644
1514 GstElement *m_videoSink; 1514 GstElement *m_videoSink;
1515 WId m_windowId; 1515 WId m_windowId;
1516diff --git a/src/multimedia/gsttools_headers/qgstutils_p.h b/src/multimedia/gsttools_headers/qgstutils_p.h 1516diff --git a/src/multimedia/gsttools_headers/qgstutils_p.h b/src/multimedia/gsttools_headers/qgstutils_p.h
1517index 48434b2..96c23cb 100644 1517index 65ff759..6015980 100644
1518--- a/src/multimedia/gsttools_headers/qgstutils_p.h 1518--- a/src/multimedia/gsttools_headers/qgstutils_p.h
1519+++ b/src/multimedia/gsttools_headers/qgstutils_p.h 1519+++ b/src/multimedia/gsttools_headers/qgstutils_p.h
1520@@ -72,7 +72,11 @@ namespace QGstUtils { 1520@@ -73,7 +73,11 @@ namespace QGstUtils {
1521 QSize capsResolution(const GstCaps *caps); 1521 QSize capsResolution(const GstCaps *caps);
1522 QSize capsCorrectedResolution(const GstCaps *caps); 1522 QSize capsCorrectedResolution(const GstCaps *caps);
1523 QAudioFormat audioFormatForCaps(const GstCaps *caps); 1523 QAudioFormat audioFormatForCaps(const GstCaps *caps);
@@ -1689,10 +1689,10 @@ index f944a60..72d1cf1 100644
1689 if (m_duration != duration) { 1689 if (m_duration != duration) {
1690 m_duration = duration; 1690 m_duration = duration;
1691diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp 1691diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
1692index 0197839..128ab58 100644 1692index a4038c5..9d1fdfa 100644
1693--- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp 1693--- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp
1694+++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp 1694+++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
1695@@ -728,7 +728,11 @@ qint64 CameraBinSession::duration() const 1695@@ -760,7 +760,11 @@ qint64 CameraBinSession::duration() const
1696 if (fileSink) { 1696 if (fileSink) {
1697 GstFormat format = GST_FORMAT_TIME; 1697 GstFormat format = GST_FORMAT_TIME;
1698 gint64 duration = 0; 1698 gint64 duration = 0;
@@ -1704,7 +1704,7 @@ index 0197839..128ab58 100644
1704 gst_object_unref(GST_OBJECT(fileSink)); 1704 gst_object_unref(GST_OBJECT(fileSink));
1705 if (ret) 1705 if (ret)
1706 return duration / 1000000; 1706 return duration / 1000000;
1707@@ -765,8 +769,13 @@ void CameraBinSession::setMetaData(const QMap<QByteArray, QVariant> &data) 1707@@ -797,8 +801,13 @@ void CameraBinSession::setMetaData(const QMap<QByteArray, QVariant> &data)
1708 1708
1709 if (m_camerabin) { 1709 if (m_camerabin) {
1710 GstIterator *elements = gst_bin_iterate_all_by_interface(GST_BIN(m_camerabin), GST_TYPE_TAG_SETTER); 1710 GstIterator *elements = gst_bin_iterate_all_by_interface(GST_BIN(m_camerabin), GST_TYPE_TAG_SETTER);
@@ -1718,7 +1718,7 @@ index 0197839..128ab58 100644
1718 gst_tag_setter_reset_tags(GST_TAG_SETTER(element)); 1718 gst_tag_setter_reset_tags(GST_TAG_SETTER(element));
1719 1719
1720 QMapIterator<QByteArray, QVariant> it(data); 1720 QMapIterator<QByteArray, QVariant> it(data);
1721@@ -827,7 +836,11 @@ bool CameraBinSession::processSyncMessage(const QGstreamerMessage &message) 1721@@ -859,7 +868,11 @@ bool CameraBinSession::processSyncMessage(const QGstreamerMessage &message)
1722 1722
1723 if (gm && GST_MESSAGE_TYPE(gm) == GST_MESSAGE_ELEMENT) { 1723 if (gm && GST_MESSAGE_TYPE(gm) == GST_MESSAGE_ELEMENT) {
1724 if (m_captureMode == QCamera::CaptureStillImage && 1724 if (m_captureMode == QCamera::CaptureStillImage &&
@@ -1730,7 +1730,7 @@ index 0197839..128ab58 100644
1730 st = gst_message_get_structure(gm); 1730 st = gst_message_get_structure(gm);
1731 1731
1732 if (gst_structure_has_field_typed(st, "buffer", GST_TYPE_BUFFER)) { 1732 if (gst_structure_has_field_typed(st, "buffer", GST_TYPE_BUFFER)) {
1733@@ -837,7 +850,11 @@ bool CameraBinSession::processSyncMessage(const QGstreamerMessage &message) 1733@@ -869,7 +882,11 @@ bool CameraBinSession::processSyncMessage(const QGstreamerMessage &message)
1734 1734
1735 QImage img; 1735 QImage img;
1736 1736
@@ -1742,7 +1742,7 @@ index 0197839..128ab58 100644
1742 if (caps) { 1742 if (caps) {
1743 GstStructure *structure = gst_caps_get_structure(caps, 0); 1743 GstStructure *structure = gst_caps_get_structure(caps, 0);
1744 gint width = 0; 1744 gint width = 0;
1745@@ -1110,7 +1127,11 @@ QList< QPair<int,int> > CameraBinSession::supportedFrameRates(const QSize &frame 1745@@ -1142,7 +1159,11 @@ QList< QPair<int,int> > CameraBinSession::supportedFrameRates(const QSize &frame
1746 gst_structure_remove_all_fields(structure); 1746 gst_structure_remove_all_fields(structure);
1747 gst_structure_set_value(structure, "framerate", &rate); 1747 gst_structure_set_value(structure, "framerate", &rate);
1748 } 1748 }
@@ -1754,7 +1754,7 @@ index 0197839..128ab58 100644
1754 1754
1755 1755
1756 for (uint i=0; i<gst_caps_get_size(caps); i++) { 1756 for (uint i=0; i<gst_caps_get_size(caps); i++) {
1757@@ -1230,7 +1251,11 @@ QList<QSize> CameraBinSession::supportedResolutions(QPair<int,int> rate, 1757@@ -1262,7 +1283,11 @@ QList<QSize> CameraBinSession::supportedResolutions(QPair<int,int> rate,
1758 gst_structure_set_value(structure, "width", &w); 1758 gst_structure_set_value(structure, "width", &w);
1759 gst_structure_set_value(structure, "height", &h); 1759 gst_structure_set_value(structure, "height", &h);
1760 } 1760 }
@@ -2365,5 +2365,5 @@ index f2e760a..50bda3d 100644
2365 2365
2366 QT_END_NAMESPACE 2366 QT_END_NAMESPACE
2367-- 2367--
23682.1.1 23682.1.3
2369 2369
diff --git a/recipes-qt/qt5/qtmultimedia-git/0002-qtmultimedia.pro-Respect-OE_GSTREAMER_ENABLED-OE_GST.patch b/recipes-qt/qt5/qtmultimedia-git/0002-qtmultimedia.pro-Respect-OE_GSTREAMER_ENABLED-OE_GST.patch
index d225d079..1654e00d 100644
--- a/recipes-qt/qt5/qtmultimedia-git/0002-qtmultimedia.pro-Respect-OE_GSTREAMER_ENABLED-OE_GST.patch
+++ b/recipes-qt/qt5/qtmultimedia-git/0002-qtmultimedia.pro-Respect-OE_GSTREAMER_ENABLED-OE_GST.patch
@@ -1,4 +1,4 @@
1From 392d324d86e3b889acfce4f3469158dd942cc969 Mon Sep 17 00:00:00 2001 1From b5c058f62a79efa213e4492ac7209b3a92f45e3b Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 5 Jul 2014 09:10:02 +0200 3Date: Sat, 5 Jul 2014 09:10:02 +0200
4Subject: [PATCH 2/2] qtmultimedia.pro: Respect 4Subject: [PATCH 2/2] qtmultimedia.pro: Respect
@@ -49,5 +49,5 @@ index 109dd81..54b67a8 100644
49 cache(GST_VERSION, set, gstver); 49 cache(GST_VERSION, set, gstver);
50 # Force a re-run of the test 50 # Force a re-run of the test
51-- 51--
522.1.1 522.1.3
53 53
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index fc61cd36..65a83a02 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -1,7 +1,7 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "b366a99eb14f166ebdcfcb6d328b4d7552227b71" 4SRCREV = "59f2bf186400241c62a02044265d9ecab81c1749"
5 5
6LICENSE += "| GPL-2.0" 6LICENSE += "| GPL-2.0"
7LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed" 7LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed"
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index 7beec5dd..54cc9907 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -1,7 +1,7 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "61df13088c6c1d6a1b5a6d329dcc6879b33d69ba" 4SRCREV = "1f92491bd95abc642dcd882846884a5271c8ba16"
5 5
6LICENSE += "| GPL-2.0" 6LICENSE += "| GPL-2.0"
7LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed" 7LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index e0edf986..2e3b8b38 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -1,7 +1,7 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "737379ad810d4431a93bed214f50b25632ba00e5" 4SRCREV = "3704a616dfabb71ebd3ffc64f8efe32931c82a8b"
5 5
6LICENSE += "| GPL-2.0" 6LICENSE += "| GPL-2.0"
7LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed" 7LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 445cf7a6..8ef7f1df 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -1,7 +1,7 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "9871b41531d632105f1d11e3a9683b05061177c1" 4SRCREV = "2bb2ebef4c86c588c3041569ffb090041ffc6b04"
5 5
6LICENSE += "| GPL-2.0" 6LICENSE += "| GPL-2.0"
7LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed" 7LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index 82a58bd5..f3807afb 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -1,7 +1,7 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "3bb682ea29ffaf72ff73e6eb57abdc5c59524e8a" 4SRCREV = "ab51ad6a5f4e533c31bd8e5b6f16a3bcd09a3ee6"
5 5
6# text of LGPL_EXCEPTION.txt and LICENSE.FDL is slightly different than what 6# text of LGPL_EXCEPTION.txt and LICENSE.FDL is slightly different than what
7# other qt* components use :/ 7# other qt* components use :/
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 64ae78e6..e2c04104 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -1,7 +1,7 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "9f1c31c8a3cfd0f341987e8011abad172592dd3c" 4SRCREV = "78dcdd807c06009460a949a7015b63f0f75ac61b"
5 5
6LICENSE += "| GPL-2.0" 6LICENSE += "| GPL-2.0"
7LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed" 7LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed"
diff --git a/recipes-qt/qt5/qtsystems.inc b/recipes-qt/qt5/qtsystems.inc
index 6cdfc8ea..4170eb25 100644
--- a/recipes-qt/qt5/qtsystems.inc
+++ b/recipes-qt/qt5/qtsystems.inc
@@ -3,11 +3,6 @@ require qt5.inc
3DEPENDS += "qtbase qtdeclarative udev bluez4 gconf" 3DEPENDS += "qtbase qtdeclarative udev bluez4 gconf"
4 4
5LICENSE = "BSD & LGPL-2.1 & GFDL-1.3" 5LICENSE = "BSD & LGPL-2.1 & GFDL-1.3"
6# LICENSE files are missing in 5.0.0
7LIC_FILES_CHKSUM = "file://${S}/src/imports/systeminfo/qsysteminfo.cpp;endline=40;md5=f28e1baba502dda6849d69d5c24e7356 \
8 file://${S}/examples/systeminfo/qml-storageinfo/content/ProgressBar.qml;endline=39;md5=5213e8171c07d54db7107f29ac2f7b5e \
9 file://${S}/doc/src/systeminfo/systeminfo.qdoc;endline=26;md5=757f4eda130ceff3ca0985dde715af07 \
10"
11 6
12do_install_append() { 7do_install_append() {
13 # Remove example.pro file as it is useless 8 # Remove example.pro file as it is useless
diff --git a/recipes-qt/qt5/qtsystems_5.3.2+git.bb b/recipes-qt/qt5/qtsystems_5.3.2+git.bb
new file mode 100644
index 00000000..a99a91b6
--- /dev/null
+++ b/recipes-qt/qt5/qtsystems_5.3.2+git.bb
@@ -0,0 +1,20 @@
1require qt5-git.inc
2require ${PN}.inc
3
4# LICENSE files are missing in 5.0.0
5LIC_FILES_CHKSUM = "file://${S}/src/imports/systeminfo/qsysteminfo.cpp;endline=40;md5=f28e1baba502dda6849d69d5c24e7356 \
6 file://${S}/examples/systeminfo/qml-storageinfo/content/ProgressBar.qml;endline=39;md5=5213e8171c07d54db7107f29ac2f7b5e \
7 file://${S}/doc/src/systeminfo/systeminfo.qdoc;endline=26;md5=757f4eda130ceff3ca0985dde715af07 \
8"
9
10# this wasn't released, the PV is set just to signify that this SRCREV was tested together
11# with 5.3.2 version of other modules
12PV = "5.3.2"
13DEFAULT_PREFERENCE = "1"
14
15QT_MODULE_BRANCH = "5.3"
16
17# qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1
18# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.3.2
19
20SRCREV = "aa651c73bf7bc57c1b6b1bfcfa9afe901884a102"
diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb
index ac2fc863..4762d8f8 100644
--- a/recipes-qt/qt5/qtsystems_git.bb
+++ b/recipes-qt/qt5/qtsystems_git.bb
@@ -1,9 +1,14 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4QT_MODULE_BRANCH = "5.3" 4QT_MODULE_BRANCH = "dev"
5 5
6# qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1 6# qtsystems wasn't released yet, last tag before this SRCREV is 5.0.0-beta1
7# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.2.1 7# qt5-git PV is only to indicate that this recipe is compatible with qt5 5.4
8 8
9SRCREV = "aa651c73bf7bc57c1b6b1bfcfa9afe901884a102" 9SRCREV = "3a0216301ad1338126abb326e8e4c22c6ea12f40"
10
11LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
12 file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
13 file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
14 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e"
diff --git a/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
index af431dc5..e4ad2210 100644
--- a/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
+++ b/recipes-qt/qt5/qttools-git/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
@@ -1,4 +1,4 @@
1From f8476dd4e4069b4403f26b5ccd5c3d9d9402c7bd Mon Sep 17 00:00:00 2001 1From ff3f521648906d07ddc1e1aecaddadb95b0314f3 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.jansa@gmail.com> 2From: Martin Jansa <Martin.jansa@gmail.com>
3Date: Wed, 11 Sep 2013 18:30:08 +0200 3Date: Wed, 11 Sep 2013 18:30:08 +0200
4Subject: [PATCH 1/3] Allow to build only lrelease + lupdate + lconvert 4Subject: [PATCH 1/3] Allow to build only lrelease + lupdate + lconvert
@@ -151,5 +151,5 @@ index df240e3..27ee687 100644
151 installed_cmake.depends = cmake 151 installed_cmake.depends = cmake
152 152
153-- 153--
1542.1.1 1542.1.3
155 155
diff --git a/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch
index 764c3e58..5cc317ce 100644
--- a/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch
+++ b/recipes-qt/qt5/qttools-git/0002-assistant-help-fix-linking-of-dependent-libraries.patch
@@ -1,4 +1,4 @@
1From d43c5a3759ceee4ba0e0e6d94c61d13850e142ec Mon Sep 17 00:00:00 2001 1From 20dd8d70eb3db17173eb3965e757711cc694de2a Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Fri, 17 Jan 2014 14:33:19 +0100 3Date: Fri, 17 Jan 2014 14:33:19 +0100
4Subject: [PATCH 2/3] assistant/help: fix linking of dependent libraries 4Subject: [PATCH 2/3] assistant/help: fix linking of dependent libraries
@@ -28,5 +28,5 @@ index 168d23d..a9c3b59 100644
28+ 28+
29+LIBS += -lQt5CLucene 29+LIBS += -lQt5CLucene
30-- 30--
312.1.1 312.1.3
32 32
diff --git a/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch
index 535a24c4..bf5957bc 100644
--- a/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch
+++ b/recipes-qt/qt5/qttools-git/0003-add-noqtwebkit-configuration.patch
@@ -1,4 +1,4 @@
1From 5012d9057afa20e34aa8a36c195f87b89d0fbf8c Mon Sep 17 00:00:00 2001 1From 1d8bf41acc2235528f1d08505cf2dc8afd793aef Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Wed, 4 Jun 2014 11:28:16 +0200 3Date: Wed, 4 Jun 2014 11:28:16 +0200
4Subject: [PATCH 3/3] add noqtwebkit configuration 4Subject: [PATCH 3/3] add noqtwebkit configuration
@@ -47,5 +47,5 @@ index 500a153..b60fa2d 100644
47 win32: qtHaveModule(axcontainer): SUBDIRS += activeqt 47 win32: qtHaveModule(axcontainer): SUBDIRS += activeqt
48 qtHaveModule(quickwidgets): SUBDIRS += qquickwidget 48 qtHaveModule(quickwidgets): SUBDIRS += qquickwidget
49-- 49--
502.1.1 502.1.3
51 51
diff --git a/recipes-qt/qt5/qttools-native_git.bb b/recipes-qt/qt5/qttools-native_git.bb
index fade6251..ceb972be 100644
--- a/recipes-qt/qt5/qttools-native_git.bb
+++ b/recipes-qt/qt5/qttools-native_git.bb
@@ -1,7 +1,7 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "f3abe81d510bef5b984544a6d58551ce04cb8b48" 4SRCREV = "7e7d549d26028ff407a9a3d260955f95b403a406"
5 5
6LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ 6LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \
7 file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \ 7 file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index fade6251..ceb972be 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -1,7 +1,7 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "f3abe81d510bef5b984544a6d58551ce04cb8b48" 4SRCREV = "7e7d549d26028ff407a9a3d260955f95b403a406"
5 5
6LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ 6LIC_FILES_CHKSUM = "file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \
7 file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \ 7 file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \
diff --git a/recipes-qt/qt5/qtwayland-git/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch b/recipes-qt/qt5/qtwayland-git/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch
index 16433d55..ae3d998f 100644
--- a/recipes-qt/qt5/qtwayland-git/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch
+++ b/recipes-qt/qt5/qtwayland-git/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch
@@ -1,4 +1,4 @@
1From 3cf60039ff1825c58bee5c79c66e7d12f4039fc7 Mon Sep 17 00:00:00 2001 1From 99c49a3304c1d08d164e0df252ca85f426381bb7 Mon Sep 17 00:00:00 2001
2From: Simon Busch <morphis@gravedo.de> 2From: Simon Busch <morphis@gravedo.de>
3Date: Fri, 19 Jul 2013 13:35:14 +0000 3Date: Fri, 19 Jul 2013 13:35:14 +0000
4Subject: [PATCH] Install the qtwaylandscanner tool to the native side 4Subject: [PATCH] Install the qtwaylandscanner tool to the native side
@@ -28,5 +28,5 @@ index ac2d07b..7a46a24 100644
28+target.path = $$[QT_HOST_BINS] 28+target.path = $$[QT_HOST_BINS]
29+INSTALLS += target 29+INSTALLS += target
30-- 30--
312.1.1 312.1.3
32 32
diff --git a/recipes-qt/qt5/qtwayland-git/0001-examples-wayland-include-server-buffer-only-when-bui.patch b/recipes-qt/qt5/qtwayland-git/0001-examples-wayland-include-server-buffer-only-when-bui.patch
index 1af124a6..664fa3f9 100644
--- a/recipes-qt/qt5/qtwayland-git/0001-examples-wayland-include-server-buffer-only-when-bui.patch
+++ b/recipes-qt/qt5/qtwayland-git/0001-examples-wayland-include-server-buffer-only-when-bui.patch
@@ -1,4 +1,4 @@
1From 9c98c0c411ecaf4cb95b76d0c07e72af75a8d7f0 Mon Sep 17 00:00:00 2001 1From cd1e17e8c6082fe8578d64baaff55f1f00c0f7a0 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 22 Feb 2014 17:47:44 +0100 3Date: Sat, 22 Feb 2014 17:47:44 +0100
4Subject: [PATCH] examples/wayland: include server-buffer only when building 4Subject: [PATCH] examples/wayland: include server-buffer only when building
@@ -27,5 +27,5 @@ index d633fb9..643c7cd 100644
27+ } 27+ }
28 } 28 }
29-- 29--
302.1.1 302.1.3
31 31
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb
index f7d04666..da38195c 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bb
+++ b/recipes-qt/qt5/qtwayland-native_git.bb
@@ -1,4 +1,4 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "c3d2a7bd8af4102441c113e088bd6a2cb50b97cf" 4SRCREV = "e47474cf91be5fa1d12bf329526d938be8293638"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 3d53a324..1ce30436 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -1,7 +1,7 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "c3d2a7bd8af4102441c113e088bd6a2cb50b97cf" 4SRCREV = "e47474cf91be5fa1d12bf329526d938be8293638"
5 5
6SRC_URI += " \ 6SRC_URI += " \
7 file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ 7 file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \
diff --git a/recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch b/recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
index 3e8d7acc..4587219e 100644
--- a/recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
+++ b/recipes-qt/qt5/qtwebengine-git/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
@@ -1,8 +1,8 @@
1From 1e2fbd3bbf3eb94a4d78c53068bbb58d4227ab46 Mon Sep 17 00:00:00 2001 1From 41f9b2c1521950e1e3e1f01260f18e698d948814 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 30 Jun 2014 20:08:17 +0200 3Date: Mon, 30 Jun 2014 20:08:17 +0200
4Subject: [PATCH 1/2] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H 4Subject: [PATCH 1/3] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H
5 anywhere in patch, but at the end 5 anywhere in path, but at the end
6 6
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8--- 8---
@@ -10,10 +10,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10 1 file changed, 2 insertions(+), 2 deletions(-) 10 1 file changed, 2 insertions(+), 2 deletions(-)
11 11
12diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf 12diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
13index 02c3872..3b9babe 100644 13index acf15a8..08b2642 100644
14--- a/tools/qmake/mkspecs/features/functions.prf 14--- a/tools/qmake/mkspecs/features/functions.prf
15+++ b/tools/qmake/mkspecs/features/functions.prf 15+++ b/tools/qmake/mkspecs/features/functions.prf
16@@ -61,8 +61,8 @@ defineReplace(findIncludedMocFiles) { 16@@ -84,8 +84,8 @@ defineReplace(findIncludedMocFiles) {
17 defineReplace(mocOutput) { 17 defineReplace(mocOutput) {
18 out = $$1 18 out = $$1
19 # The order is important, since the output of the second replace would end up accidentaly transformed by the first one 19 # The order is important, since the output of the second replace would end up accidentaly transformed by the first one
@@ -25,5 +25,5 @@ index 02c3872..3b9babe 100644
25 } 25 }
26 26
27-- 27--
282.1.1 282.1.3
29 29
diff --git a/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch b/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
new file mode 100644
index 00000000..58218a56
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
@@ -0,0 +1,29 @@
1From b36aeace50dc429cccbb9b84a6e538ebcd12ade9 Mon Sep 17 00:00:00 2001
2From: Simon Busch <morphis@gravedo.de>
3Date: Tue, 18 Nov 2014 10:38:18 +0100
4Subject: [PATCH 2/3] functions.prf: Make sure we only use the file name to
5 generate it's moc'ed abbreviation
6
7Signed-off-by: Simon Busch <morphis@gravedo.de>
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9---
10 tools/qmake/mkspecs/features/functions.prf | 3 ++-
11 1 file changed, 2 insertions(+), 1 deletion(-)
12
13diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
14index 08b2642..0123336 100644
15--- a/tools/qmake/mkspecs/features/functions.prf
16+++ b/tools/qmake/mkspecs/features/functions.prf
17@@ -82,7 +82,8 @@ defineReplace(findIncludedMocFiles) {
18 }
19
20 defineReplace(mocOutput) {
21- out = $$1
22+ in = $$1
23+ out = $$basename(in)
24 # The order is important, since the output of the second replace would end up accidentaly transformed by the first one
25 out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC})
26 out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)})
27--
282.1.3
29
diff --git a/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Try-to-add-_moc-suffix.patch b/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Try-to-add-_moc-suffix.patch
deleted file mode 100644
index 646d2a6e..00000000
--- a/recipes-qt/qt5/qtwebengine-git/0002-functions.prf-Try-to-add-_moc-suffix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 4fd50d344ad5e7f89e538222605dd50d0f636d3a Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Tue, 1 Jul 2014 15:58:16 +0200
4Subject: [PATCH 2/2] functions.prf: Try to add _moc suffix
5
6* otherwise moc generated files have the same basename and do_configure fails with:
7 core_generated.gyp:QtWebEngineCore#target has several files with the same basename:
8 | javascript_dialog_controller: javascript_dialog_controller.cpp
9 | /OE/build/oe-core/tmp-eglibc/work/i586-oe-linux/qtwebengine/0.9.99+gitAUTOINC+21f6ce84ec-r0/git/src/core/.moc/moc_/OE/build/oe-core/tmp-eglibc/work/i586-oe-linux/qtwebengine/0.9.99+gitAUTOI.moc+21f6ce84ec-r0/git/src/core/javascript_dialog_controller.cpp
10 ...
11
12Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
13---
14 tools/qmake/mkspecs/features/functions.prf | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-)
16
17diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
18index 3b9babe..6d691df 100644
19--- a/tools/qmake/mkspecs/features/functions.prf
20+++ b/tools/qmake/mkspecs/features/functions.prf
21@@ -61,8 +61,8 @@ defineReplace(findIncludedMocFiles) {
22 defineReplace(mocOutput) {
23 out = $$1
24 # The order is important, since the output of the second replace would end up accidentaly transformed by the first one
25- out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC})
26- out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)})
27+ out = $$replace(out, ^(.*)($$join(QMAKE_EXT_CPP,|))$, $${QMAKE_CPP_MOD_MOC}\\1_moc$${QMAKE_EXT_CPP_MOC})
28+ out = $$replace(out, ^(.*)($$join(QMAKE_EXT_H,|))$, $${QMAKE_H_MOD_MOC}\\1_moc$${first(QMAKE_EXT_CPP)})
29 return($$out)
30 }
31
32--
332.1.1
34
diff --git a/recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
new file mode 100644
index 00000000..b19556ff
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine-git/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
@@ -0,0 +1,29 @@
1From 69e05cdc9000a1962101b2859d0ae3d77bb751d7 Mon Sep 17 00:00:00 2001
2From: Frieder Schrempf <frieder.schrempf@online.de>
3Date: Mon, 1 Dec 2014 14:34:40 +0000
4Subject: [PATCH 3/3] functions.prf: allow build for linux-oe-g++ platform
5
6Upstream-Status: Inappropriate [OE specific]
7
8Signed-off-by: Frieder Schrempf <frieder.schrempf@online.de>
9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10---
11 tools/qmake/mkspecs/features/functions.prf | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
15index 0123336..5cea82a 100644
16--- a/tools/qmake/mkspecs/features/functions.prf
17+++ b/tools/qmake/mkspecs/features/functions.prf
18@@ -7,7 +7,7 @@ defineTest(isPlatformSupported) {
19
20 linux-g++*:!isGCCVersionSupported():return(false)
21 !isPythonVersionSupported(): return(false)
22- linux-g++*|win32-msvc2013|macx-clang: return(true)
23+ linux-g++*|linux-oe-g++*|win32-msvc2013|macx-clang: return(true)
24 boot2qt: return(true)
25
26 warning("Qt WebEngine can currently only be built for Linux (GCC), Windows (MSVC 2013), OS X (XCode 5.1+) or Qt for Device Creation".)
27--
282.1.3
29
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index a2f685ae..aac966b1 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -1,19 +1,22 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4QT_MODULE_BRANCH = "1.0" 4LIC_FILES_CHKSUM = " \
5QT_MODULE_BRANCH_CHROMIUM = "33.0.1750.170-based" 5 file://src/core/browser_context_qt.cpp;md5=91895ac1852e1b07202d9716194e8dd8;beginline=1;endline=35 \
6 file://src/3rdparty/chromium/LICENSE;md5=537e0b52077bf0a616d0a0c8a79bc9d5 \
7"
8
9QT_MODULE_BRANCH = "5.4"
10QT_MODULE_BRANCH_CHROMIUM = "37.0.2062-based"
6 11
7SRC_URI += " \ 12SRC_URI += " \
8 git://gitorious.org/qt/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \ 13 git://gitorious.org/qt/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};destsuffix=git/src/3rdparty \
9 file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ 14 file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \
10 file://0002-functions.prf-Try-to-add-_moc-suffix.patch \ 15 file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \
11 file://0001-chromium-Drop-build-time-only-dependency-on-x11-libr.patch \ 16 file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \
12 file://0002-chromium-Strip-unwanted-echo-compiling-prefix-from-C.patch \
13 file://0003-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch \
14" 17"
15SRCREV_qtwebengine = "14fcf0d3193e2ee2bf904a305c9f34ff8d0e5ce7" 18SRCREV_qtwebengine = "ff47f09a94a0a31edd40500985ff670e8f35cc2c"
16SRCREV_chromium = "1f3cc8c2618979b557d60ef1ad984a49dca83bff" 19SRCREV_chromium = "66388297cf2ca42049fb099237134ec33465e2f5"
17SRCREV = "${SRCREV_qtwebengine}" 20SRCREV = "${SRCREV_qtwebengine}"
18 21
19SRCREV_FORMAT = "qtwebengine" 22SRCREV_FORMAT = "qtwebengine"
diff --git a/recipes-qt/qt5/qtwebkit-git/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/recipes-qt/qt5/qtwebkit-git/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
index 2c471be5..3c6c4d3f 100644
--- a/recipes-qt/qt5/qtwebkit-git/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
+++ b/recipes-qt/qt5/qtwebkit-git/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
@@ -1,4 +1,4 @@
1From a7d860fbc194c46591016ba41e138eadc1e50d84 Mon Sep 17 00:00:00 2001 1From 83a7ef8c92b4363bd0aa372c804858c5882db0af Mon Sep 17 00:00:00 2001
2From: Trevor Woerner <trevor.woerner@linaro.org> 2From: Trevor Woerner <trevor.woerner@linaro.org>
3Date: Fri, 7 Feb 2014 04:07:17 +0100 3Date: Fri, 7 Feb 2014 04:07:17 +0100
4Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH) 4Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH)
@@ -26,5 +26,5 @@ index 9c52406..a68a101 100644
26 CONFIG(debug, debug|release)|force_debug_info { 26 CONFIG(debug, debug|release)|force_debug_info {
27 # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. 27 # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
28-- 28--
292.1.1 292.1.3
30 30
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index a4973e0e..0446d381 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -3,7 +3,7 @@ require ${PN}.inc
3 3
4DEPENDS += "leveldb" 4DEPENDS += "leveldb"
5 5
6SRCREV = "7778f881ff7dc92fca44dd414b02e7345f8db930" 6SRCREV = "18cb1a3ae907d76da9eb8c54528cf3bcb074d0e5"
7 7
8LICENSE += "| GPL-2.0" 8LICENSE += "| GPL-2.0"
9LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed" 9LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index d68a5230..5939e893 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -1,7 +1,7 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "0854eda408de542047a0ef38c37953719a8f9fde" 4SRCREV = "64927e04f202d33b9a9a1f94141ef692c0b513ac"
5 5
6LICENSE += "| GPL-2.0" 6LICENSE += "| GPL-2.0"
7LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed" 7LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 92390bab..5be8f81d 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -1,7 +1,7 @@
1require qt5-git.inc 1require qt5-git.inc
2require ${PN}.inc 2require ${PN}.inc
3 3
4SRCREV = "045028f951959dc217a0fc1c19f014989bfaaa1f" 4SRCREV = "2e8b90b33d1d8dce4acdb6a116a227f2a5d3e044"
5 5
6LICENSE += "| GPL-2.0" 6LICENSE += "| GPL-2.0"
7LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed" 7LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-13 04:16:28 +0000