summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2017-06-20 09:52:18 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2017-06-21 07:26:36 +0000
commit826c0b1092ede76f17de3b232ba7cc17a5be5830 (patch)
treeff53da5c83196fc417c7e58f573d2a86343004e9
parent044ba1621532deed80ef79a15f5b225d8b9471ec (diff)
downloadmeta-qt5-826c0b1092ede76f17de3b232ba7cc17a5be5830.tar.gz
qt5: update submodules
Using WebKit from commit before Tokarev's wip merge Change-Id: Ifd7606027698ad9500cd40529dfc179faa9e8e05 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/qtbase-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase/0001-Add-missing-forward-declarations.patch31
-rw-r--r--recipes-qt/qt5/qtbase_git.bb3
-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.bb7
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb2
-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/0001-Add-missing-includes-for-QColor.patch35
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb4
-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/qtvirtualkeyboard_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/0001-Remove-unused-check-for-private_tests.patch41
-rw-r--r--recipes-qt/qt5/qtwebkit_git.bb3
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb12
-rw-r--r--recipes-qt/qt5/qtx11extras_git.bb2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
32 files changed, 150 insertions, 50 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 5a6b7070..29a8438d 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 = "4480f47f7b0f81483b0cf3c8327eff12938ca018" 194SRCREV = "678ff94ff29db1b0faa4aa8d486d4df544ce3247"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 794ce1c5..2800def1 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 = "11a7585b75def904f7450eea50455ca6e8e9396f" 37SRCREV = "43c7f0bbdcc465d80aeb51328f9154ef1631c769"
38 38
39BBCLASSEXTEND += "native nativesdk" 39BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index de8a1e75..e3ef6d92 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 = "4480f47f7b0f81483b0cf3c8327eff12938ca018" 112SRCREV = "678ff94ff29db1b0faa4aa8d486d4df544ce3247"
diff --git a/recipes-qt/qt5/qtbase/0001-Add-missing-forward-declarations.patch b/recipes-qt/qt5/qtbase/0001-Add-missing-forward-declarations.patch
new file mode 100644
index 00000000..8f0f392c
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0001-Add-missing-forward-declarations.patch
@@ -0,0 +1,31 @@
1From a3ad110da2320174057671ec3b0df2447f0f728b Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Tue, 20 Jun 2017 13:45:20 +0300
4Subject: [PATCH] Add missing forward declarations
5
6fix build with -no-accessibility
7
8Change-Id: Ia58c11b22f08a51d5978e4a002480d265aa10fbd
9---
10 src/widgets/styles/qstylehelper_p.h | 4 ++++
11 1 file changed, 4 insertions(+)
12
13diff --git a/src/widgets/styles/qstylehelper_p.h b/src/widgets/styles/qstylehelper_p.h
14index 8ca2139..777ad95 100644
15--- a/src/widgets/styles/qstylehelper_p.h
16+++ b/src/widgets/styles/qstylehelper_p.h
17@@ -62,10 +62,14 @@
18
19 QT_BEGIN_NAMESPACE
20
21+class QColor;
22+class QObject;
23 class QPainter;
24+class QPalette;
25 class QPixmap;
26 class QStyleOptionSlider;
27 class QStyleOption;
28+class QWidget;
29 class QWindow;
30
31 namespace QStyleHelper
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index f130a0ac..62e62ad5 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -22,6 +22,7 @@ SRC_URI += "\
22 file://0005-configure-bump-path-length-from-256-to-512-character.patch \ 22 file://0005-configure-bump-path-length-from-256-to-512-character.patch \
23 file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \ 23 file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \
24 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ 24 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
25 file://0001-Add-missing-forward-declarations.patch \
25" 26"
26 27
27DEPENDS += "qtbase-native" 28DEPENDS += "qtbase-native"
@@ -182,4 +183,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
182 183
183RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 184RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
184 185
185SRCREV = "4480f47f7b0f81483b0cf3c8327eff12938ca018" 186SRCREV = "678ff94ff29db1b0faa4aa8d486d4df544ce3247"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
index 9dc7155d..137f0348 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 = "88573c72949b4540ee1456375c64f6262c94a472" 13SRCREV = "eb28146d3f2984a29a8917a36c1327e1d0becec7"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index 236d82e5..671ea5d0 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 = "826aa4dbfb31353d41fa7a6cdba28961c413b214" 11SRCREV = "81d0c42c7e4b781365556e1e8d1c8de1e592ae47"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 4a4b975d..b4e88e99 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 = "d5063285a8e6c01c4e4fc16fe76ed162b8e21e1d" 22SRCREV = "c961434d37eefa83e824ab3917480247a43045b8"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index ee565d94..7501f9b4 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 = "e7b022ec334ce6768c30402c1e17fe0a1e3a0bb0" 11SRCREV = "53fcf914e278ed4395a4873af2b64272c5d7882c"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index edff48dc..902ef91a 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 = "7ab6f0dda1cbe4ffd154226996482bc6b092690b" 35SRCREV = "55490690f81eba168b06a90e4a66cefc20b38252"
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 a6bf4470..d1568922 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 = "e5f9fbd342574bada201b5a96d8a2a68f2f37cf1" 17SRCREV = "d4c6ba6afe1d7a3165f1ac108fef6eb2b994175a"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 9196173f..b44821f7 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -4,14 +4,9 @@ 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
@@ -19,4 +14,4 @@ DEPENDS += "qtdeclarative"
19 14
20RDEPENDS_${PN}-dev = "" 15RDEPENDS_${PN}-dev = ""
21 16
22SRCREV = "d424a1d208f09431d62e1de391dfaa037742456c" 17SRCREV = "8ffe4cc5244f9d2dfa0f9444f2aa86c74dc593c8"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index 3b6a6e1b..6b9ebd38 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 = "175dcf6e565bd638601697bfa6becd3a3321a0de" 29SRCREV = "2b7fadfd9c0fc084588af2074f9731041632ec22"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 56e7fac0..aab68537 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -24,7 +24,7 @@ SRC_URI += " \
24 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ 24 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
25 " 25 "
26 26
27SRCREV_qtlocation = "22d980c8124026eb712f563326d5a5c1b180c671" 27SRCREV_qtlocation = "7bd7815f613c6f1ae0215d0b6a0ab5b7a6e72a59"
28SRCREV_qtlocation-mapboxgl = "edd127ee7658ceb7f5f2f740bce75db1cbf25c0e" 28SRCREV_qtlocation-mapboxgl = "9ecbe3642fb4a53b558598239b59bf1d0224c25b"
29 29
30SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" 30SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 8cd7aac0..ad0a7e11 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 = "badecdbc46df6ada383f1dfd006fa3dfff1706c6" 32SRCREV = "7fdb88a86b0782e7170eefe3dfe7ab3e9c81f847"
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb
index 28b92667..6f334bf9 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 = "c071b588ce2b4d474845d553aa83120747dc46da" 12SRCREV = "aa52bdacbff744c2bf20845f8c0a78aeb21d9878"
diff --git a/recipes-qt/qt5/qtquickcontrols2/0001-Add-missing-includes-for-QColor.patch b/recipes-qt/qt5/qtquickcontrols2/0001-Add-missing-includes-for-QColor.patch
new file mode 100644
index 00000000..b1b28f7e
--- /dev/null
+++ b/recipes-qt/qt5/qtquickcontrols2/0001-Add-missing-includes-for-QColor.patch
@@ -0,0 +1,35 @@
1From df04226fe0bc6d372e1c237527d0d0c9ea39bca4 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Tue, 20 Jun 2017 13:43:41 +0300
4Subject: [PATCH] Add missing includes for QColor
5
6Change-Id: I1bb5b4653bdc9d7b4fab61df99035715fa280fcd
7---
8 src/imports/controls/qquickdefaultbusyindicator_p.h | 1 +
9 src/imports/controls/qquickdefaultprogressbar_p.h | 1 +
10 2 files changed, 2 insertions(+)
11
12diff --git a/src/imports/controls/qquickdefaultbusyindicator_p.h b/src/imports/controls/qquickdefaultbusyindicator_p.h
13index e214020..f327c8d 100644
14--- a/src/imports/controls/qquickdefaultbusyindicator_p.h
15+++ b/src/imports/controls/qquickdefaultbusyindicator_p.h
16@@ -49,6 +49,7 @@
17 //
18
19 #include <QtQuick/qquickitem.h>
20+#include <QtGui/qcolor.h>
21
22 QT_BEGIN_NAMESPACE
23
24diff --git a/src/imports/controls/qquickdefaultprogressbar_p.h b/src/imports/controls/qquickdefaultprogressbar_p.h
25index dbdf5ad..91f8056 100644
26--- a/src/imports/controls/qquickdefaultprogressbar_p.h
27+++ b/src/imports/controls/qquickdefaultprogressbar_p.h
28@@ -49,6 +49,7 @@
29 //
30
31 #include <QtQuick/qquickitem.h>
32+#include <QtGui/qcolor.h>
33
34 QT_BEGIN_NAMESPACE
35
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index e54adc8b..aff91025 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -10,4 +10,6 @@ LIC_FILES_CHKSUM = " \
10 10
11DEPENDS += "qtdeclarative" 11DEPENDS += "qtdeclarative"
12 12
13SRCREV = "9bae6189fe8ad5d11bbec0b204b42cd71f4a375a" 13SRC_URI += "file://0001-Add-missing-includes-for-QColor.patch"
14
15SRCREV = "20d141034b48ae73eee70743dc410d35491cd00f"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 8aa5750c..8e127a6d 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 = "88bea4e52f6bd4570b0424a93b1d2e5ca96e6c11" 28SRCREV = "0ac21330b6cf5f95d733f16ff16614879000b588"
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index 0c58cede..452e6ccd 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 = "b490e1b782ac28a82d7902f926f6e041ede179ca" 13SRCREV = "5b89e61c39fb253dae46a8aa48d341a3fd37b4b4"
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 1405428d..d6c3ac26 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 = "9a1b163e1fdd99a838c082805c687205b766da25" 15SRCREV = "c0fe554f498025067edd78e75e3efb46868f8fe6"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 5e3c3cfd..c42be4b8 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 = "6ba3a215494a829e73e62f5bd73f5b769874267d" 14SRCREV = "e257664ae65ce5c51c7edac0a1a9ffaba4baea70"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index 9ec6d8d2..9eabd1b7 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 = "65dba188d51d6dc67a15483f26c6b94a21abf5bc" 18SRCREV = "55aa81e9acc736d162d3e4f775814ac91dbf1a80"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 6fe88e51..beab9315 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 = "1ef3d38562f686cf06b7a62be13cf9d3a23d0e41" 15SRCREV = "0781b64b56ea1116bf5bf214df782772c09f27ca"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index fa92f2f5..38c710f8 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 = "95c3d5e602c2053a3e0629ecadf1f99ffaa08eea" 52SRCREV = "7c770c6e510d6c2274fd10a10e6f812672e3a6d1"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index f353c547..ecd7f0d8 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 = "ed4be1f75314ddc004ea7c0d7c6af715252e4e5c" 15SRCREV = "2dd6a5e7ff769e54065ae8b9b532b2e56f2e3116"
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index a2647b5c..74e003b6 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 = "d4cb1d15ae8cf57b931b021490b0776cc70f0b32" 116SRCREV_qtwebengine = "fa19227c3ac7df7c0d2f8a548a9a36ac9a7b803c"
117SRCREV_chromium = "aa2fdd6be3d465280d2a0c3aacdc738bb4ffec05" 117SRCREV_chromium = "aa2fdd6be3d465280d2a0c3aacdc738bb4ffec05"
118SRCREV = "${SRCREV_qtwebengine}" 118SRCREV = "${SRCREV_qtwebengine}"
119 119
diff --git a/recipes-qt/qt5/qtwebkit/0001-Remove-unused-check-for-private_tests.patch b/recipes-qt/qt5/qtwebkit/0001-Remove-unused-check-for-private_tests.patch
new file mode 100644
index 00000000..0df47a4f
--- /dev/null
+++ b/recipes-qt/qt5/qtwebkit/0001-Remove-unused-check-for-private_tests.patch
@@ -0,0 +1,41 @@
1From 74ac5b0f3489f9a08d083b6c9607c9d5c2d4afd2 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <jkt@kde.org>
3Date: Wed, 14 Sep 2016 23:51:14 +0200
4Subject: [PATCH] Remove unused check for private_tests
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9It turns out that qt_developer_build is never used anyway.
10
11I did some git archeology and it looks like it was nuked when doing the
125.2 merge from upstream. The original purpose was apparently to control
13-Werror, which is nowadays controlled by CONFIG -= production_build.
14
15This actually fixes the build, as the QT_FOR_CONFIG += core-private which
16would have been required for qtConfig(private_tests) is missing.
17
18Task-number: QTBUG-55950
19Change-Id: Iaaaad184b29b523ce4a4ed8afec2ac527d8f93e3
20Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
21Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
22Reviewed-by: Jan Kundrát <jkt@kde.org>
23---
24 Tools/qmake/mkspecs/features/default_pre.prf | 4 ----
25 1 file changed, 4 deletions(-)
26
27diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf
28index 568e80a..5c36e93 100644
29--- a/Tools/qmake/mkspecs/features/default_pre.prf
30+++ b/Tools/qmake/mkspecs/features/default_pre.prf
31@@ -62,10 +62,6 @@ win32-msvc*: MAKEFILE_NOOP_COMMAND = @echo >NUL
32 scratchbox: PYTHON = python2.6
33 else: PYTHON = python
34
35-# We use private_tests to detect developer build, since the destdir will
36-# always be our webkit build dir. This might change as configure changes.
37-qtConfig(private_tests): CONFIG += qt_developer_build
38-
39 # By default we enable "production build", and build-webkit, which is
40 # used by bots and developers, will disable it, to enable warnings etc.
41 CONFIG += production_build
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 6472ab92..0446bef9 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -21,6 +21,7 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
21SRC_URI += "\ 21SRC_URI += "\
22 file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \ 22 file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \
23 file://0003-Exclude-backtrace-API-for-non-glibc-libraries.patch \ 23 file://0003-Exclude-backtrace-API-for-non-glibc-libraries.patch \
24 file://0001-Remove-unused-check-for-private_tests.patch \
24" 25"
25 26
26PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel \ 27PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel \
@@ -85,4 +86,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') }" 86RUBY_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}" 87export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
87 88
88SRCREV = "0a3506ebe5d7f431f0dd4dffa24ac32063b90ff1" 89SRCREV = "7e104c57a70fdf551bb3d22a5d637cdcbc69dbea"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index f39fb46f..fa775946 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 = "e5133f4f0bb7c01d7bd7fc499d8c148c03a5b500" 14SRCREV = "26e56e18eb234df4a782737cd3c8d8d11daead2c"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index fe0f57e0..620e0430 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 = "de4c1f09a00884a959bf7f53d38c204d14064c21" 16SRCREV = "915ee2598030b799aeb67908bae49a70b4079e37"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index e60f3997..af70b9f4 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 = "a5984f0a63233e0e9608ce8ab66e6d2d0e6948e3" 19SRCREV = "c9a4897aa09d723d22b842b1fabcc296bf3c7f91"
20 20
21BBCLASSEXTEND =+ "native nativesdk" 21BBCLASSEXTEND =+ "native nativesdk"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-06 10:09:41 +0000