summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2016-04-20 11:38:06 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2016-04-21 21:36:18 +0200
commit754aaadc7f0a1c98a4895899617afbaef0f1cdfa (patch)
treea417716816e08846114d65394239c309bc129dbd
parentf636eb7444a3454f2a25275a07e414d7409734d7 (diff)
downloadmeta-qt5-754aaadc7f0a1c98a4895899617afbaef0f1cdfa.tar.gz
qt5: upgrade to latest revision in 5.6 branch
* qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch and qtwebkit/0004-Fix-linking-with-libpthread.patch were resolved upstream * all patches were refreshed with: git format-patch --no-numbered --no-signature -NUMBER to remove numbering from Subject (it's good enough in filename) and to remove git version from signature (so it doesn't look differently when generated on different hosts with different git version). Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch9
-rw-r--r--recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch9
-rw-r--r--recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch13
-rw-r--r--recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch13
-rw-r--r--recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch9
-rw-r--r--recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch7
-rw-r--r--recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch8
-rw-r--r--recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch9
-rw-r--r--recipes-qt/qt5/qtbase/0009-Always-build-uic.patch7
-rw-r--r--recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch17
-rw-r--r--recipes-qt/qt5/qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtcanvas3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch5
-rw-r--r--recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch (renamed from recipes-qt/qt5/qtdeclarative/0001-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch)5
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb4
-rw-r--r--recipes-qt/qt5/qtenginio_git.bb2
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb2
-rw-r--r--recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch5
-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/0001-Initial-porting-effort-to-GStreamer-1.0.patch5
-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/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch7
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_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/qtsensors_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialport_git.bb2
-rw-r--r--recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch30
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb4
-rw-r--r--recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch7
-rw-r--r--recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch15
-rw-r--r--recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch7
-rw-r--r--recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch7
-rw-r--r--recipes-qt/qt5/qttools_git.bb2
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch5
-rw-r--r--recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch5
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch9
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch7
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch7
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch7
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch7
-rw-r--r--recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch9
-rw-r--r--recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch7
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb4
-rw-r--r--recipes-qt/qt5/qtwebkit-examples_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch7
-rw-r--r--recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch7
-rw-r--r--recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch7
-rw-r--r--recipes-qt/qt5/qtwebkit/0004-Fix-linking-with-libpthread.patch33
-rw-r--r--recipes-qt/qt5/qtwebkit_git.bb3
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb2
-rw-r--r--recipes-qt/qt5/qtx11extras_git.bb2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
62 files changed, 108 insertions, 268 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 0bdfde57..4e551413 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -257,4 +257,4 @@ fakeroot do_generate_qt_environment_file() {
257 257
258addtask generate_qt_environment_file after do_install before do_package 258addtask generate_qt_environment_file after do_install before do_package
259 259
260SRCREV = "41706400f605524a5a9953714aa0cfbf811dba7e" 260SRCREV = "cec15a89d058424794978910cc8da65b43d71606"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 78621b66..73900afe 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -117,4 +117,4 @@ do_install() {
117 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt 117 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
118} 118}
119 119
120SRCREV = "d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b" 120SRCREV = "cec15a89d058424794978910cc8da65b43d71606"
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 68c39874..522afcd1 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 @@
1From bf8e0e2292c8a9233d55714aab5eb780c62a132d Mon Sep 17 00:00:00 2001 1From cabe9683b82493e2547e87ae0057f44f71efe519 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/10] Add linux-oe-g++ platform 4Subject: [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
@@ -56,7 +56,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
56 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h 56 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
57 57
58diff --git a/configure b/configure 58diff --git a/configure b/configure
59index f247401..011cd70 100755 59index 3e97c98..88a308d 100755
60--- a/configure 60--- a/configure
61+++ b/configure 61+++ b/configure
62@@ -342,6 +342,16 @@ getQMakeConf() 62@@ -342,6 +342,16 @@ getQMakeConf()
@@ -361,6 +361,3 @@ index 0000000..dd12003
361+#endif 361+#endif
362+ 362+
363+#endif // QPLATFORMDEFS_H 363+#endif // QPLATFORMDEFS_H
364--
3652.7.1
366
diff --git a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
index 3884c9cc..0b0650d3 100644
--- a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -1,8 +1,8 @@
1From 0d1049d3097f674260622adeb9ae8c5f4d6d0a44 Mon Sep 17 00:00:00 2001 1From 1edd17d452a7e9eeb2931b3c5697a4fc0ec4e6bc 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/10] qlibraryinfo: allow to set qt.conf from the outside 4Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the
5 using the environment 5 environment
6 6
7Allow to set a qt.conf from the outside using the environment. This allows 7Allow to set a qt.conf from the outside using the environment. This allows
8to inject new prefixes and other paths into qmake. This is needed when using 8to inject new prefixes and other paths into qmake. This is needed when using
@@ -34,6 +34,3 @@ index 8bcacca..e1c87b5 100644
34 if (QFile::exists(qtconfig)) 34 if (QFile::exists(qtconfig))
35 return new QSettings(qtconfig, QSettings::IniFormat); 35 return new QSettings(qtconfig, QSettings::IniFormat);
36 #ifdef QT_BUILD_QMAKE 36 #ifdef QT_BUILD_QMAKE
37--
382.7.1
39
diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
index f7feaeca..ca271e6c 100644
--- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
+++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
@@ -1,7 +1,7 @@
1From 8bc74542bab1f29dfb4a0e5a2af2f8d91f049579 Mon Sep 17 00:00:00 2001 1From 3ecdcb6a10d125f1440c42ad9c79f04d43c257e0 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/10] Add -external-hostbindir option 4Subject: [PATCH] Add -external-hostbindir option
5 5
6* when cross-compiling it's sometimes useful to use existing tools from machine 6* when cross-compiling it's sometimes useful to use existing tools from machine
7 (or in OpenEmbedded built with separate native recipe) when building for target 7 (or in OpenEmbedded built with separate native recipe) when building for target
@@ -37,7 +37,7 @@ Conflicts:
37 7 files changed, 38 insertions(+), 12 deletions(-) 37 7 files changed, 38 insertions(+), 12 deletions(-)
38 38
39diff --git a/configure b/configure 39diff --git a/configure b/configure
40index 011cd70..d30b6e5 100755 40index 88a308d..f2611ed 100755
41--- a/configure 41--- a/configure
42+++ b/configure 42+++ b/configure
43@@ -810,6 +810,7 @@ QT_HOST_BINS= 43@@ -810,6 +810,7 @@ QT_HOST_BINS=
@@ -90,10 +90,10 @@ index 011cd70..d30b6e5 100755
90 CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h 90 CFG_QCONFIG_PATH=$relpath/src/corelib/global/qconfig-${CFG_QCONFIG}.h
91 case "$CFG_QCONFIG" in 91 case "$CFG_QCONFIG" in
92diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf 92diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
93index b2c2507..fba4a58 100644 93index 8639695..d89d948 100644
94--- a/mkspecs/features/qt_functions.prf 94--- a/mkspecs/features/qt_functions.prf
95+++ b/mkspecs/features/qt_functions.prf 95+++ b/mkspecs/features/qt_functions.prf
96@@ -57,7 +57,11 @@ defineTest(qtHaveModule) { 96@@ -70,7 +70,11 @@ defineTest(qtHaveModule) {
97 defineTest(qtPrepareTool) { 97 defineTest(qtPrepareTool) {
98 cmd = $$eval(QT_TOOL.$${2}.binary) 98 cmd = $$eval(QT_TOOL.$${2}.binary)
99 isEmpty(cmd) { 99 isEmpty(cmd) {
@@ -224,6 +224,3 @@ index 99d87e2..5621dc0 100644
224 !!ENDIF 224 !!ENDIF
225 _qt5_Widgets_check_file_exists(${imported_location}) 225 _qt5_Widgets_check_file_exists(${imported_location})
226 226
227--
2282.7.1
229
diff --git a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
index 4807df09..a35b6a2a 100644
--- a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
+++ b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
@@ -1,7 +1,7 @@
1From db746d1ca0c41fe3da103d09fc240a0df9db5404 Mon Sep 17 00:00:00 2001 1From 7e5713e7f4807e204cd4a9f874cb1ca2985fc630 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 04/10] qt_module: Fix pkgconfig and libtool replacements 4Subject: [PATCH] qt_module: Fix pkgconfig and libtool replacements
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -68,10 +68,10 @@ Signed-off-by: Jonathan Liu <net147@gmail.com>
68 2 files changed, 14 insertions(+), 1 deletion(-) 68 2 files changed, 14 insertions(+), 1 deletion(-)
69 69
70diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf 70diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
71index f62b6bb..91be8b3 100644 71index 75b84ff..ab36fa6 100644
72--- a/mkspecs/features/qt.prf 72--- a/mkspecs/features/qt.prf
73+++ b/mkspecs/features/qt.prf 73+++ b/mkspecs/features/qt.prf
74@@ -321,6 +321,19 @@ contains(TEMPLATE, .*app) { 74@@ -317,6 +317,19 @@ contains(TEMPLATE, .*app) {
75 QTPLUGIN = $$manualplugs $$autoplugs 75 QTPLUGIN = $$manualplugs $$autoplugs
76 } 76 }
77 77
@@ -92,7 +92,7 @@ index f62b6bb..91be8b3 100644
92 contains(QT_CONFIG, static) { 92 contains(QT_CONFIG, static) {
93 QT_PLUGIN_VERIFY += QTPLUGIN 93 QT_PLUGIN_VERIFY += QTPLUGIN
94diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf 94diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
95index 38602f6..f9c401f 100644 95index cc8ed87..b7d4be2 100644
96--- a/mkspecs/features/qt_common.prf 96--- a/mkspecs/features/qt_common.prf
97+++ b/mkspecs/features/qt_common.prf 97+++ b/mkspecs/features/qt_common.prf
98@@ -38,7 +38,7 @@ contains(TEMPLATE, .*lib) { 98@@ -38,7 +38,7 @@ contains(TEMPLATE, .*lib) {
@@ -104,6 +104,3 @@ index 38602f6..f9c401f 100644
104 } 104 }
105 lib_replace.CONFIG = path 105 lib_replace.CONFIG = path
106 QMAKE_PRL_INSTALL_REPLACE += lib_replace 106 QMAKE_PRL_INSTALL_REPLACE += lib_replace
107--
1082.7.1
109
diff --git a/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch
index 53ab37f5..e21b36d3 100644
--- a/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch
+++ b/recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch
@@ -1,7 +1,7 @@
1From 561957e83aa0bc1404654506d1ae83251539d0eb Mon Sep 17 00:00:00 2001 1From e6ed023b0210375e594b7b61dfb620deb486ee8c Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com> 2From: Denys Dmytriyenko <denys@ti.com>
3Date: Tue, 25 Aug 2015 10:05:15 -0400 3Date: Tue, 25 Aug 2015 10:05:15 -0400
4Subject: [PATCH 05/10] configure: bump path length from 256 to 512 characters 4Subject: [PATCH] configure: bump path length from 256 to 512 characters
5 5
6Increase the path length that gets hardcoded into generated config.cpp file 6Increase the path length that gets hardcoded into generated config.cpp file
7from 256 to 512 characters, as nativesdk path can be quite long. 7from 256 to 512 characters, as nativesdk path can be quite long.
@@ -14,7 +14,7 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
14 1 file changed, 3 insertions(+), 3 deletions(-) 14 1 file changed, 3 insertions(+), 3 deletions(-)
15 15
16diff --git a/configure b/configure 16diff --git a/configure b/configure
17index d30b6e5..aeb4ef2 100755 17index f2611ed..24a61db 100755
18--- a/configure 18--- a/configure
19+++ b/configure 19+++ b/configure
20@@ -3930,10 +3930,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$ 20@@ -3930,10 +3930,10 @@ static const char qt_configure_licensed_products_str [256 + 12] = "qt_lcnsprod=$
@@ -31,6 +31,3 @@ index d30b6e5..aeb4ef2 100755
31 #endif 31 #endif
32 32
33 static const short qt_configure_str_offsets[] = { 33 static const short qt_configure_str_offsets[] = {
34--
352.7.1
36
diff --git a/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch b/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch
index 57a0dd11..b6758052 100644
--- a/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch
+++ b/recipes-qt/qt5/qtbase/0006-QOpenGLPaintDevice-sub-area-support.patch
@@ -1,7 +1,7 @@
1From f6d59b0835e32f0575ec1671dff0348af1886da6 Mon Sep 17 00:00:00 2001 1From 05a3901af7a467f9ea5fa9e6f63a574d8d2a9f77 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 06/10] QOpenGLPaintDevice sub-area support 4Subject: [PATCH] QOpenGLPaintDevice sub-area support
5 5
6Allows creating QOpenGLPaintDevice targetting sub-area 6Allows creating QOpenGLPaintDevice targetting sub-area
7of binded framebuffer. 7of binded framebuffer.
@@ -152,6 +152,3 @@ index c179143..fad68d5 100644
152 pex->updateClipScissorTest(); 152 pex->updateClipScissorTest();
153 } else { 153 } else {
154 if (m_vao.isCreated()) { 154 if (m_vao.isCreated()) {
155--
1562.7.1
157
diff --git a/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch b/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
index 62e8a0d9..2fab8884 100644
--- a/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
+++ b/recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch
@@ -1,8 +1,7 @@
1From 0cac609e192c303e26d139b4a7d5b35897a020a8 Mon Sep 17 00:00:00 2001 1From 6a0d4af2083dbacddb98245c0b4b83c6e014a1ae Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 8 Jun 2015 13:59:25 -0700 3Date: Mon, 8 Jun 2015 13:59:25 -0700
4Subject: [PATCH 07/10] linux-oe-g++: Invert conditional for defining 4Subject: [PATCH] linux-oe-g++: Invert conditional for defining QT_SOCKLEN_T
5 QT_SOCKLEN_T
6 5
7This helps to make sure that QT_SOCKLEN_T is defined to be 'int' 6This helps to make sure that QT_SOCKLEN_T is defined to be 'int'
8only when its glibc < 2 and not also for the libraries which may define 7only when its glibc < 2 and not also for the libraries which may define
@@ -31,6 +30,3 @@ index dd12003..8623651 100644
31 #endif 30 #endif
32 31
33 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) 32 #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
34--
352.7.1
36
diff --git a/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch b/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch
index 2ea1954c..7ca19133 100644
--- a/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch
+++ b/recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch
@@ -1,7 +1,7 @@
1From caa2e16f3efaede09abcc4cf263e82b4c1cfa6a0 Mon Sep 17 00:00:00 2001 1From b5c826a39760519010884547d6981c3af031d9c8 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, 13 Nov 2015 12:36:11 +0100 3Date: Fri, 13 Nov 2015 12:36:11 +0100
4Subject: [PATCH 08/10] configure paths for target qmake properly 4Subject: [PATCH] configure paths for target qmake properly
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -19,7 +19,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
19 1 file changed, 19 insertions(+), 4 deletions(-) 19 1 file changed, 19 insertions(+), 4 deletions(-)
20 20
21diff --git a/configure b/configure 21diff --git a/configure b/configure
22index aeb4ef2..c696e7e 100755 22index 24a61db..2e99d39 100755
23--- a/configure 23--- a/configure
24+++ b/configure 24+++ b/configure
25@@ -3875,8 +3875,13 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then 25@@ -3875,8 +3875,13 @@ if [ "$CFG_COMPILE_EXAMPLES" = "yes" ]; then
@@ -73,6 +73,3 @@ index aeb4ef2..c696e7e 100755
73 #endif 73 #endif
74 74
75 static const short qt_configure_str_offsets[] = { 75 static const short qt_configure_str_offsets[] = {
76--
772.7.1
78
diff --git a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
index e2b57cef..230c966d 100644
--- a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
+++ b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
@@ -1,7 +1,7 @@
1From 376eba77c429a503b05256786f2996b397c2e36f Mon Sep 17 00:00:00 2001 1From 49b2100ff86ab5b4977608903b30cb71075592c6 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 09/10] Always build uic 4Subject: [PATCH] Always build uic
5 5
6Even if we are not building gui or widgets. This tool is needed later 6Even if we are not building gui or widgets. This tool is needed later
7as a native tool when compiling the target. 7as a native tool when compiling the target.
@@ -26,6 +26,3 @@ index 1671338..83de483 100644
26 26
27 nacl: SUBDIRS -= src_network src_testlib 27 nacl: SUBDIRS -= src_network src_testlib
28 28
29--
302.7.1
31
diff --git a/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch b/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch
index 9fa0a333..5bb73e75 100644
--- a/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch
+++ b/recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch
@@ -1,7 +1,7 @@
1From 2b55cf1075167ce6b7e4cff1ea89dc2c27265f23 Mon Sep 17 00:00:00 2001 1From 5b4ae15a19a9135d3dc8a35aa2d109ba8d29868a 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 10/10] Add -external-hostbindir option for native(sdk) 4Subject: [PATCH] Add -external-hostbindir option for native(sdk)
5 5
6* when cross-compiling it's sometimes useful to use existing tools from machine 6* when cross-compiling it's sometimes useful to use existing tools from machine
7 (or in OpenEmbedded built with separate native recipe) when building for target 7 (or in OpenEmbedded built with separate native recipe) when building for target
@@ -37,7 +37,7 @@ Conflicts:
37 5 files changed, 16 insertions(+), 1 deletion(-) 37 5 files changed, 16 insertions(+), 1 deletion(-)
38 38
39diff --git a/configure b/configure 39diff --git a/configure b/configure
40index c696e7e..310eb1d 100755 40index 2e99d39..a0641d2 100755
41--- a/configure 41--- a/configure
42+++ b/configure 42+++ b/configure
43@@ -3922,6 +3922,7 @@ fi 43@@ -3922,6 +3922,7 @@ fi
@@ -94,10 +94,10 @@ index 1ad7637..5a8b127 100644
94 HostSpecPath, 94 HostSpecPath,
95 HostPrefixPath, 95 HostPrefixPath,
96diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp 96diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
97index 555ccbf..d9a5b08 100644 97index 6f1e2b7..ae03143 100644
98--- a/tools/configure/configureapp.cpp 98--- a/tools/configure/configureapp.cpp
99+++ b/tools/configure/configureapp.cpp 99+++ b/tools/configure/configureapp.cpp
100@@ -1248,6 +1248,13 @@ void Configure::parseCmdLine() 100@@ -1256,6 +1256,13 @@ void Configure::parseCmdLine()
101 dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i); 101 dictionary[ "QT_EXT_PREFIX" ] = configCmdLine.at(i);
102 } 102 }
103 103
@@ -111,7 +111,7 @@ index 555ccbf..d9a5b08 100644
111 else if (configCmdLine.at(i) == "-make-tool") { 111 else if (configCmdLine.at(i) == "-make-tool") {
112 ++i; 112 ++i;
113 if (i == argCount) 113 if (i == argCount)
114@@ -4214,6 +4221,9 @@ void Configure::generateQConfigCpp() 114@@ -4232,6 +4239,9 @@ void Configure::generateQConfigCpp()
115 115
116 if (dictionary["QT_REL_HOST_DATA"].isEmpty()) 116 if (dictionary["QT_REL_HOST_DATA"].isEmpty())
117 dictionary["QT_REL_HOST_DATA"] = haveHpx ? "." : dictionary["QT_REL_INSTALL_ARCHDATA"]; 117 dictionary["QT_REL_HOST_DATA"] = haveHpx ? "." : dictionary["QT_REL_INSTALL_ARCHDATA"];
@@ -121,7 +121,7 @@ index 555ccbf..d9a5b08 100644
121 121
122 confStringOff = 0; 122 confStringOff = 0;
123 addConfStr(0, dictionary["QT_REL_INSTALL_DOCS"]); 123 addConfStr(0, dictionary["QT_REL_INSTALL_DOCS"]);
124@@ -4233,6 +4243,7 @@ void Configure::generateQConfigCpp() 124@@ -4251,6 +4261,7 @@ void Configure::generateQConfigCpp()
125 addConfStr(1, dictionary["QT_REL_HOST_BINS"]); 125 addConfStr(1, dictionary["QT_REL_HOST_BINS"]);
126 addConfStr(1, dictionary["QT_REL_HOST_LIBS"]); 126 addConfStr(1, dictionary["QT_REL_HOST_LIBS"]);
127 addConfStr(1, dictionary["QT_REL_HOST_DATA"]); 127 addConfStr(1, dictionary["QT_REL_HOST_DATA"]);
@@ -129,6 +129,3 @@ index 555ccbf..d9a5b08 100644
129 addConfStr(1, targSpec); 129 addConfStr(1, targSpec);
130 addConfStr(1, hostSpec); 130 addConfStr(1, hostSpec);
131 131
132--
1332.7.1
134
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 473d1dfa..09f8ebde 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -261,4 +261,4 @@ sysroot_stage_dirs_append() {
261 rm -rf $to${OE_QMAKE_PATH_QT_FONTS} 261 rm -rf $to${OE_QMAKE_PATH_QT_FONTS}
262} 262}
263 263
264SRCREV = "d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b" 264SRCREV = "cec15a89d058424794978910cc8da65b43d71606"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
index 205593fb..5b12d1a7 100644
--- a/recipes-qt/qt5/qtcanvas3d_git.bb
+++ b/recipes-qt/qt5/qtcanvas3d_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS = "qtdeclarative" 11DEPENDS = "qtdeclarative"
12 12
13SRCREV = "5a17c4ca0552c9f4e6b5646f0cee2b21a55c3d18" 13SRCREV = "791ddce7d41b126ba4744a6701597f49dbf99f3b"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 7a442c3a..03990d85 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -25,4 +25,4 @@ do_configure_prepend() {
25 sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro 25 sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro
26} 26}
27 27
28SRCREV = "8b550f0a7508ed413cded71a20485e61010b0aa3" 28SRCREV = "dedff12a896d51c469d2af82664b86a10f8fa7fe"
diff --git a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
index b3f7621c..ee568200 100644
--- a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
+++ b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
@@ -1,4 +1,4 @@
1From 1755b8c7ab87f9e6bf072bd0bef50086c14dd9ff Mon Sep 17 00:00:00 2001 1From d26a676827ef2d64b4627090690d3240e62f6565 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
@@ -83,6 +83,3 @@ index 1bb913e..56f2dd5 100644
83 CONFIG += no_import_scan 83 CONFIG += no_import_scan
84 84
85 load(qt_tool) 85 load(qt_tool)
86--
872.7.0
88
diff --git a/recipes-qt/qt5/qtdeclarative/0001-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch b/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch
index 1687fbe5..60c9685f 100644
--- a/recipes-qt/qt5/qtdeclarative/0001-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch
+++ b/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch
@@ -1,4 +1,4 @@
1From 1cdd3278a0b1508640d983720782d39eb919caaf Mon Sep 17 00:00:00 2001 1From 9d39293e354120a9ec5e92c87b4cd695acdeb3f5 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com> 2From: Denys Dmytriyenko <denys@ti.com>
3Date: Thu, 31 Mar 2016 19:38:58 -0400 3Date: Thu, 31 Mar 2016 19:38:58 -0400
4Subject: [PATCH] qquickviewcomparison: fix QCoreApplication has not been 4Subject: [PATCH] qquickviewcomparison: fix QCoreApplication has not been
@@ -23,6 +23,3 @@ index 5b86c93..e77514e 100644
23 23
24 QT_FORWARD_DECLARE_CLASS(QRadioButton) 24 QT_FORWARD_DECLARE_CLASS(QRadioButton)
25 QT_FORWARD_DECLARE_CLASS(QCheckBox) 25 QT_FORWARD_DECLARE_CLASS(QCheckBox)
26--
272.2.0
28
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 3f8c3da3..bf3a1085 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -15,7 +15,7 @@ DEPENDS += "qtbase"
15 15
16SRC_URI += " \ 16SRC_URI += " \
17 file://0001-qmltestexample-fix-link.patch \ 17 file://0001-qmltestexample-fix-link.patch \
18 file://0001-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch \ 18 file://0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch \
19" 19"
20 20
21EXTRA_OEMAKE += "QMAKE_SYNCQT=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/syncqt" 21EXTRA_OEMAKE += "QMAKE_SYNCQT=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/syncqt"
@@ -34,6 +34,6 @@ do_configure_prepend() {
34 34
35EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 35EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
36 36
37SRCREV = "dc558b69f083c89aa8c02952e5f167405939a61a" 37SRCREV = "26ff8f9029107877bfbfdc2f099f9b11861183ed"
38 38
39BBCLASSEXTEND =+ "native nativesdk" 39BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb
index 23b9417c..04f5a79d 100644
--- a/recipes-qt/qt5/qtenginio_git.bb
+++ b/recipes-qt/qt5/qtenginio_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtdeclarative qtxmlpatterns" 12DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
13 13
14SRCREV = "2a19257a5eef7a25a05d5cf7ea69ecc4184226f3" 14SRCREV = "cf717b99fdb1b7221dd556bf3be32feba0ed8afe"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 7d9636cc..606b873a 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -17,4 +17,4 @@ DEPENDS += "qtdeclarative"
17 17
18RDEPENDS_${PN}-dev = "" 18RDEPENDS_${PN}-dev = ""
19 19
20SRCREV = "4b8e9a348ca379b203c26ff14dd236267dd60646" 20SRCREV = "6523d7c4843e1d4176035c46e1514c39bdcfc3bf"
diff --git a/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch b/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch
index 8964a5dd..12118980 100644
--- a/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch
+++ b/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch
@@ -1,4 +1,4 @@
1From 14a68abb4c492fb7ba55dbccaf61057e861bbf3c Mon Sep 17 00:00:00 2001 1From c4c008c46291be290312b5674af1c1b9c446fa8e Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 4 Aug 2014 19:19:05 +0200 3Date: Mon, 4 Aug 2014 19:19:05 +0200
4Subject: [PATCH] qtimageformats.pro: Make the dependencies deterministic 4Subject: [PATCH] qtimageformats.pro: Make the dependencies deterministic
@@ -26,6 +26,3 @@ index 8382e5c..63d13ce 100644
26+OE_LIBWEBP_ENABLED:qtCompileTest(libwebp) 26+OE_LIBWEBP_ENABLED:qtCompileTest(libwebp)
27 27
28 load(qt_parts) 28 load(qt_parts)
29--
302.7.0
31
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index 0a97f121..4c4431d4 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -28,4 +28,4 @@ EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'jasper', 'CONFIG+=OE_
28EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" 28EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}"
29EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" 29EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}"
30 30
31SRCREV = "0bd46d5861fa7b48c87cd3a734d00671df929869" 31SRCREV = "bf5b49878d75d316f31225f76152e8381a3d5f0f"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 2ee747f2..d573b6b9 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -29,4 +29,4 @@ do_configure_prepend() {
29EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" 29EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}"
30EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" 30EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}"
31 31
32SRCREV = "ca4bce553d03a64fa119650990083267ea9c8d31" 32SRCREV = "d1f66746ab0b77b4f3300cbeeaafe61d25d78e98"
diff --git a/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch b/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch
index a4ac12ab..05f54732 100644
--- a/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch
+++ b/recipes-qt/qt5/qtmultimedia/0001-Initial-porting-effort-to-GStreamer-1.0.patch
@@ -1,4 +1,4 @@
1From e8e2e289288acd3124536a41351e7bcd639bef07 Mon Sep 17 00:00:00 2001 1From 98455d75df7b040817e323417b6042118c093d56 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] Initial porting effort to GStreamer 1.0. 4Subject: [PATCH] Initial porting effort to GStreamer 1.0.
@@ -54,6 +54,3 @@ index 98bb315..287887f 100644
54 } 54 }
55 55
56 qtCompileTest(resourcepolicy) 56 qtCompileTest(resourcepolicy)
57--
582.7.0
59
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 61c767e4..328fdd74 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -35,4 +35,4 @@ SRC_URI += "\
35 file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ 35 file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \
36" 36"
37 37
38SRCREV = "9985224a89b830dc182b428f491b6187d6f0e1ba" 38SRCREV = "2170a3b0fcda613daf76a337fa45cb97e0714cdf"
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index 32b9abab..61b02a17 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -23,4 +23,4 @@ do_configure_prepend() {
23 sed -i 's#^qtHaveModule(webkitwidgets):#enable-webkit:qtHaveModule(webkitwidgets):#g' ${S}/src/imports/imports.pro 23 sed -i 's#^qtHaveModule(webkitwidgets):#enable-webkit:qtHaveModule(webkitwidgets):#g' ${S}/src/imports/imports.pro
24} 24}
25 25
26SRCREV = "dcc5e5c01c28b227f0e5e5e4976a9d26e8a45295" 26SRCREV = "563ce3888f3c04abcc96ba236b20c7a822bc88e2"
diff --git a/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch b/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
index 10793e6d..c57943d9 100644
--- a/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
+++ b/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
@@ -1,4 +1,4 @@
1From c39a563984693efac577adb137115693634c038f Mon Sep 17 00:00:00 2001 1From d5faf29f8a41b0e28132fb23828cff8043174cb8 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com> 2From: Denys Dmytriyenko <denys@ti.com>
3Date: Thu, 31 Mar 2016 19:57:01 -0400 3Date: Thu, 31 Mar 2016 19:57:01 -0400
4Subject: [PATCH] texteditor: fix invalid use of incomplete type 'class QDebug' 4Subject: [PATCH] texteditor: fix invalid use of incomplete type 'class QDebug'
@@ -11,7 +11,7 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
11 1 file changed, 1 insertion(+) 11 1 file changed, 1 insertion(+)
12 12
13diff --git a/examples/quick/controls/texteditor/src/documenthandler.cpp b/examples/quick/controls/texteditor/src/documenthandler.cpp 13diff --git a/examples/quick/controls/texteditor/src/documenthandler.cpp b/examples/quick/controls/texteditor/src/documenthandler.cpp
14index 2e9987a..c8bf419 100644 14index 2e03f74..3d1b3c8 100644
15--- a/examples/quick/controls/texteditor/src/documenthandler.cpp 15--- a/examples/quick/controls/texteditor/src/documenthandler.cpp
16+++ b/examples/quick/controls/texteditor/src/documenthandler.cpp 16+++ b/examples/quick/controls/texteditor/src/documenthandler.cpp
17@@ -44,6 +44,7 @@ 17@@ -44,6 +44,7 @@
@@ -22,6 +22,3 @@ index 2e9987a..c8bf419 100644
22 22
23 DocumentHandler::DocumentHandler() 23 DocumentHandler::DocumentHandler()
24 : m_target(0) 24 : m_target(0)
25--
262.2.0
27
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 41c781ea..e3c580fe 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -12,4 +12,4 @@ DEPENDS += "qtdeclarative"
12 12
13FILES_${PN}-qmlplugins += "${libdir}/qt5/qml/Qt" 13FILES_${PN}-qmlplugins += "${libdir}/qt5/qml/Qt"
14 14
15SRCREV = "7fc567eda8a187e365f4c29c6e8f08440bf31218" 15SRCREV = "ac152bfcd37f94453e9705b57ca6520ad30bade0"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index a770fbe1..7a5ca233 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -17,4 +17,4 @@ SRC_URI += " \
17 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ 17 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \
18" 18"
19 19
20SRCREV = "85c2d2cce4c7d49bc425ccd0be2bbd9841b7e79b" 20SRCREV = "01e52200e2a76ec51c3bb9710617ac0c249a78bc"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index eea6911c..565ca843 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -27,4 +27,4 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
27 27
28DEPENDS += "qtbase" 28DEPENDS += "qtbase"
29 29
30SRCREV = "a70f6a1b9599931fccd13b15a1700e61137f7e72" 30SRCREV = "b16873afea798d08799d7a0b255b8d200337f35b"
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 6f2f1a35..16c20956 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
15 15
16DEPENDS += "qtbase qtdeclarative" 16DEPENDS += "qtbase qtdeclarative"
17 17
18SRCREV = "7197e7f4b385315cb241043495cbfad58deb911a" 18SRCREV = "0b00ee6f6c311a7f5c0b4f2441dad97a454d172e"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index 0d1133da..4139db1f 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
15 15
16DEPENDS += "qtbase" 16DEPENDS += "qtbase"
17 17
18SRCREV = "03d492e49e74eefa1c83e37e833d862f4b9f1e45" 18SRCREV = "9a70ee2389d3302f6a4262325f8a76e4d867b478"
diff --git a/recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch b/recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch
deleted file mode 100644
index c0e13898..00000000
--- a/recipes-qt/qt5/qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From f3b363acbe125c1eb1f1d4cf28973d2914cda024 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 5 Nov 2015 12:25:05 +0100
4Subject: [PATCH] textobject.pro: use DEPLOYMENT only for wince like other
5 examples
6
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8---
9 examples/svg/richtext/textobject/textobject.pro | 8 +++++---
10 1 file changed, 5 insertions(+), 3 deletions(-)
11
12diff --git a/examples/svg/richtext/textobject/textobject.pro b/examples/svg/richtext/textobject/textobject.pro
13index 794ad32..0ecd2c7 100644
14--- a/examples/svg/richtext/textobject/textobject.pro
15+++ b/examples/svg/richtext/textobject/textobject.pro
16@@ -12,6 +12,8 @@ RESOURCES = resources.qrc
17 target.path = $$[QT_INSTALL_EXAMPLES]/svg/richtext/textobject
18 INSTALLS += target
19
20-filesToDeploy.files = files/*.svg
21-filesToDeploy.path = files
22-DEPLOYMENT += filesToDeploy
23+wince* {
24+ filesToDeploy.files = files/*.svg
25+ filesToDeploy.path = files
26+ DEPLOYMENT += filesToDeploy
27+}
28--
292.7.0
30
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 83abbe6b..6c300e5b 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -13,6 +13,4 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "38777ea7451d55e9c3d32d88d46063016013f60c" 16SRCREV = "e02df9c098b4d304b34c0ff65806a0576e45ed1a"
17
18SRC_URI += "file://0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch"
diff --git a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
index 45a4fc73..dbb94381 100644
--- a/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
+++ b/recipes-qt/qt5/qttools/0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch
@@ -1,7 +1,7 @@
1From a6f3bde30cb78e109a26fec6b336f8a504d4fa3c Mon Sep 17 00:00:00 2001 1From c6d62fcf2e02b5a86c36b4afd78dfb7a3f29ad91 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/4] Allow to build only lrelease + lupdate + lconvert 4Subject: [PATCH] Allow to build only lrelease + lupdate + lconvert
5 5
6This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native 6This is useful e.g. when cross compiling with OpenEmbedded where qtbase-native
7is built without GUI support (no-png is set) and we still want to build 7is built without GUI support (no-png is set) and we still want to build
@@ -156,6 +156,3 @@ index 20b5fec..8a42d1f 100644
156 156
157 installed_cmake.depends = cmake 157 installed_cmake.depends = cmake
158 158
159--
1602.7.0
161
diff --git a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
index c4c0a14d..b5e92934 100644
--- a/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
+++ b/recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
@@ -1,7 +1,7 @@
1From 1140fd4bb5768d49cad9e834a9ce5eb05b711d0e Mon Sep 17 00:00:00 2001 1From 34f23c43f1c656ccd424528821a9ac65a98c5fec 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/4] assistant/help: fix linking of dependent libraries 4Subject: [PATCH] assistant/help: fix linking of dependent libraries
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -18,15 +18,12 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
18 1 file changed, 2 insertions(+) 18 1 file changed, 2 insertions(+)
19 19
20diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro 20diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro
21index 168d23d..a9c3b59 100644 21index 37d5ba4..8de8763 100644
22--- a/src/assistant/help/help.pro 22--- a/src/assistant/help/help.pro
23+++ b/src/assistant/help/help.pro 23+++ b/src/assistant/help/help.pro
24@@ -59,3 +59,5 @@ HEADERS += qhelpenginecore.h \ 24@@ -60,3 +60,5 @@ HEADERS += qhelpsearchindexwriter_clucene_p.h \
25 # access to clucene
26 HEADERS += qhelpsearchindexwriter_clucene_p.h \
27 qhelpsearchindexreader_clucene_p.h 25 qhelpsearchindexreader_clucene_p.h
26
27 load(qt_module)
28+ 28+
29+LIBS += -lQt5CLucene 29+LIBS += -lQt5CLucene
30--
312.7.0
32
diff --git a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch
index 81b511f4..f0f40b7a 100644
--- a/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch
+++ b/recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch
@@ -1,7 +1,7 @@
1From a0637f231d513dfc15f1eec185d5d5e7fb03e292 Mon Sep 17 00:00:00 2001 1From b77f225e25360832074692681c5ff7c13862102d 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/4] add noqtwebkit configuration 4Subject: [PATCH] add noqtwebkit configuration
5MIME-Version: 1.0 5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8 6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit 7Content-Transfer-Encoding: 8bit
@@ -46,6 +46,3 @@ index 500a153..b60fa2d 100644
46+qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit): SUBDIRS += qwebview 46+qtHaveModule(webkitwidgets):!contains(CONFIG, noqtwebkit): SUBDIRS += qwebview
47 win32: qtHaveModule(axcontainer): SUBDIRS += activeqt 47 win32: qtHaveModule(axcontainer): SUBDIRS += activeqt
48 qtHaveModule(quickwidgets): SUBDIRS += qquickwidget 48 qtHaveModule(quickwidgets): SUBDIRS += qquickwidget
49--
502.7.0
51
diff --git a/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch b/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch
index 0e7061a9..16ff71e4 100644
--- a/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch
+++ b/recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch
@@ -1,7 +1,7 @@
1From 3f1754dec603e3508a45f3e1800edf0a44411084 Mon Sep 17 00:00:00 2001 1From e65c5ea9f7ce6fade201ed15b44dcb4d82219b3f Mon Sep 17 00:00:00 2001
2From: Cody P Schafer <dev@codyps.com> 2From: Cody P Schafer <dev@codyps.com>
3Date: Thu, 9 Jul 2015 11:28:19 -0400 3Date: Thu, 9 Jul 2015 11:28:19 -0400
4Subject: [PATCH 4/4] linguist-tools cmake: allow overriding the location for 4Subject: [PATCH] linguist-tools cmake: allow overriding the location for
5 lupdate and lrelease 5 lupdate and lrelease
6 6
7--- 7---
@@ -58,6 +58,3 @@ index 4318b16..2e3b70f 100644
58 _qt5_LinguistTools_check_file_exists(${imported_location}) 58 _qt5_LinguistTools_check_file_exists(${imported_location})
59 59
60 set_target_properties(Qt5::lconvert PROPERTIES 60 set_target_properties(Qt5::lconvert PROPERTIES
61--
622.7.0
63
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index afa4f798..3a27bbd7 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -31,6 +31,6 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
31EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" 31EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
32EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" 32EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}"
33 33
34SRCREV = "9904992dc4eb9a5958fcfbac238374ff38498143" 34SRCREV = "e33532e048fa12ee32429ca83ee31aa8f065147d"
35 35
36BBCLASSEXTEND = "native nativesdk" 36BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index cc847557..93b147d8 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -114,4 +114,4 @@ FILES_${PN}-qt = " \
114 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ 114 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \
115" 115"
116 116
117SRCREV = "41d212290c3822b8eef151785d89ac5f5b246bde" 117SRCREV = "13f1f2f12ddfc9b84535361d77a5f0f0ec8c3e0f"
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb
index a094419e..ca47da84 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bb
+++ b/recipes-qt/qt5/qtwayland-native_git.bb
@@ -25,4 +25,4 @@ do_install() {
25 oe_runmake install INSTALL_ROOT=${D} 25 oe_runmake install INSTALL_ROOT=${D}
26} 26}
27 27
28SRCREV = "29b8bd8b1117589341110502fe516bf22c920747" 28SRCREV = "26e27845a43319d0ecad0c6392f05d1ed50da2a2"
diff --git a/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch
index 06168e32..45493cf5 100644
--- a/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch
+++ b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch
@@ -1,4 +1,4 @@
1From 8841d31cb66fda833dc0ae557f13887716f4c46b Mon Sep 17 00:00:00 2001 1From cadcacf58301251629a63ecd2682d58e6bf24cb8 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
@@ -27,6 +27,3 @@ index ac2d07b..7a46a24 100644
27 27
28+target.path = $$[QT_HOST_BINS] 28+target.path = $$[QT_HOST_BINS]
29+INSTALLS += target 29+INSTALLS += target
30--
312.7.0
32
diff --git a/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch b/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch
index 36047570..f39707c6 100644
--- a/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch
+++ b/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch
@@ -1,4 +1,4 @@
1From efec881d1bff247e6452a10a60821612c2585c67 Mon Sep 17 00:00:00 2001 1From 52971db84e3b2c429e8777953c0532dcb88b8e6b 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
@@ -26,6 +26,3 @@ index d633fb9..643c7cd 100644
26+ SUBDIRS += server-buffer 26+ SUBDIRS += server-buffer
27+ } 27+ }
28 } 28 }
29--
302.7.0
31
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index a5e3abec..a1cee864 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -36,4 +36,4 @@ SRC_URI += " \
36 file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \ 36 file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \
37" 37"
38 38
39SRCREV = "29b8bd8b1117589341110502fe516bf22c920747" 39SRCREV = "26e27845a43319d0ecad0c6392f05d1ed50da2a2"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index 7d923d8d..79c6b23f 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
15 15
16DEPENDS += "qtdeclarative qtwebsockets" 16DEPENDS += "qtdeclarative qtwebsockets"
17 17
18SRCREV = "92d903d92b430222cd3f89eab08d61d947e5abea" 18SRCREV = "64a106da72796377bbff5cce0ecc5a379b105498"
diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch
index a1ea375f..75350c17 100644
--- a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch
@@ -1,8 +1,8 @@
1From 90d2f7aefa8922c3aa29e6907c1520c814d1797f Mon Sep 17 00:00:00 2001 1From 04be78d20ecc23e289e171e907bb5daf9393619d Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Fri, 3 Oct 2014 03:52:11 +0200 3Date: Fri, 3 Oct 2014 03:52:11 +0200
4Subject: [PATCH 1/2] <chromium> base.gypi: include 4Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc
5 atomicops_internals_x86_gcc.cc when building for x64 arch 5 when building for x64 arch
6 6
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8--- 8---
@@ -22,6 +22,3 @@ index b860735..0ed5de3 100644
22 'sources/': [ 22 'sources/': [
23 ['include', 'atomicops_internals_x86_gcc.cc'], 23 ['include', 'atomicops_internals_x86_gcc.cc'],
24 ], 24 ],
25--
262.7.0
27
diff --git a/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch b/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
index 88d4826e..c95fad09 100644
--- a/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
@@ -1,7 +1,7 @@
1From f052458fe39733602751f9f9a09d1c0d78bea421 Mon Sep 17 00:00:00 2001 1From dde0edc1681bb49580584028c2d7b5757e177cd1 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/5] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H 4Subject: [PATCH] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H
5 anywhere in path, 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>
@@ -25,6 +25,3 @@ index 2df689b..8d984c7 100644
25 return($$out) 25 return($$out)
26 } 26 }
27 27
28--
292.7.0
30
diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
index 1227d0a0..00432bc0 100644
--- a/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
+++ b/recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
@@ -1,7 +1,7 @@
1From a015bddaf2005cac376be7dda4603637afc5844c Mon Sep 17 00:00:00 2001 1From 3ae00f0217e4a0039f0855ea6cd945209b1734ee Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com> 2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Thu, 24 Dec 2015 12:46:58 -0200 3Date: Thu, 24 Dec 2015 12:46:58 -0200
4Subject: [PATCH 2/2] chromium: Change false to FALSE and 1 to TRUE, FIX 4Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX
5 qtwebengine compile 5 qtwebengine compile
6 6
7Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> 7Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
@@ -61,6 +61,3 @@ index 8a08fe0..32b2a05 100644
61 61
62 // we want to always get RGB data out 62 // we want to always get RGB data out
63 switch (cinfo.jpeg_color_space) { 63 switch (cinfo.jpeg_color_space) {
64--
652.7.0
66
diff --git a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
index dbc1e24e..18f268ce 100644
--- a/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
+++ b/recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
@@ -1,7 +1,7 @@
1From 5f6389fe3493420c2afeec8f2786165f1d08901a Mon Sep 17 00:00:00 2001 1From 6576e3135b839b53c422befac0a233f6dd1966bf Mon Sep 17 00:00:00 2001
2From: Simon Busch <morphis@gravedo.de> 2From: Simon Busch <morphis@gravedo.de>
3Date: Tue, 18 Nov 2014 10:38:18 +0100 3Date: Tue, 18 Nov 2014 10:38:18 +0100
4Subject: [PATCH 2/5] functions.prf: Make sure we only use the file name to 4Subject: [PATCH] functions.prf: Make sure we only use the file name to
5 generate it's moc'ed abbreviation 5 generate it's moc'ed abbreviation
6 6
7Signed-off-by: Simon Busch <morphis@gravedo.de> 7Signed-off-by: Simon Busch <morphis@gravedo.de>
@@ -24,6 +24,3 @@ index 8d984c7..055e960 100644
24 # The order is important, since the output of the second replace would end up accidentaly transformed by the first one 24 # The order is important, since the output of the second replace would end up accidentaly transformed by the first one
25 for(ext, $$list($${QMAKE_EXT_CPP})): \ 25 for(ext, $$list($${QMAKE_EXT_CPP})): \
26 out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC}) 26 out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC})
27--
282.7.0
29
diff --git a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
index 28960ed4..78cb3fc4 100644
--- a/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
@@ -1,7 +1,7 @@
1From 348a74cb924cf6ac4384069d84ee3995644b2ce1 Mon Sep 17 00:00:00 2001 1From f4c64fbabdcc30d46d9181401aa1c9d78fcb0b2f Mon Sep 17 00:00:00 2001
2From: Frieder Schrempf <frieder.schrempf@online.de> 2From: Frieder Schrempf <frieder.schrempf@online.de>
3Date: Mon, 1 Dec 2014 14:34:40 +0000 3Date: Mon, 1 Dec 2014 14:34:40 +0000
4Subject: [PATCH 3/5] functions.prf: allow build for linux-oe-g++ platform 4Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform
5 5
6Upstream-Status: Inappropriate [OE specific] 6Upstream-Status: Inappropriate [OE specific]
7 7
@@ -28,6 +28,3 @@ index 055e960..379c9b5 100644
28 } else:win32 { 28 } else:win32 {
29 winrt { 29 winrt {
30 skipBuild("WinRT is not supported.") 30 skipBuild("WinRT is not supported.")
31--
322.7.0
33
diff --git a/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch b/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
index 4a3deb9b..901462cd 100644
--- a/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
+++ b/recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
@@ -1,7 +1,7 @@
1From 80f5e26073ef58c1a2ff510c6ccdb7423bcb2fc3 Mon Sep 17 00:00:00 2001 1From a2670f5ad67822b399e9dd7b3b87589be1da9749 Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com> 2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Fri, 25 Dec 2015 18:16:05 -0200 3Date: Fri, 25 Dec 2015 18:16:05 -0200
4Subject: [PATCH 4/5] WebEngine qquickwebengineview_p_p.h add include QColor 4Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor
5 5
6Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> 6Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
7--- 7---
@@ -9,7 +9,7 @@ Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
9 1 file changed, 2 insertions(+) 9 1 file changed, 2 insertions(+)
10 10
11diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h 11diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
12index dbbbf91..94268b6 100644 12index 65bf25e..0447d07 100644
13--- a/src/webengine/api/qquickwebengineview_p_p.h 13--- a/src/webengine/api/qquickwebengineview_p_p.h
14+++ b/src/webengine/api/qquickwebengineview_p_p.h 14+++ b/src/webengine/api/qquickwebengineview_p_p.h
15@@ -56,6 +56,8 @@ 15@@ -56,6 +56,8 @@
@@ -21,6 +21,3 @@ index dbbbf91..94268b6 100644
21 21
22 namespace QtWebEngineCore { 22 namespace QtWebEngineCore {
23 class WebContentsAdapter; 23 class WebContentsAdapter;
24--
252.7.0
26
diff --git a/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch
index 6fd9e499..fa3faf45 100644
--- a/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch
+++ b/recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch
@@ -1,7 +1,7 @@
1From b3f3154e4852a830fdc4e311d4f5105fc337e8f2 Mon Sep 17 00:00:00 2001 1From b523c4dd76f6205389d8f5771124f0451ec7183f Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com> 2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Thu, 24 Dec 2015 15:59:51 -0200 3Date: Thu, 24 Dec 2015 15:59:51 -0200
4Subject: [PATCH 5/5] Include dependency to QCoreApplication::translate() 4Subject: [PATCH] Include dependency to QCoreApplication::translate()
5 5
6Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com> 6Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
7--- 7---
@@ -21,6 +21,3 @@ index 500fe76..eda2824 100644
21 #include "web_contents_adapter_client.h" 21 #include "web_contents_adapter_client.h"
22 22
23 #include "base/callback.h" 23 #include "base/callback.h"
24--
252.7.0
26
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index ec9aa3c8..98b4babe 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -119,8 +119,8 @@ SRC_URI += " \
119 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ 119 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \
120" 120"
121 121
122SRCREV_qtwebengine = "5c4ae298b0a3d75c4c5ea8aef0595914ab25607f" 122SRCREV_qtwebengine = "643aa579fc94933eefa8eb20af6729e2140cf480"
123SRCREV_chromium = "cbe3845eff59c2d1726ed3dc0f934f7f483a1271" 123SRCREV_chromium = "8252b18aa3efa52138e91f9756945afb142a1c8c"
124SRCREV = "${SRCREV_qtwebengine}" 124SRCREV = "${SRCREV_qtwebengine}"
125 125
126SRCREV_FORMAT = "qtwebengine_chromium" 126SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb
index a0d4e9fd..63d02fac 100644
--- a/recipes-qt/qt5/qtwebkit-examples_git.bb
+++ b/recipes-qt/qt5/qtwebkit-examples_git.bb
@@ -19,4 +19,4 @@ DEPENDS += "qtwebkit qtxmlpatterns"
19RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" 19RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
20RDEPENDS_${PN}-examples += "${@base_contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" 20RDEPENDS_${PN}-examples += "${@base_contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"
21 21
22SRCREV = "7988aecdbcb07f3a214c2c804a39db3fc5617844" 22SRCREV = "1b9a0fc9d1ded4f4f11b04eb0bb7d1de82d6eb34"
diff --git a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
index e8b0e432..1f3dd2a7 100644
--- a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
+++ b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
@@ -1,7 +1,7 @@
1From 1735a8484ef9ae336f8d607b56bda64c8af10c79 Mon Sep 17 00:00:00 2001 1From 3e321803386278c52508d114f5096883e974a4bb 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 1/3] qtwebkit: fix QA issue (bad RPATH) 4Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH)
5 5
6Building qtwebkit causes a QA issue such that QtWebPluginProcess and 6Building qtwebkit causes a QA issue such that QtWebPluginProcess and
7QtWebProcess contain bad RPATHs which point into the build location. This fix 7QtWebProcess contain bad RPATHs which point into the build location. This fix
@@ -25,6 +25,3 @@ index fd66af6..ef754c3 100644
25 25
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--
292.7.0
30
diff --git a/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch b/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch
index b3a86159..2114b42c 100644
--- a/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch
+++ b/recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch
@@ -1,7 +1,7 @@
1From ae16ce17cc7060274a0b0c165b953fc32540f977 Mon Sep 17 00:00:00 2001 1From f1eb41ada1a9bb5f4073c8a48010555cbefeec34 Mon Sep 17 00:00:00 2001
2From: Magnus Granberg <zorry@gentoo.org> 2From: Magnus Granberg <zorry@gentoo.org>
3Date: Fri, 27 Feb 2015 11:55:09 +0100 3Date: Fri, 27 Feb 2015 11:55:09 +0100
4Subject: [PATCH 2/3] Remove TEXTREL tag in x86 4Subject: [PATCH] Remove TEXTREL tag in x86
5 5
6Fix textrel QA warnings when building qtwebkit for x86: 6Fix textrel QA warnings when building qtwebkit for x86:
7 7
@@ -74,6 +74,3 @@ index 0a2fe78..2dc40ef 100644
74 #else 74 #else
75 #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) 75 #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name)
76 #endif 76 #endif
77--
782.7.0
79
diff --git a/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch b/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
index 43798666..5edc9392 100644
--- a/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
+++ b/recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
@@ -1,7 +1,7 @@
1From 6c36f0ff8c1f5852c33d2b23714f9f187cc6ff26 Mon Sep 17 00:00:00 2001 1From 5e5545f49d91e1c40d85d2497e16495ee9e53c11 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 5 Jun 2015 19:55:05 -0700 3Date: Fri, 5 Jun 2015 19:55:05 -0700
4Subject: [PATCH 3/3] Exclude backtrace() API for non-glibc libraries 4Subject: [PATCH] Exclude backtrace() API for non-glibc libraries
5 5
6It was excluding musl with current checks, so lets make it such that it 6It was excluding musl with current checks, so lets make it such that it
7considers only glibc when using backtrace API 7considers only glibc when using backtrace API
@@ -33,6 +33,3 @@ index 1b2091f..ba03a28 100644
33 *size = backtrace(stack, *size); 33 *size = backtrace(stack, *size);
34 #elif OS(WINDOWS) && !OS(WINCE) 34 #elif OS(WINDOWS) && !OS(WINCE)
35 // The CaptureStackBackTrace function is available in XP, but it is not defined 35 // The CaptureStackBackTrace function is available in XP, but it is not defined
36--
372.7.0
38
diff --git a/recipes-qt/qt5/qtwebkit/0004-Fix-linking-with-libpthread.patch b/recipes-qt/qt5/qtwebkit/0004-Fix-linking-with-libpthread.patch
deleted file mode 100644
index c5e6ac52..00000000
--- a/recipes-qt/qt5/qtwebkit/0004-Fix-linking-with-libpthread.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 5dd4bb67cfce812fd7686e43616e2069f354a7df Mon Sep 17 00:00:00 2001
2From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
3Date: Mon, 22 Feb 2016 10:57:32 +0100
4Subject: [PATCH] Fix linking with libpthread
5
6WebKit use libpthread directly but is depending on other qt modules
7causing it to be linked against, which might break unless -lpthread
8is last. Instead just add it explicitly after the static libraries.
9
10Upstream-Status: Backport from 5.7 branch
11
12Change-Id: I2b95cff2c96373f8dce6f95052c4fccbe1982b33
13Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
14Signed-off-by: Jonathan Liu <net147@gmail.com>
15---
16 Tools/qmake/mkspecs/features/default_post.prf | 1 +
17 1 file changed, 1 insertion(+)
18
19diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf
20index 67276b7..39bb3f7 100644
21--- a/Tools/qmake/mkspecs/features/default_post.prf
22+++ b/Tools/qmake/mkspecs/features/default_post.prf
23@@ -201,6 +201,7 @@ needToLink() {
24 linkAgainstLibrary($$library, $$eval(WEBKIT.$${library_identifier}.root_source_dir))
25 LIBS += $$eval(WEBKIT.$${library_identifier}.dependent_libs)
26 }
27+ posix:!darwin: LIBS += -lpthread
28 }
29
30 creating_module {
31--
322.7.1
33
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 62a76507..eb05ce24 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -22,7 +22,6 @@ SRC_URI += "\
22 file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \ 22 file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \
23 file://0002-Remove-TEXTREL-tag-in-x86.patch \ 23 file://0002-Remove-TEXTREL-tag-in-x86.patch \
24 file://0003-Exclude-backtrace-API-for-non-glibc-libraries.patch \ 24 file://0003-Exclude-backtrace-API-for-non-glibc-libraries.patch \
25 file://0004-Fix-linking-with-libpthread.patch \
26" 25"
27 26
28PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel" 27PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel"
@@ -72,4 +71,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db
72RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" 71RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
73export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" 72export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
74 73
75SRCREV = "be8e169ba38c84562194906047d0da04bf3ae91a" 74SRCREV = "71136c9621103522e85654c8e144d5f1c961de1c"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index cac3884a..66d9d741 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtdeclarative" 12DEPENDS += "qtbase qtdeclarative"
13 13
14SRCREV = "88946bbe209cb6148b4a3284077bb9a06c7bc1ef" 14SRCREV = "ba9306ec5a1271275d79b2f48ceb227f79352f33"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index ac33fb26..d8beb500 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "d64ee96f0df4d3baa6959b8552bc59d53cb0b451" 16SRCREV = "f27489d66cc6d8263130451c26c7e4ae40acc6b4"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 2f24933b..d78df146 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -13,6 +13,6 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "de2dadb8af67f9d425c3a8d2353a7d5b07588915" 16SRCREV = "5e6acdb2ea92add793835561e7a2d6b0ed8890f8"
17 17
18BBCLASSEXTEND =+ "native nativesdk" 18BBCLASSEXTEND =+ "native nativesdk"