summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2017-06-09 10:01:06 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2017-06-12 11:50:06 +0000
commitf54f8401b268cb50d2f270e2da88d07c1c5e4148 (patch)
tree0442cf234fa749eaa7923dda8b4ba080991f93f4
parent90174b9167016ecf3be653f132ca836bfb349e39 (diff)
downloadmeta-qt5-f54f8401b268cb50d2f270e2da88d07c1c5e4148.tar.gz
qt5: update submodules
Latest Qt 5.9.1 Change-Id: I109b3bdd6d5a54b9bb3b1b4d86553260b7028434 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qt3d_git.bb2
-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/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch49
-rw-r--r--recipes-qt/qt5/qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtcanvas3d_git.bb2
-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_git.bb2
-rw-r--r--recipes-qt/qt5/qtgamepad_git.bb2
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb9
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb2
-rw-r--r--recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch8
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb4
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtnetworkauth_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb4
-rw-r--r--recipes-qt/qt5/qtremoteobjects_git.bb2
-rw-r--r--recipes-qt/qt5/qtscript_git.bb2
-rw-r--r--recipes-qt/qt5/qtscxml_git.bb2
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb11
-rw-r--r--recipes-qt/qt5/qtserialbus_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialport_git.bb2
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb2
-rw-r--r--recipes-qt/qt5/qttools_git.bb2
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb9
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb2
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb7
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebkit-examples_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebkit_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb12
-rw-r--r--recipes-qt/qt5/qtwebview_git.bb2
-rw-r--r--recipes-qt/qt5/qtx11extras_git.bb2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
39 files changed, 74 insertions, 99 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index fac5791f..a96d3f60 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -191,4 +191,4 @@ fakeroot do_generate_qt_environment_file() {
191 191
192addtask generate_qt_environment_file after do_install before do_package 192addtask generate_qt_environment_file after do_install before do_package
193 193
194SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b" 194SRCREV = "5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index f0f960af..f5164f22 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -34,6 +34,6 @@ do_configure_prepend() {
34 ${S}/src/quick3d/imports/input/importsinput.pro 34 ${S}/src/quick3d/imports/input/importsinput.pro
35} 35}
36 36
37SRCREV = "f39d0a0c32cc489849a0cd5c2880f6e824223485" 37SRCREV = "ab0a43e9efba3da95da2ebc7662a1437d5e3a899"
38 38
39BBCLASSEXTEND += "native nativesdk" 39BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index b7fee9c9..2ffe72a6 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.9.0+git${SRCPV}" 15PV = "5.9.1+git${SRCPV}"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 66b43e05..309672f6 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -109,4 +109,4 @@ do_install() {
109 install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} 109 install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS}
110} 110}
111 111
112SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b" 112SRCREV = "5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5"
diff --git a/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch b/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch
index e72601ca..9c5f8fef 100644
--- a/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch
+++ b/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch
@@ -1,4 +1,4 @@
1From 86ae0ce931edbe0ac30cfe5f94f681f1d055fdb0 Mon Sep 17 00:00:00 2001 1From 9bd7ad277698be81db2af1a86d5b4efad5818203 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: Mon, 6 Mar 2017 11:50:38 +0100 3Date: Mon, 6 Mar 2017 11:50:38 +0100
4Subject: [PATCH] qdbuscpp2xml.pro: do not build with bootstrapped 4Subject: [PATCH] qdbuscpp2xml.pro: do not build with bootstrapped
@@ -9,15 +9,16 @@ Content-Transfer-Encoding: 8bit
9 9
10Upstream-Status: Pending 10Upstream-Status: Pending
11 11
12Change-Id: I14e9b9a2bb4aca08d408c8aa76a2c58b54e74e7d
12Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> 13Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
13--- 14---
14 src/src.pro | 9 ++------- 15 src/src.pro | 9 ++-------
15 src/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 3 +-- 16 src/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 1 +
16 src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 5 +---- 17 src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 1 +
17 3 files changed, 4 insertions(+), 13 deletions(-) 18 3 files changed, 4 insertions(+), 7 deletions(-)
18 19
19diff --git a/src/src.pro b/src/src.pro 20diff --git a/src/src.pro b/src/src.pro
20index 90d7e2b..0aaf604 100644 21index a2064b1..d6f05e0 100644
21--- a/src/src.pro 22--- a/src/src.pro
22+++ b/src/src.pro 23+++ b/src/src.pro
23@@ -4,9 +4,6 @@ QT_FOR_CONFIG += gui-private 24@@ -4,9 +4,6 @@ QT_FOR_CONFIG += gui-private
@@ -30,7 +31,7 @@ index 90d7e2b..0aaf604 100644
30 src_qtzlib.file = $$PWD/corelib/qtzlib.pro 31 src_qtzlib.file = $$PWD/corelib/qtzlib.pro
31 src_qtzlib.target = sub-zlib 32 src_qtzlib.target = sub-zlib
32 33
33@@ -37,13 +34,11 @@ src_tools_bootstrap_dbus.depends = src_tools_bootstrap 34@@ -41,13 +38,11 @@ src_tools_bootstrap_dbus.depends = src_tools_bootstrap
34 35
35 src_tools_qdbusxml2cpp.subdir = tools/qdbusxml2cpp 36 src_tools_qdbusxml2cpp.subdir = tools/qdbusxml2cpp
36 src_tools_qdbusxml2cpp.target = sub-qdbusxml2cpp 37 src_tools_qdbusxml2cpp.target = sub-qdbusxml2cpp
@@ -44,36 +45,28 @@ index 90d7e2b..0aaf604 100644
44-else: src_tools_qdbuscpp2xml.depends = src_dbus 45-else: src_tools_qdbuscpp2xml.depends = src_dbus
45+src_tools_qdbuscpp2xml.depends = src_dbus 46+src_tools_qdbuscpp2xml.depends = src_dbus
46 47
47 src_winmain.subdir = $$PWD/winmain 48 src_tools_qvkgen.subdir = tools/qvkgen
48 src_winmain.target = sub-winmain 49 src_tools_qvkgen.target = sub-qvkgen
49diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro 50diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
50index 5ac3159..74c507c 100644 51index 5ac3159..65de97e 100644
51--- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro 52--- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
52+++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro 53+++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
53@@ -1,7 +1,6 @@ 54@@ -1,5 +1,6 @@
54 option(host_build) 55 option(host_build)
55 QT = core-private 56 QT = core-private
56-force_bootstrap: QT += bootstrap_dbus-private 57+CONFIG -= force_bootstrap
57-else: QT += dbus-private 58 force_bootstrap: QT += bootstrap_dbus-private
58+QT += dbus-private 59 else: QT += dbus-private
59 DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH 60 DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH
60 QMAKE_CXXFLAGS += $$QT_HOST_CFLAGS_DBUS
61
62diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro 61diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
63index d9ee5de..e891103 100644 62index 95fcbcb..d1ebdde 100644
64--- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro 63--- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
65+++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro 64+++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
66@@ -1,9 +1,6 @@ 65@@ -5,6 +5,7 @@ option(host_build)
67 option(host_build) 66 CONFIG += force_bootstrap
68-!force_bootstrap:!qtConfig(commandlineparser): \ 67 }
69- CONFIG += force_bootstrap
70 QT = core-private 68 QT = core-private
71-force_bootstrap: QT += bootstrap_dbus-private 69+CONFIG -= force_bootstrap
72-else: QT += dbus-private 70 force_bootstrap: QT += bootstrap_dbus-private
73+QT += dbus-private 71 else: QT += dbus-private
74 DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH 72 DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH
75 QMAKE_CXXFLAGS += $$QT_HOST_CFLAGS_DBUS
76
77--
782.9.3
79
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 09d6cec6..4cc5f99c 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -182,4 +182,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
182 182
183RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 183RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
184 184
185SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b" 185SRCREV = "5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
index b2a07247..f1605416 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 = "116737dc8fa244282dda95a8f13624b66fdb5521" 13SRCREV = "dba1f553c04b28997dbb03a8d341d6b4305c234b"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index 6b895aaa..ea109485 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 = "de7f741c428febfe3c81a28f955996d2314953fc" 11SRCREV = "030f3d03545ed56730ea005f312fc63d04c41b29"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 0d13dc40..bc7c2e18 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}"
19 19
20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 20EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
21 21
22SRCREV = "8dcbf68e4579e03ea6d2808ac0c670169b59d0df" 22SRCREV = "e5ed5619e6a5ca79474bf922743b6f56bd8058ab"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index 0cbd04e6..ff76d656 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 = "84490ff75be5acdaeb3fd93900e4ebf7ba8f539b" 11SRCREV = "9546547495582628ba815a7d99e621d11ca84fa1"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index a578a065..94a09778 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -32,6 +32,6 @@ do_install_append_class-nativesdk() {
32 32
33EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 33EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
34 34
35SRCREV = "96f6ba5f562073f508cd8569ac354592fdd48f4a" 35SRCREV = "d8f84e5769632544dfac5138348481330c4da4cd"
36 36
37BBCLASSEXTEND =+ "native nativesdk" 37BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb
index 94f04a49..b4735443 100644
--- a/recipes-qt/qt5/qtgamepad_git.bb
+++ b/recipes-qt/qt5/qtgamepad_git.bb
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
14 14
15EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 15EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
16 16
17SRCREV = "ef8850fee38e2552d535379a8477c9abebdf8bb4" 17SRCREV = "fcffc32b64ea1d01503dafd8e16613d009c8ad34"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index d98d77e9..57600495 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -4,19 +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.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
8 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
9 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 7 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ 8 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ 9 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
12 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
13 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
14 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
15 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
16" 11"
17 12
18DEPENDS += "qtdeclarative" 13DEPENDS += "qtdeclarative"
19 14
20RDEPENDS_${PN}-dev = "" 15SRCREV = "57b9063e167a02d653507b78c2c079264bf1acaf"
21
22SRCREV = "db93af5b2bb49af74fbad6c9cd80bd7010434e78"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index 4dd64df2..0e5a5258 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -26,4 +26,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
26 26
27EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 27EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
28 28
29SRCREV = "71ccf0dff82835ce7b5aed74c37829afdef44cde" 29SRCREV = "c1645fee237213074c5b3b53c21e8d9cd3a21167"
diff --git a/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch b/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch
index 49fcff6b..5e452c03 100644
--- a/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch
+++ b/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch
@@ -1,4 +1,4 @@
1From f7c76b91e726a0e63e5226eb6e89b13e0c3509b7 Mon Sep 17 00:00:00 2001 1From 632cfa131a890d42275873a7ca8cdf95ada61360 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 7 Jun 2017 13:29:29 +0300 3Date: Wed, 7 Jun 2017 13:29:29 +0300
4Subject: [PATCH] Make mapbox-gl build configurable 4Subject: [PATCH] Make mapbox-gl build configurable
@@ -13,15 +13,15 @@ Change-Id: I5f26200f2735b363c3c322f9035b331b9159c47b
13 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
14 14
15diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro 15diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro
16index 0810d39..03fc119 100644 16index 459897a..d97e05d 100644
17--- a/src/plugins/geoservices/geoservices.pro 17--- a/src/plugins/geoservices/geoservices.pro
18+++ b/src/plugins/geoservices/geoservices.pro 18+++ b/src/plugins/geoservices/geoservices.pro
19@@ -6,7 +6,7 @@ qtConfig(concurrent) { 19@@ -6,7 +6,7 @@ qtConfig(concurrent) {
20 SUBDIRS += osm 20 SUBDIRS += osm
21 } 21 }
22 22
23-qtConfig(c++14):!win32|mingw:!qnx { 23-qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx {
24+mapboxgl:qtConfig(c++14):!win32|mingw:!qnx { 24+mapboxgl:qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx {
25 !exists(../../3rdparty/mapbox-gl-native/CMakeLists.txt) { 25 !exists(../../3rdparty/mapbox-gl-native/CMakeLists.txt) {
26 warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.") 26 warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.")
27 } else { 27 } else {
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index ea24fe44..d058f43b 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -28,7 +28,7 @@ SRC_URI += " \
28 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ 28 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
29 " 29 "
30 30
31SRCREV_qtlocation = "888d351cb0c7fe6d05ab1efe8d4dbb4b6f06cd5f" 31SRCREV_qtlocation = "d89701c5c8646dedb0ebb2e011c4da796a6ae8a1"
32SRCREV_qtlocation-mapboxgl = "d45c177e8a23eefcc94930af9fa085e61136bb94" 32SRCREV_qtlocation-mapboxgl = "9ecbe3642fb4a53b558598239b59bf1d0224c25b"
33 33
34SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" 34SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index c1ae7862..d242733b 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -29,4 +29,4 @@ SRC_URI += "\
29 file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ 29 file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \
30" 30"
31 31
32SRCREV = "559c305ded730e23505e8b29536a98dc59e2acfa" 32SRCREV = "a6cc1af0546ab10701c10475315139ebb50ad1e5"
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb
index eb5e4f61..c161e41b 100644
--- a/recipes-qt/qt5/qtnetworkauth_git.bb
+++ b/recipes-qt/qt5/qtnetworkauth_git.bb
@@ -9,4 +9,4 @@ require qt5-git.inc
9 9
10DEPENDS += "qtbase" 10DEPENDS += "qtbase"
11 11
12SRCREV = "86c5036848ad004208803d9d497cfcd08c9623d6" 12SRCREV = "9c170ef9431f8ceec8d9c474de9d75d8dedaa3b9"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index a84cfb32..422f8216 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS += "qtdeclarative" 11DEPENDS += "qtdeclarative"
12 12
13SRCREV = "ef6b8d3081f0bf93d6d59e67c8e3f82c63c511c3" 13SRCREV = "6b23b6b4507b42a96fb3fb7d2315523f54ce1ac0"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 83ed908d..fa7e5851 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -15,8 +15,6 @@ LIC_FILES_CHKSUM = " \
15 15
16DEPENDS += "qtdeclarative" 16DEPENDS += "qtdeclarative"
17 17
18RDEPENDS_${PN}-dev = ""
19
20FILES_${PN}-qmlplugins += " \ 18FILES_${PN}-qmlplugins += " \
21 ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Shaders \ 19 ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Shaders \
22 ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ 20 ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
@@ -26,4 +24,4 @@ SRC_URI += " \
26 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ 24 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \
27" 25"
28 26
29SRCREV = "dacb91916b202208681471ba764504c7c7d086f0" 27SRCREV = "ae688459bc845ab919ce256f315843d97ba9ff32"
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb
index f563818d..c5ffd261 100644
--- a/recipes-qt/qt5/qtremoteobjects_git.bb
+++ b/recipes-qt/qt5/qtremoteobjects_git.bb
@@ -22,6 +22,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
22 22
23EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 23EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
24 24
25SRCREV = "ae0b101884b05355e3a7bc06dbca722ad3d08d0f" 25SRCREV = "68f876f17b21ec0c95d1e487238f264b5a568c65"
26 26
27BBCLASSEXTEND += "native nativesdk" 27BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index ae5e0da4..8423b583 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 = "e00ca9b6bec2adf78fd14e02376ecf1b55a93b0c" 28SRCREV = "ab816ddbfeca2ff6dadca0a31de168f1a5a3f7f4"
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index c2c00e1b..e82abfc5 100644
--- a/recipes-qt/qt5/qtscxml_git.bb
+++ b/recipes-qt/qt5/qtscxml_git.bb
@@ -10,7 +10,7 @@ require qt5-git.inc
10 10
11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" 11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
12 12
13SRCREV = "eff82ac957e051f16f64c287f2dfaec9049bdfc1" 13SRCREV = "27c4c643bae356d5bbdb58e44ec4b7932f277886"
14 14
15SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch" 15SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch"
16 16
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 17d06394..9abc6173 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -3,14 +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=4bfd28363f541b10d9f024181b8df516 \ 6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ 7 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ 8 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ 9 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
11 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
12" 11"
13 12
14DEPENDS += "qtbase qtdeclarative" 13DEPENDS += "qtbase qtdeclarative"
15 14
16SRCREV = "0c3c4d01ea34ed98a0d2928662f07b673f00535d" 15SRCREV = "2ff8f06e71d5eeb40cbdebc104c00073a3c2871a"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 93a826bd..ba100add 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 = "20811e3b004af817e3f02982c755e8b1560b8c3d" 14SRCREV = "8cec9f474af2cf654828b5d47b166da7d3c36574"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index 957000c4..bd92de9b 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 = "687f5a9bd44a45a29d24925f29470c43d6729dee" 18SRCREV = "a7594fd4e883a33faffb8340d73547f882eccb29"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index fb8d44e1..d3645030 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase" 13DEPENDS += "qtbase"
14 14
15SRCREV = "4fd787e90c70afbaa168abb3efdb8757ba77f3a4" 15SRCREV = "c0f586c374d6efbac2b3a25a1cb37924c70286db"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 9ca90a2c..f13b7bbd 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -27,7 +27,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
27 27
28EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" 28EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
29 29
30SRCREV = "88e02bb0a9b97d68a4b270e4ddfb6d0847c702a9" 30SRCREV = "80c135154c1e78c7af7d6d54129e009bc6015c33"
31 31
32BBCLASSEXTEND = "native nativesdk" 32BBCLASSEXTEND = "native nativesdk"
33 33
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 822517f6..34df6428 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -1,12 +1,9 @@
1require qt5.inc 1require qt5.inc
2require qt5-git.inc 2require 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 = "GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ 6 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
10" 7"
11 8
12DEPENDS += "qtbase qttools-native" 9DEPENDS += "qtbase qttools-native"
@@ -114,4 +111,4 @@ FILES_${PN}-qt = " \
114 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ 111 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \
115" 112"
116 113
117SRCREV = "3e727a890f7856978469ee38ef0619b1b59a8ca7" 114SRCREV = "ad5a9af215e2b1276893490c7fe92de39cc25005"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index 6d45a508..82f31248 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -49,4 +49,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
49 49
50DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" 50DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns"
51 51
52SRCREV = "bdf61afe76e94ef03da1332c4540646f18f5852f" 52SRCREV = "2102196073a045d354e1ff5ea0e00ee4923b948d"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 26ef8532..09150909 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -37,7 +37,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature
37 37
38EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" 38EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
39 39
40SRCREV = "f1cf62fa8e9ffa2548c9968906848596f50dbc0b" 40SRCREV = "4934b87156a889584a34e36c22abd9aee64cef7e"
41 41
42# From https://bugreports.qt.io/browse/QTBUG-57767 42# From https://bugreports.qt.io/browse/QTBUG-57767
43SRC_URI += " \ 43SRC_URI += " \
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index f1167a9e..a7d39e95 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -4,17 +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.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
8 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
9 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 7 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
10 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ 8 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
11 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ 9 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
12 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
13 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
14 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
15 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
16" 11"
17 12
18DEPENDS += "qtdeclarative qtwebsockets" 13DEPENDS += "qtdeclarative qtwebsockets"
19 14
20SRCREV = "6383f0fc5eec4935697a6d2d2f87b511bbeb678e" 15SRCREV = "f6b06b37fffdb35c8dd8a9b9cfd0177daae473be"
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 26d2e28d..60f48d99 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -113,7 +113,7 @@ SRC_URI += " \
113 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ 113 file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \
114" 114"
115 115
116SRCREV_qtwebengine = "73f7be5b2a95eab3dce11caede538eeb7beb71f2" 116SRCREV_qtwebengine = "1906d4df2146319dcdd5ef71ee26aa0a8ff6fb61"
117SRCREV_chromium = "aa2fdd6be3d465280d2a0c3aacdc738bb4ffec05" 117SRCREV_chromium = "aa2fdd6be3d465280d2a0c3aacdc738bb4ffec05"
118SRCREV = "${SRCREV_qtwebengine}" 118SRCREV = "${SRCREV_qtwebengine}"
119 119
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb
index 286aecae..460ff0c7 100644
--- a/recipes-qt/qt5/qtwebkit-examples_git.bb
+++ b/recipes-qt/qt5/qtwebkit-examples_git.bb
@@ -17,4 +17,4 @@ DEPENDS += "qtwebkit qtxmlpatterns"
17RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" 17RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
18RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" 18RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"
19 19
20SRCREV = "822426abc77a74752b0ee0da4d0a1c106c4dac22" 20SRCREV = "f544b2eec0c18b7674ac4df629ae98e8cacce5c7"
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 722af85e..86460595 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -85,4 +85,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db
85RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" 85RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
86export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" 86export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
87 87
88SRCREV = "f27089657a207ef8c5c9d27d661d3d12c3af8df2" 88SRCREV = "821eaaadc9d63d03aca65cf757230b520daaaa7c"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index 41ec27f6..d85a6690 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -1,14 +1,14 @@
1require qt5.inc 1require qt5.inc
2require qt5-git.inc 2require 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 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ 6 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ 7 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ 8 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
9 file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \ 9 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
10" 10"
11 11
12DEPENDS += "qtbase qtdeclarative" 12DEPENDS += "qtbase qtdeclarative"
13 13
14SRCREV = "1421c3e4ae4213ca18f2f51d5ddb38e223450222" 14SRCREV = "8bac2e667f56efc552228ed61c4ccbc3e9efa721"
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index 2229cb10..cdf465d6 100644
--- a/recipes-qt/qt5/qtwebview_git.bb
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -13,4 +13,4 @@ SRC_URI += "file://0001-Add-missing-include-for-qWarning.patch"
13 13
14DEPENDS += "qtbase qtwebengine" 14DEPENDS += "qtbase qtwebengine"
15 15
16SRCREV = "6e55abf3b6a5f373cd4b649c2318a45c49b40589" 16SRCREV = "22e7f1941fbbb7aa7212faabf5939b6d2ca7bd49"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index bf03e9bb..98df01b7 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 = "9e83ff8713c1a3f69ce514bf3e31335194668da7" 16SRCREV = "59efd8f79abd30a71e3bb81070cae2af2eede842"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 85563862..552549d0 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 = "c1c3af0ae456247c9bcd30161d51a94c9b38dc52" 19SRCREV = "7aad4fb7bcd219badbc19b393b6d0aa6192ac8fe"
20 20
21BBCLASSEXTEND =+ "native nativesdk" 21BBCLASSEXTEND =+ "native nativesdk"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-06 05:11:31 +0000