summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2016-12-28 08:06:54 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2017-01-25 16:13:51 +0100
commit4020adfd5198cf581eb20fbfd7d5b4c1a42fcdf4 (patch)
tree5726d452fb4d98adad4a1dabceb01a9d689e3a9b
parentda138c99142bec136e43eba35ce09d86f00eca2c (diff)
downloadmeta-qt5-4020adfd5198cf581eb20fbfd7d5b4c1a42fcdf4.tar.gz
qt5: update submodule SRCREVs to 5.7.1 release
* squashed with https://patchwork.openembedded.org/patch/135662/ qtwayland: update patch to apply with Qt 5.7.1 Update 0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch to apply on Qt 5.7.1 sources. Change-Id: I541f6fb5a706cdec3451dad015590a6624298a18 Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qt3d_git.bb8
-rw-r--r--recipes-qt/qt5/qt5-git.inc2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase/0013-Fix-build-with-QT_NO_OPENGL.patch33
-rw-r--r--recipes-qt/qt5/qtbase_git.bb3
-rw-r--r--recipes-qt/qt5/qtcanvas3d_git.bb8
-rw-r--r--recipes-qt/qt5/qtcharts_git.bb2
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb2
-rw-r--r--recipes-qt/qt5/qtdatavis3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative-render2d_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative/0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch44
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb3
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb10
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb10
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb10
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb6
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb8
-rw-r--r--recipes-qt/qt5/qtscript_git.bb2
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb10
-rw-r--r--recipes-qt/qt5/qtserialbus_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialport_git.bb10
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb8
-rw-r--r--recipes-qt/qt5/qttools_git.bb2
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb2
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch75
-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_git.bb4
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb8
-rw-r--r--recipes-qt/qt5/qtx11extras_git.bb10
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
35 files changed, 93 insertions, 209 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 74526484..47e204bf 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -262,4 +262,4 @@ fakeroot do_generate_qt_environment_file() {
262 262
263addtask generate_qt_environment_file after do_install before do_package 263addtask generate_qt_environment_file after do_install before do_package
264 264
265SRCREV = "69b43e74d78e050cf5e40197acafa4bc9f90c0bd" 265SRCREV = "a55f36211efe1bb0d6717c8545366120bd6dfd9f"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 9708ec92..2276c36d 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -3,9 +3,9 @@ require qt5-git.inc
3 3
4LICENSE = "LGPL-3.0 | GPL-2.0" 4LICENSE = "LGPL-3.0 | GPL-2.0"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv3;md5=3dcffeed712d3c916f9a2d9135703aff \ 6 file://LICENSE.LGPLv3;md5=8211fde12cc8a4e2477602f5953f5b71 \
7 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 7 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
8 file://LICENSE.GPL;md5=05832301944453ec79e40ba3c3cfceec \ 8 file://LICENSE.GPL;md5=c96076271561b0e3785dad260634eaa8 \
9" 9"
10 10
11DEPENDS += "qtbase" 11DEPENDS += "qtbase"
@@ -27,6 +27,6 @@ FILES_${PN}-qmlplugins += " \
27 ${OE_QMAKE_PATH_QML}/*/*/*.obj \ 27 ${OE_QMAKE_PATH_QML}/*/*/*.obj \
28" 28"
29 29
30SRCREV = "c3fdb888fbd94de0f6b7b1a6859cba8132ecc93d" 30SRCREV = "0eac16fbda846c951f9b3887199e72b66f5aacd7"
31 31
32BBCLASSEXTEND += "native nativesdk" 32BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index e1e25ba7..3e1bc72a 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -12,4 +12,4 @@ SRC_URI = " \
12 12
13S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"
14 14
15PV = "5.7.0+git${SRCPV}" 15PV = "5.7.1+git${SRCPV}"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 4da56405..ec4a9b67 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -123,4 +123,4 @@ do_install() {
123 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt 123 ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
124} 124}
125 125
126SRCREV = "69b43e74d78e050cf5e40197acafa4bc9f90c0bd" 126SRCREV = "a55f36211efe1bb0d6717c8545366120bd6dfd9f"
diff --git a/recipes-qt/qt5/qtbase/0013-Fix-build-with-QT_NO_OPENGL.patch b/recipes-qt/qt5/qtbase/0013-Fix-build-with-QT_NO_OPENGL.patch
deleted file mode 100644
index 7b681dce..00000000
--- a/recipes-qt/qt5/qtbase/0013-Fix-build-with-QT_NO_OPENGL.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 2e176e3d10535e4fdaa6ecc919538f66f4a2930d Mon Sep 17 00:00:00 2001
2From: Andy Nichols <andy.nichols@qt.io>
3Date: Mon, 11 Jul 2016 09:18:33 +0200
4Subject: QWidgetBackingStore: Fix build with QT_NO_OPENGL
5
6A define moved out of the #ifndef QT_NO_OPENGL scope.
7
8Change-Id: I41c943b97f165b5171581e01f3a4b2d3fb25747e
9Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
10
11Upstream-Status: Backport
12Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
13---
14 src/widgets/kernel/qwidgetbackingstore.cpp | 2 ++
15 1 file changed, 2 insertions(+)
16
17diff --git a/src/widgets/kernel/qwidgetbackingstore.cpp b/src/widgets/kernel/qwidgetbackingstore.cpp
18index 32aabce..242e625 100644
19--- a/src/widgets/kernel/qwidgetbackingstore.cpp
20+++ b/src/widgets/kernel/qwidgetbackingstore.cpp
21@@ -67,7 +67,9 @@ QT_BEGIN_NAMESPACE
22
23 extern QRegion qt_dirtyRegion(QWidget *);
24
25+#ifndef QT_NO_OPENGL
26 Q_GLOBAL_STATIC(QPlatformTextureList, qt_dummy_platformTextureList)
27+#endif
28
29 /**
30 * Flushes the contents of the \a backingStore into the screen area of \a widget.
31--
32cgit v1.0-4-g1e03
33
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index eda57aca..21f67f60 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -26,7 +26,6 @@ SRC_URI += "\
26 file://0008-configure-paths-for-target-qmake-properly.patch \ 26 file://0008-configure-paths-for-target-qmake-properly.patch \
27 file://0009-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch \ 27 file://0009-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch \
28 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ 28 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
29 file://0013-Fix-build-with-QT_NO_OPENGL.patch \
30" 29"
31 30
32DEPENDS += "qtbase-native" 31DEPENDS += "qtbase-native"
@@ -230,4 +229,4 @@ do_install_append() {
230 229
231RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 230RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
232 231
233SRCREV = "69b43e74d78e050cf5e40197acafa4bc9f90c0bd" 232SRCREV = "a55f36211efe1bb0d6717c8545366120bd6dfd9f"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
index 8cf316bf..109b2939 100644
--- a/recipes-qt/qt5/qtcanvas3d_git.bb
+++ b/recipes-qt/qt5/qtcanvas3d_git.bb
@@ -3,11 +3,11 @@ require qt5-git.inc
3 3
4LICENSE = "LGPL-3.0 | GPL-3.0" 4LICENSE = "LGPL-3.0 | GPL-3.0"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 6 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
7 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 7 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
8 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 8 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
9" 9"
10 10
11DEPENDS = "qtdeclarative" 11DEPENDS = "qtdeclarative"
12 12
13SRCREV = "1568c60d2a0d1758acfeec9f002af7ff5b4d28ee" 13SRCREV = "8e34d6f5399a29d45f9402219f13b631e29fd4b0"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index 21f6f139..d0ac2a12 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia" 9DEPENDS += "qtbase qtdeclarative qtmultimedia"
10 10
11SRCREV = "03a6177a3223f928a5f329c8b1fc4d5fe376deed" 11SRCREV = "da071825245a4ec1dc4904a9d3329db5a132c074"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 67f882ad..665359b2 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -28,4 +28,4 @@ do_configure_prepend() {
28 sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro 28 sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro
29} 29}
30 30
31SRCREV = "8755a1f2460fa523782e27b6ca7a430a0176ac61" 31SRCREV = "d884d20c5530b67fbd2fba35cdb71a9f969196be"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index 50a0bcc6..b96765c9 100644
--- a/recipes-qt/qt5/qtdatavis3d_git.bb
+++ b/recipes-qt/qt5/qtdatavis3d_git.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
8 8
9DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" 9DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
10 10
11SRCREV = "d6a8da66dc3c141621c9be4b7509a6e43c60e15c" 11SRCREV = "2523056490c3f7a35d176deb583ba46899fe260b"
diff --git a/recipes-qt/qt5/qtdeclarative-render2d_git.bb b/recipes-qt/qt5/qtdeclarative-render2d_git.bb
index cb2ee8bb..836a7982 100644
--- a/recipes-qt/qt5/qtdeclarative-render2d_git.bb
+++ b/recipes-qt/qt5/qtdeclarative-render2d_git.bb
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
9 9
10DEPENDS += "qtbase qtdeclarative" 10DEPENDS += "qtbase qtdeclarative"
11 11
12SRCREV = "13a6c51f26128015c0a3c335bdae676b46df6ed6" 12SRCREV = "fe2807312ff3d2285b51a4de363b1c1fb8d85f82"
diff --git a/recipes-qt/qt5/qtdeclarative/0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch b/recipes-qt/qt5/qtdeclarative/0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch
deleted file mode 100644
index d3ee42ef..00000000
--- a/recipes-qt/qt5/qtdeclarative/0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From fcc2c95421710f98c7b2dec73e2c8b0d9164bc9b Mon Sep 17 00:00:00 2001
2From: Jonathan Liu <net147@gmail.com>
3Date: Wed, 24 Aug 2016 11:18:37 +1000
4Subject: [PATCH] Workaround crashes in QtQml code related to dead-store
5 elimination
6
7When compiled in release mode with GCC 6, QtQml may crash.
8This is because the C++ compiler is more aggressive about dead-store
9elimination in situations where a memory store to a location precedes
10the construction of an object at that memory location.
11
12The QV4::MemoryManager::allocate{Managed,Object} functions allocate
13memory and write to it before the caller does a placement new to
14construct an object in the same memory. The compiler considers these
15writes before the constructor as "dead stores" and eliminates them.
16
17The -fno-lifetime-dse compiler flag is added to disable this more
18aggressive dead-store eliminiation optimization.
19
20This is a temporary workaround until a proper solution is found.
21
22Upstream-Status: Accepted
23
24Task-number: QTBUG-55482
25Change-Id: I7dbae6e9e613e53ce5fb25957c449bc6657803b5
26Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
27Signed-off-by: Jonathan Liu <net147@gmail.com>
28---
29 src/qml/qml.pro | 2 +-
30 1 file changed, 1 insertion(+), 1 deletion(-)
31
32diff --git a/src/qml/qml.pro b/src/qml/qml.pro
33index f4862a1..651afa6 100644
34--- a/src/qml/qml.pro
35+++ b/src/qml/qml.pro
36@@ -18,7 +18,7 @@ exists("qqml_enable_gcov") {
37
38 greaterThan(QT_GCC_MAJOR_VERSION, 5) {
39 # Our code is bad. Temporary workaround.
40- QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks
41+ QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks -fno-lifetime-dse
42 }
43
44 QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 5cc4caa1..a56e9dcb 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -19,7 +19,6 @@ DEPENDS += "qtbase"
19SRC_URI += " \ 19SRC_URI += " \
20 file://0001-qmltestexample-fix-link.patch \ 20 file://0001-qmltestexample-fix-link.patch \
21 file://0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch \ 21 file://0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch \
22 file://0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch \
23" 22"
24 23
25EXTRA_OEMAKE += "QMAKE_SYNCQT=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/syncqt" 24EXTRA_OEMAKE += "QMAKE_SYNCQT=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/syncqt"
@@ -38,6 +37,6 @@ do_configure_prepend() {
38 37
39EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 38EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
40 39
41SRCREV = "d48b397cc79265e80c8437888f9ded0b0364e418" 40SRCREV = "2a992040e2ef3f9dab087be3bfac05e28596672b"
42 41
43BBCLASSEXTEND =+ "native nativesdk" 42BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 6c62a683..61652865 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -4,13 +4,13 @@ require qt5-git.inc
4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" 4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ 6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
7 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 7 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
8 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 8 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
9 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 9 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ 10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ 11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
12 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 12 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
13 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 13 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
14 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 14 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
15 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 15 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
16" 16"
@@ -19,4 +19,4 @@ DEPENDS += "qtdeclarative"
19 19
20RDEPENDS_${PN}-dev = "" 20RDEPENDS_${PN}-dev = ""
21 21
22SRCREV = "d3023be0d839440ac046adf2af75d9e4306dd5ef" 22SRCREV = "f536e36e3188903404fac78064ea7872dd8cc0d2"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index 7f8179e1..80dcdd3a 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -4,13 +4,13 @@ require qt5-git.inc
4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" 4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ 6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
7 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 7 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
8 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 8 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
9 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 9 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ 10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ 11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
12 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 12 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
13 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 13 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
14 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 14 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
15 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 15 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
16" 16"
@@ -32,4 +32,4 @@ EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'jasper', 'CONFIG+
32EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}" 32EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}"
33EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}" 33EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}"
34 34
35SRCREV = "d4401c9f519dfe82c38fe9ded674e454655f1866" 35SRCREV = "11300c62aa021ef07f3e4de8bd875bfcbcbe2f7e"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 7a9ecb47..351e807c 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -3,12 +3,12 @@ require qt5-git.inc
3 3
4LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0" 4LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
7 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
11 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 11 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
12" 12"
13 13
14DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" 14DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols"
@@ -29,4 +29,4 @@ do_configure_prepend() {
29EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}" 29EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}"
30EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}" 30EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}"
31 31
32SRCREV = "4e1008b4ac1eea776585ca41a6a3db127cf500ff" 32SRCREV = "de5be121d84b062f1b72c91dddc877e5e88babc0"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 3bbfb6e0..bc3fcfb2 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -38,4 +38,4 @@ SRC_URI += "\
38 file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \ 38 file://0001-Initial-porting-effort-to-GStreamer-1.0.patch \
39" 39"
40 40
41SRCREV = "1be4f74843b41f8bc1d1d64e83485f4eb864e8b4" 41SRCREV = "e4aef963cbd32274669af6b66158f6f0ca4ba3ed"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 7271a19a..54d932b8 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -4,10 +4,10 @@ require qt5-git.inc
4LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-3.0" 4LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-3.0"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 6 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
7 file://LICENSE.LGPLv3;md5=8ba7f2099d17d636d5fcc8303bb17587 \ 7 file://LICENSE.LGPLv3;md5=a37e6cd7102174853307e03e6edc5f30 \
8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
9" 9"
10 10
11DEPENDS += "qtdeclarative" 11DEPENDS += "qtdeclarative"
12 12
13SRCREV = "cc0ee8e4f3345023f1b85fc815739c0a75ea5686" 13SRCREV = "6f6e073815d5b05aba553b83809fb701541260c6"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 176035c0..79ec3fd0 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -4,12 +4,12 @@ require qt5-git.inc
4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" 4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ 6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
7 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
8 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 8 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
9 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ 9 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
10 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ 10 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
11 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 11 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
12 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 12 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
13 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 13 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
14" 14"
15 15
@@ -21,4 +21,4 @@ SRC_URI += " \
21 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ 21 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \
22" 22"
23 23
24SRCREV = "37f8b753be1b16975220c8b611b17a428eafb9e9" 24SRCREV = "84b3cf1c0483af7ad200ab33944d8eaa4d4ffa48"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index bee833dd..460eb0d6 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -25,4 +25,4 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
25 25
26DEPENDS += "qtbase" 26DEPENDS += "qtbase"
27 27
28SRCREV = "b8845794b95376e8be39dbdafca2c85b5ec4c195" 28SRCREV = "42f94f30488a01751f387dc9bd3160ce1b4dfa58"
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index af45d89a..24551eb3 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -3,14 +3,14 @@ require qt5-git.inc
3 3
4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" 4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
7 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
11 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 11 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
12" 12"
13 13
14DEPENDS += "qtbase qtdeclarative" 14DEPENDS += "qtbase qtdeclarative"
15 15
16SRCREV = "e03c37077ea4841b9e0b591d29a34737d7d8dd32" 16SRCREV = "5a57beaaa5f637070ccbf30d79ad27861134c7a8"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 397ac4e9..d8b45463 100644
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtserialport" 12DEPENDS += "qtbase qtserialport"
13 13
14SRCREV = "88554d068d287870740b842864a50604f53e8509" 14SRCREV = "768b2d463663104daae44f564f09c3a10e2e6ad6"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index d5f37d5f..ef780d43 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -5,14 +5,14 @@ require qt5-git.inc
5# other qt* components use :/ 5# other qt* components use :/
6LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 6LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
7LIC_FILES_CHKSUM = " \ 7LIC_FILES_CHKSUM = " \
8 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 8 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
9 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 9 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
10 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 10 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
11 file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \ 11 file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \
12 file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \ 12 file://LICENSE.FDL;md5=3801d7932fdc07fd9efe89f9854a6caa \
13 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 13 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
14" 14"
15 15
16DEPENDS += "qtbase" 16DEPENDS += "qtbase"
17 17
18SRCREV = "7346857f4f675f57572d54f15cfad9111af2abde" 18SRCREV = "0b9f41c28cece4fe51011083e646aba405ec3a65"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 21e06ff6..46bbd9b7 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -3,13 +3,13 @@ require qt5-git.inc
3 3
4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )" 4LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
7 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
11" 11"
12 12
13DEPENDS += "qtbase" 13DEPENDS += "qtbase"
14 14
15SRCREV = "64ca369c7e3d61f0416bc1fd6a102f0c62924433" 15SRCREV = "d3d3db5a75fe2ba992742e418bfefa25eddf7684"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 56c1205b..fbebc96d 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -35,6 +35,6 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
35EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" 35EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
36EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}" 36EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'linguistonly', 'CONFIG+=linguistonly', '', d)}"
37 37
38SRCREV = "0597b535f82d3458a1db1828c5e5f725bbcf59fd" 38SRCREV = "8575ed82ff0dd43aed8f5de67b4cfef06fec8c33"
39 39
40BBCLASSEXTEND = "native nativesdk" 40BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 2a37d144..89657f18 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 = "2209b3fd6a56bfc44da5369c4fbd345bbca31777" 117SRCREV = "c4795ce81f9165a05e6f918066c671808447c539"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index 7e2f445e..067f1d6d 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -48,4 +48,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
48 48
49DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" 49DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns"
50 50
51SRCREV = "626e78c9660cff063e1f9370538b5a424631571c" 51SRCREV = "5ac6b611b196c66bc8b01c23aa50d175ae7a7308"
diff --git a/recipes-qt/qt5/qtwayland-native_git.bb b/recipes-qt/qt5/qtwayland-native_git.bb
index 1149aa5b..8752771a 100644
--- a/recipes-qt/qt5/qtwayland-native_git.bb
+++ b/recipes-qt/qt5/qtwayland-native_git.bb
@@ -29,4 +29,4 @@ do_install() {
29 oe_runmake install INSTALL_ROOT=${D} 29 oe_runmake install INSTALL_ROOT=${D}
30} 30}
31 31
32SRCREV = "a172672484b9496819e588b51ac2ff9fb4a21941" 32SRCREV = "4b23163fb64a5a8d05320dd006962cf2bcefcd84"
diff --git a/recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch b/recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch
index d173e673..9f276dcc 100644
--- a/recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch
+++ b/recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch
@@ -1,4 +1,4 @@
1From de85e1c1ee76be845a21b441d9e4ea12a30d84c7 Mon Sep 17 00:00:00 2001 1From 9d31fbbe3a22985e200e49f164e2971dfa6d963c Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Vesa=20J=C3=A4=C3=A4skel=C3=A4inen?= <dachaac@gmail.com> 2From: =?UTF-8?q?Vesa=20J=C3=A4=C3=A4skel=C3=A4inen?= <dachaac@gmail.com>
3Date: Sun, 18 Sep 2016 11:51:59 +0300 3Date: Sun, 18 Sep 2016 11:51:59 +0300
4Subject: [PATCH] Fix building of QWaylandIntegration if some Qt5 features are 4Subject: [PATCH] Fix building of QWaylandIntegration if some Qt5 features are
@@ -9,15 +9,15 @@ QT_NO_CLIPBOARD, QT_NO_DRAGANDDROP, QT_NO_ACCESSIBILITY and
9QT_NO_SESSIONMANAGER, these has to be taken into account when compiling 9QT_NO_SESSIONMANAGER, these has to be taken into account when compiling
10QtWayland. 10QtWayland.
11--- 11---
12 src/client/qwaylandintegration.cpp | 21 ++++++++++++++++++--- 12 src/client/qwaylandintegration.cpp | 17 ++++++++++++++++-
13 src/client/qwaylandintegration_p.h | 12 ++++++++++++ 13 src/client/qwaylandintegration_p.h | 10 ++++++++--
14 2 files changed, 30 insertions(+), 3 deletions(-) 14 2 files changed, 24 insertions(+), 3 deletions(-)
15 15
16diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp 16diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
17index 39fff53..481e3d6 100644 17index df88a48..b9ce6fe 100644
18--- a/src/client/qwaylandintegration.cpp 18--- a/src/client/qwaylandintegration.cpp
19+++ b/src/client/qwaylandintegration.cpp 19+++ b/src/client/qwaylandintegration.cpp
20@@ -39,7 +39,9 @@ 20@@ -45,7 +45,9 @@
21 #include "qwaylandinputcontext_p.h" 21 #include "qwaylandinputcontext_p.h"
22 #include "qwaylandshmbackingstore_p.h" 22 #include "qwaylandshmbackingstore_p.h"
23 #include "qwaylandnativeinterface_p.h" 23 #include "qwaylandnativeinterface_p.h"
@@ -27,7 +27,7 @@ index 39fff53..481e3d6 100644
27 #include "qwaylanddnd_p.h" 27 #include "qwaylanddnd_p.h"
28 #include "qwaylandwindowmanagerintegration_p.h" 28 #include "qwaylandwindowmanagerintegration_p.h"
29 #include "qwaylandscreen_p.h" 29 #include "qwaylandscreen_p.h"
30@@ -57,7 +59,9 @@ 30@@ -63,7 +65,9 @@
31 #include <QSocketNotifier> 31 #include <QSocketNotifier>
32 32
33 #include <qpa/qplatforminputcontextfactory_p.h> 33 #include <qpa/qplatforminputcontextfactory_p.h>
@@ -37,16 +37,7 @@ index 39fff53..481e3d6 100644
37 #include <qpa/qplatforminputcontext.h> 37 #include <qpa/qplatforminputcontext.h>
38 38
39 #include "qwaylandhardwareintegration_p.h" 39 #include "qwaylandhardwareintegration_p.h"
40@@ -117,8 +121,6 @@ QWaylandIntegration::QWaylandIntegration() 40@@ -132,9 +136,12 @@ QWaylandIntegration::QWaylandIntegration()
41 , mNativeInterface(new QWaylandNativeInterface(this))
42 #ifndef QT_NO_ACCESSIBILITY
43 , mAccessibility(new QPlatformAccessibility())
44-#else
45- , mAccessibility(0)
46 #endif
47 , mClientBufferIntegrationInitialized(false)
48 , mServerBufferIntegrationInitialized(false)
49@@ -126,9 +128,12 @@ QWaylandIntegration::QWaylandIntegration()
50 { 41 {
51 initializeInputDeviceIntegration(); 42 initializeInputDeviceIntegration();
52 mDisplay = new QWaylandDisplay(this); 43 mDisplay = new QWaylandDisplay(this);
@@ -58,9 +49,9 @@ index 39fff53..481e3d6 100644
58- 49-
59+#endif 50+#endif
60 QString icStr = QPlatformInputContextFactory::requested(); 51 QString icStr = QPlatformInputContextFactory::requested();
61 icStr.isNull() ? mInputContext.reset(new QWaylandInputContext(mDisplay)) 52 if (!icStr.isNull()) {
62 : mInputContext.reset(QPlatformInputContextFactory::create(icStr)); 53 mInputContext.reset(QPlatformInputContextFactory::create(icStr));
63@@ -136,8 +141,12 @@ QWaylandIntegration::QWaylandIntegration() 54@@ -153,8 +160,12 @@ QWaylandIntegration::QWaylandIntegration()
64 55
65 QWaylandIntegration::~QWaylandIntegration() 56 QWaylandIntegration::~QWaylandIntegration()
66 { 57 {
@@ -73,7 +64,7 @@ index 39fff53..481e3d6 100644
73 #ifndef QT_NO_ACCESSIBILITY 64 #ifndef QT_NO_ACCESSIBILITY
74 delete mAccessibility; 65 delete mAccessibility;
75 #endif 66 #endif
76@@ -213,15 +222,19 @@ QPlatformFontDatabase *QWaylandIntegration::fontDatabase() const 67@@ -230,15 +241,19 @@ QPlatformFontDatabase *QWaylandIntegration::fontDatabase() const
77 return mFontDb; 68 return mFontDb;
78 } 69 }
79 70
@@ -93,47 +84,28 @@ index 39fff53..481e3d6 100644
93 84
94 QPlatformInputContext *QWaylandIntegration::inputContext() const 85 QPlatformInputContext *QWaylandIntegration::inputContext() const
95 { 86 {
96@@ -243,10 +256,12 @@ QVariant QWaylandIntegration::styleHint(StyleHint hint) const
97 return QPlatformIntegration::styleHint(hint);
98 }
99
100+#ifndef QT_NO_ACCESSIBILITY
101 QPlatformAccessibility *QWaylandIntegration::accessibility() const
102 {
103 return mAccessibility;
104 }
105+#endif
106
107 QPlatformServices *QWaylandIntegration::services() const
108 {
109diff --git a/src/client/qwaylandintegration_p.h b/src/client/qwaylandintegration_p.h 87diff --git a/src/client/qwaylandintegration_p.h b/src/client/qwaylandintegration_p.h
110index 987d805..b50ad95 100644 88index 9a49902..0d27f4e 100644
111--- a/src/client/qwaylandintegration_p.h 89--- a/src/client/qwaylandintegration_p.h
112+++ b/src/client/qwaylandintegration_p.h 90+++ b/src/client/qwaylandintegration_p.h
113@@ -80,15 +80,21 @@ public: 91@@ -85,11 +85,13 @@ public:
92 QPlatformFontDatabase *fontDatabase() const Q_DECL_OVERRIDE;
114 93
115 QPlatformNativeInterface *nativeInterface() const Q_DECL_OVERRIDE; 94 QPlatformNativeInterface *nativeInterface() const Q_DECL_OVERRIDE;
116 95-
117+#ifndef QT_NO_CLIPBOARD 96+#ifndef QT_NO_CLIPBOARD
118 QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE; 97 QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE;
119+#endif 98+#endif
120 99
121+#ifndef QT_NO_DRAGANDDROP 100+#ifndef QT_NO_DRAGANDDROP
122 QPlatformDrag *drag() const Q_DECL_OVERRIDE; 101 QPlatformDrag *drag() const Q_DECL_OVERRIDE;
102-
123+#endif 103+#endif
124
125 QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE; 104 QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE;
126 105
127 QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE; 106 QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE;
128 107@@ -126,8 +128,12 @@ private:
129+#ifndef QT_NO_ACCESSIBILITY 108 QWaylandShellIntegration *createShellIntegration(const QString& interfaceName);
130 QPlatformAccessibility *accessibility() const Q_DECL_OVERRIDE;
131+#endif
132
133 QPlatformServices *services() const Q_DECL_OVERRIDE;
134
135@@ -117,12 +123,18 @@ private:
136 void initializeInputDeviceIntegration();
137 109
138 QPlatformFontDatabase *mFontDb; 110 QPlatformFontDatabase *mFontDb;
139+#ifndef QT_NO_CLIPBOARD 111+#ifndef QT_NO_CLIPBOARD
@@ -145,12 +117,3 @@ index 987d805..b50ad95 100644
145 QWaylandDisplay *mDisplay; 117 QWaylandDisplay *mDisplay;
146 QPlatformNativeInterface *mNativeInterface; 118 QPlatformNativeInterface *mNativeInterface;
147 QScopedPointer<QPlatformInputContext> mInputContext; 119 QScopedPointer<QPlatformInputContext> mInputContext;
148+#ifndef QT_NO_ACCESSIBILITY
149 QPlatformAccessibility *mAccessibility;
150+#endif
151 bool mClientBufferIntegrationInitialized;
152 bool mServerBufferIntegrationInitialized;
153 bool mShellIntegrationInitialized;
154--
1552.7.4
156
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index e315924c..6ffc112d 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -49,4 +49,4 @@ SRC_URI += " \
49 file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch \ 49 file://0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch \
50" 50"
51 51
52SRCREV = "a172672484b9496819e588b51ac2ff9fb4a21941" 52SRCREV = "4b23163fb64a5a8d05320dd006962cf2bcefcd84"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index 45ac8141..2ed752f0 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -17,4 +17,4 @@ LIC_FILES_CHKSUM = " \
17 17
18DEPENDS += "qtdeclarative qtwebsockets" 18DEPENDS += "qtdeclarative qtwebsockets"
19 19
20SRCREV = "3836fd7d12777fc53836a72d6542d2fbf2f20ac9" 20SRCREV = "31eb0d8c7d78fe60dbad94091a56e97b4fcaa52b"
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index aedd1417..47124411 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -122,10 +122,10 @@ SRC_URI += " \
122 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ 122 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \
123" 123"
124 124
125SRCREV_qtwebengine = "dbf7dd27428ff755444eac5e975cb69802ac9771" 125SRCREV_qtwebengine = "9cc97f0c63049a8076476acc89c875c9e240abfb"
126# This is in git submodule, but we're using the latest in 49-based 126# This is in git submodule, but we're using the latest in 49-based
127# SRCREV_chromium = "c109a95a067af783e48f93d1cdeca870cda98878" 127# SRCREV_chromium = "c109a95a067af783e48f93d1cdeca870cda98878"
128SRCREV_chromium = "29c16917b33c26ad32893fa05af971c6c6f50297" 128SRCREV_chromium = "b3c79e92f0a631273b639af171e59f4c367ae02e"
129SRCREV = "${SRCREV_qtwebengine}" 129SRCREV = "${SRCREV_qtwebengine}"
130 130
131SRCREV_FORMAT = "qtwebengine_chromium" 131SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index 8c238db8..7e21256d 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -3,12 +3,12 @@ require qt5-git.inc
3 3
4LICENSE = "GFDL-1.3 & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)" 4LICENSE = "GFDL-1.3 & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
7 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
9 file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \ 9 file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \
10" 10"
11 11
12DEPENDS += "qtbase qtdeclarative" 12DEPENDS += "qtbase qtdeclarative"
13 13
14SRCREV = "8d17ddfc2f62df56ac067bd0f9736c6e8d37aa97" 14SRCREV = "60cede232aca96f3f6852c54c0d97cf1771fb371"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index 9a4d6d7d..ba81860c 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -3,14 +3,14 @@ require qt5-git.inc
3 3
4LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0" 4LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ 6 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
7 file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ 7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
8 file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ 8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
11 file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ 11 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
12" 12"
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRCREV = "bae8bfc7a811af2bf51b227cbf8467e50a2a149a" 16SRCREV = "d311bf931b60e91412bedd2751ad3a68095a7182"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index e4c3d7fd..755417f9 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -16,6 +16,6 @@ LIC_FILES_CHKSUM = " \
16 16
17DEPENDS += "qtbase" 17DEPENDS += "qtbase"
18 18
19SRCREV = "574d92a43e1fc5480a7f5f79cc6baf566a53349f" 19SRCREV = "89dbcc4f807015736a8ce3393b857735019d098d"
20 20
21BBCLASSEXTEND =+ "native nativesdk" 21BBCLASSEXTEND =+ "native nativesdk"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-25 22:42:16 +0000