summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
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.inc4
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb3
-rw-r--r--recipes-qt/qt5/qtbase/0001-Disable-unnamed-tmp-files.patch29
-rw-r--r--recipes-qt/qt5/qtbase/0009-Always-build-uic.patch10
-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/0001-QQmlTypeLoader-The-profiler-is-a-quintptr-0-if-QT_NO.patch32
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb4
-rw-r--r--recipes-qt/qt5/qtgamepad_git.bb2
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb2
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb2
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb2
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtnetworkauth_git.bb2
-rw-r--r--recipes-qt/qt5/qtquick1_git.bb1
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb2
-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.bb2
-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.bb2
-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.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-Build-accessibility-tests-only-when-Qt-is-configured.patch41
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch97
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-chromium-workaround-for-too-long-.rps-file-name.patch42
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb7
-rw-r--r--recipes-qt/qt5/qtwebkit-examples_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.bb2
-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
45 files changed, 194 insertions, 184 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 0f1376fa..f3402edb 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -197,4 +197,4 @@ fakeroot do_generate_qt_environment_file() {
197 197
198addtask generate_qt_environment_file after do_install before do_package 198addtask generate_qt_environment_file after do_install before do_package
199 199
200SRCREV = "ec16ba393baf504d4b192cc349775c62d3c96aa0" 200SRCREV = "f27e029ef2e8400b803cec1b17ffd4e244d8610a"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 6f8ab717..9c1da93e 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -37,6 +37,6 @@ do_configure_prepend() {
37 ${S}/src/quick3d/imports/input/importsinput.pro 37 ${S}/src/quick3d/imports/input/importsinput.pro
38} 38}
39 39
40SRCREV = "143b721249af92fc27f48fb01914195516f7a087" 40SRCREV = "3f03499bf8a7cf3c3f8d19a020179c1205980bde"
41 41
42BBCLASSEXTEND += "native nativesdk" 42BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index a6530114..a613d1e1 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -2,7 +2,7 @@
2# Copyright (C) 2013-2017 Martin Jansa <martin.jansa@gmail.com> 2# Copyright (C) 2013-2017 Martin Jansa <martin.jansa@gmail.com>
3 3
4QT_MODULE ?= "${BPN}" 4QT_MODULE ?= "${BPN}"
5QT_MODULE_BRANCH ?= "5.9" 5QT_MODULE_BRANCH ?= "5.10"
6QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" 6QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
7 7
8# each module needs to define valid SRCREV 8# each module needs to define valid SRCREV
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
17PV = "5.9.3+git${SRCPV}" 17PV = "5.10.0+git${SRCPV}"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 5a37a9e4..b0435ba9 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -37,6 +37,7 @@ SRC_URI += "\
37# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native 37# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native
38# 5.9.meta-qt5-native.2 38# 5.9.meta-qt5-native.2
39SRC_URI += " \ 39SRC_URI += " \
40 file://0001-Disable-unnamed-tmp-files.patch \
40 file://0009-Always-build-uic.patch \ 41 file://0009-Always-build-uic.patch \
41" 42"
42 43
@@ -114,4 +115,4 @@ do_install() {
114 install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} 115 install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS}
115} 116}
116 117
117SRCREV = "ec16ba393baf504d4b192cc349775c62d3c96aa0" 118SRCREV = "f27e029ef2e8400b803cec1b17ffd4e244d8610a"
diff --git a/recipes-qt/qt5/qtbase/0001-Disable-unnamed-tmp-files.patch b/recipes-qt/qt5/qtbase/0001-Disable-unnamed-tmp-files.patch
new file mode 100644
index 00000000..098e2fa7
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0001-Disable-unnamed-tmp-files.patch
@@ -0,0 +1,29 @@
1From 853fc888f38d6ad0e189ba54ef648abe0ff5bb60 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Mon, 28 Aug 2017 15:36:17 +0300
4Subject: [PATCH] Disable unnamed tmp files
5
6qmake does not work together with pseudo when unnamed temporary files
7(O_TMPFILE) are used.
8
9Upstream-Status: Inappropriate [OE specific]
10[YOCTO #11996]
11Change-Id: I9be92312c3e9a80438c1dc01344cb1ad721ad466
12Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
13---
14 src/corelib/io/qtemporaryfile_p.h | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/src/corelib/io/qtemporaryfile_p.h b/src/corelib/io/qtemporaryfile_p.h
18index 46a0d7a..3b418c9 100644
19--- a/src/corelib/io/qtemporaryfile_p.h
20+++ b/src/corelib/io/qtemporaryfile_p.h
21@@ -58,7 +58,7 @@
22 #include "private/qfile_p.h"
23 #include "qtemporaryfile.h"
24
25-#ifdef Q_OS_LINUX
26+#if 0
27 # include <fcntl.h>
28 # ifdef O_TMPFILE
29 // some early libc support had the wrong values for O_TMPFILE
diff --git a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
index 2a1d534b..8ca2c8c4 100644
--- a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
+++ b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
@@ -1,7 +1,7 @@
1From bf173918731c626b6c8b84eb826c921e5c6d44f5 Mon Sep 17 00:00:00 2001 1From b63b2819b88ef252a078e7ef595f7f370ec0c050 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 16 Nov 2013 00:32:30 +0100 3Date: Sat, 16 Nov 2013 00:32:30 +0100
4Subject: [PATCH] Always build uic 4Subject: [PATCH] Always build uic and qvkgen
5 5
6Even if we are not building gui or widgets. This tool is needed later 6Even if we are not building gui or widgets. This tool is needed later
7as a native tool when compiling the target. 7as a native tool when compiling the target.
@@ -14,15 +14,15 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/src/src.pro b/src/src.pro 16diff --git a/src/src.pro b/src/src.pro
17index 43fc06f2e5..1e9d4dcc0d 100644 17index a2064b1..9fae335 100644
18--- a/src/src.pro 18--- a/src/src.pro
19+++ b/src/src.pro 19+++ b/src/src.pro
20@@ -203,7 +203,7 @@ qtConfig(gui) { 20@@ -211,7 +211,7 @@ qtConfig(gui) {
21 } 21 }
22 } 22 }
23 } 23 }
24-SUBDIRS += src_plugins 24-SUBDIRS += src_plugins
25+SUBDIRS += src_plugins src_tools_uic 25+SUBDIRS += src_plugins src_tools_uic src_tools_qvkgen
26 26
27 nacl: SUBDIRS -= src_network src_testlib 27 nacl: SUBDIRS -= src_network src_testlib
28 28
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 3ae2dfc1..6aa8c160 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -222,4 +222,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
222 222
223RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" 223RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
224 224
225SRCREV = "ec16ba393baf504d4b192cc349775c62d3c96aa0" 225SRCREV = "f27e029ef2e8400b803cec1b17ffd4e244d8610a"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
index 17479e2f..55104c4c 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 = "a1aee8ecbefb74cd5eae380ced56bb43ff3cc40b" 13SRCREV = "3b24ef25fa328bf993891e242c0c3ff677fafbcb"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index da6e999f..e575bc6c 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 = "e3af14e9169207e0e73f7e50191106895c29ddc4" 11SRCREV = "cd8716678cf0cf2c9678edf4531a76cc00c7f828"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index ca9866f1..5099c444 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 = "6b3bdb84406b42b50bdf5a39ee9ca2fabd3e6d2f" 22SRCREV = "18af3226765b62312acc8f801cc531fde0d9822b"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index 7c8eda76..d27f5a1b 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 = "8329a8fb287094012989b965604ff9c9426f022a" 11SRCREV = "6300ff26ae43683a6ab701fcf031be2ff45b30f0"
diff --git a/recipes-qt/qt5/qtdeclarative/0001-QQmlTypeLoader-The-profiler-is-a-quintptr-0-if-QT_NO.patch b/recipes-qt/qt5/qtdeclarative/0001-QQmlTypeLoader-The-profiler-is-a-quintptr-0-if-QT_NO.patch
new file mode 100644
index 00000000..92a63a3c
--- /dev/null
+++ b/recipes-qt/qt5/qtdeclarative/0001-QQmlTypeLoader-The-profiler-is-a-quintptr-0-if-QT_NO.patch
@@ -0,0 +1,32 @@
1From 330e96565b37e227162ab7ec6d4c6f3f56d2a1fe Mon Sep 17 00:00:00 2001
2From: Ulf Hermann <ulf.hermann@qt.io>
3Date: Mon, 25 Sep 2017 11:55:20 +0200
4Subject: [PATCH] QQmlTypeLoader: The profiler is a quintptr(0) if
5 QT_NO_QML_DEBUGGING
6
7This follows the pattern established in other places.
8
9Task-number: QTBUG-63392
10Change-Id: I11cd66d5552f751804dd0a9460b26bda546c1726
11Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
12Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
13Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
14---
15 src/qml/qml/qqmltypeloader_p.h | 4 ++--
16 1 file changed, 2 insertions(+), 2 deletions(-)
17
18diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h
19index c214f0c..abc0df9 100644
20--- a/src/qml/qml/qqmltypeloader_p.h
21+++ b/src/qml/qml/qqmltypeloader_p.h
22@@ -322,8 +322,8 @@ public:
23 void invalidate();
24
25 #ifdef QT_NO_QML_DEBUGGER
26- QQmlProfiler *profiler() const { return nullptr; }
27- void setProfiler(QQmlProfiler *) {}
28+ quintptr profiler() const { return 0; }
29+ void setProfiler(quintptr) {}
30 #else
31 QQmlProfiler *profiler() const { return m_profiler.data(); }
32 void setProfiler(QQmlProfiler *profiler);
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index cda7b3ad..afc38651 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -13,6 +13,8 @@ LIC_FILES_CHKSUM = " \
13 13
14DEPENDS += "qtbase" 14DEPENDS += "qtbase"
15 15
16SRC_URI += "file://0001-QQmlTypeLoader-The-profiler-is-a-quintptr-0-if-QT_NO.patch"
17
16PACKAGECONFIG ??= "qtxmlpatterns" 18PACKAGECONFIG ??= "qtxmlpatterns"
17PACKAGECONFIG[qtxmlpatterns] = ",,qtxmlpatterns" 19PACKAGECONFIG[qtxmlpatterns] = ",,qtxmlpatterns"
18 20
@@ -29,6 +31,6 @@ do_install_append_class-nativesdk() {
29 31
30EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 32EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
31 33
32SRCREV = "32218c3243fb4f0da83293c5bd6a663d8e3660ee" 34SRCREV = "ff5c83087e94f340a8c5695998f2ea81e29da8ea"
33 35
34BBCLASSEXTEND =+ "native nativesdk" 36BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb
index 7e6cb1b2..e6d75c93 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 = "167566d228792c0f763b84a39ff5dc52fda046dd" 17SRCREV = "ffa5a03da503c3cd00f960debf3f43b85958c874"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 8f70bc0b..20b30c1c 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = ""
18# http://errors.yoctoproject.org/Errors/Build/44912/ 18# http://errors.yoctoproject.org/Errors/Build/44912/
19LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 19LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
20 20
21SRCREV = "1f6658cbaa5ffecbf9ba845ea81683dd2215cd34" 21SRCREV = "045174c411f89863165610c1f6135ef4bd3d0889"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index 52dd34a8..f02e57b8 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 = "dc6dc3b088d1828ee6d31f92528e0c87272ad4ed" 29SRCREV = "36fdeb50941e3e2b0c4cd1b3343c3e337534357d"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index cce66017..93b37f18 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -29,7 +29,7 @@ SRC_URI += " \
29 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ 29 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
30" 30"
31 31
32SRCREV_qtlocation = "d919f47308b209c798e50d8ca1b9abd48ba94718" 32SRCREV_qtlocation = "2b230b0a10d898979e9d5193f4da2e408b397fe3"
33SRCREV_qtlocation-mapboxgl = "1c633072fcea7ad153ab6f8ec40dd72d83541ead" 33SRCREV_qtlocation-mapboxgl = "1c633072fcea7ad153ab6f8ec40dd72d83541ead"
34 34
35SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" 35SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index f42bdc27..e7d110c1 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -35,4 +35,4 @@ SRC_URI += "\
35# http://errors.yoctoproject.org/Errors/Build/44914/ 35# http://errors.yoctoproject.org/Errors/Build/44914/
36LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 36LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
37 37
38SRCREV = "1e2702e86dbd2b3de69c58438bcfcf6276124547" 38SRCREV = "951393508a5068bd999c3225158cbb06872d881c"
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb
index e5ca4dfd..a34b0d02 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 = "47b80ecae6fe0b9a2c74f0b0feb243145695995e" 12SRCREV = "d811ebc6c6e83b33d765664328da5c8c6f518f66"
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index eaa36611..9aa358b5 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -24,6 +24,7 @@ do_configure_prepend() {
24} 24}
25 25
26QT_MODULE_BRANCH = "dev" 26QT_MODULE_BRANCH = "dev"
27
27# one commit behind: 28# one commit behind:
28# 8a7b80eb Use QRandomGenerator instead of q?rand 29# 8a7b80eb Use QRandomGenerator instead of q?rand
29# because QRandomGenerator is only since Qt 5.10 30# because QRandomGenerator is only since Qt 5.10
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 64cfbdf7..2ce8b250 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 = "871d8e8e2faca0be870930d83f755a2ad484d30b" 13SRCREV = "7cbf3685565d7f62c9a01b090a4c1600b4abe220"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index e2250df8..7bec39ac 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -26,4 +26,4 @@ SRC_URI += " \
26 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ 26 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \
27" 27"
28 28
29SRCREV = "8476f8fff7dc5b6f140074d280828cc0f9590088" 29SRCREV = "f9c410f619c1019fc361e230df0e4d2a2259e8e9"
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb
index 1e90323b..7a539685 100644
--- a/recipes-qt/qt5/qtremoteobjects_git.bb
+++ b/recipes-qt/qt5/qtremoteobjects_git.bb
@@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
24 24
25EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" 25EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
26 26
27SRCREV = "6e0341bc878ff82d3c1039dcce09f92269546189" 27SRCREV = "a3e68cda27ff01ab8fab73978f3f09db21222a98"
28 28
29BBCLASSEXTEND += "native nativesdk" 29BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 50d2190f..b0bddc78 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -29,4 +29,4 @@ DEPENDS += "qtbase"
29# http://errors.yoctoproject.org/Errors/Build/44915/ 29# http://errors.yoctoproject.org/Errors/Build/44915/
30LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 30LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
31 31
32SRCREV = "08b74f4f30c304b80249a593a572808bc1892f66" 32SRCREV = "3d44bf7ce2a45d461f1d74a3f1dbdff313845898"
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index fc60d601..8a190417 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 = "3caae998c8c1770cd96cadba24d89a60005c5fe7" 13SRCREV = "3ba4176568867cb146c2b758cd39461367ad22d1"
14 14
15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9 15# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9
16# 5.9.meta-qt5.2 16# 5.9.meta-qt5.2
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 014b68f7..4010a518 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtbase qtdeclarative" 13DEPENDS += "qtbase qtdeclarative"
14 14
15SRCREV = "c273f2e5c82a3ef8e55e360988b8cf31362e2ba9" 15SRCREV = "b2e6b77c0862aba5d9f9fc979db8f2d84e47a78a"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 8df89137..0a28a960 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 = "ce5a3ced5eeefe05675736d3279d4d45bbb6df90" 14SRCREV = "01df1b7a635b11c9d0985f9651cfa4ae3d037890"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index 0425e434..113f1e9c 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 = "cb9ade8beabd3cdcd469a45fa82a27fcc960532f" 18SRCREV = "07e1fc7bb93dc4c306d8e64f4cb88d42177cba2e"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 93306035..bf632bb0 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 = "bdcd7a97449502f92069d36196cc81064b1c02a0" 15SRCREV = "dc9e39eb679946e82bf3b1a82f5c49737f9994b2"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 80896939..e4ba6eda 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -30,7 +30,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
30 30
31EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" 31EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
32 32
33SRCREV = "90a701032ec5c8898e33b4fb4df0480634caaf8d" 33SRCREV = "9099c8934ebc042b38435eae293cd46e4fd9b883"
34 34
35BBCLASSEXTEND = "native nativesdk" 35BBCLASSEXTEND = "native nativesdk"
36 36
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 0238ce91..70910c15 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -111,4 +111,4 @@ FILES_${PN}-qt = " \
111 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ 111 ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \
112" 112"
113 113
114SRCREV = "325a90e07e9dce4e5c915549e6c31a86423dfdd3" 114SRCREV = "4f744d427a5bfd698dcdad394666a72ccbb79a3c"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index 5b544555..ce3908d4 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -53,4 +53,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
53 53
54DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" 54DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns"
55 55
56SRCREV = "87218c4e68c4ebde8f5765f0dfe9a70a359ae05f" 56SRCREV = "27df0d34644ffc553972641abfd3406219c85391"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 979969ba..25191a02 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 = "d483ed2927cb8d4685d5d3c7ea1c71246381910b" 40SRCREV = "04f6ff77ef0c8858629766e191ecc3d4ef056848"
41 41
42# Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9 42# Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9
43# 5.9.meta-qt5.2 43# 5.9.meta-qt5.2
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index 1e0796ab..c64f6157 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
12 12
13DEPENDS += "qtdeclarative qtwebsockets" 13DEPENDS += "qtdeclarative qtwebsockets"
14 14
15SRCREV = "61a638663c9061d7211849d3a9316661733a5ad9" 15SRCREV = "ba755c28ea0cd35cfa9d8c77ef7f2c61437ad25b"
diff --git a/recipes-qt/qt5/qtwebengine/0001-Build-accessibility-tests-only-when-Qt-is-configured.patch b/recipes-qt/qt5/qtwebengine/0001-Build-accessibility-tests-only-when-Qt-is-configured.patch
new file mode 100644
index 00000000..a5fb1d84
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0001-Build-accessibility-tests-only-when-Qt-is-configured.patch
@@ -0,0 +1,41 @@
1From 4649f2a11fe4b87e9b79f50ff8ac99ba9a2344f4 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
3Date: Wed, 25 Oct 2017 09:47:47 +0200
4Subject: [PATCH] Build accessibility tests only when Qt is configured with
5 accessibility
6
7Original patch by Daniel Mack <daniel@zonque.org>
8
9Task-number: QTBUG-64015
10Change-Id: I7dd0a1aa9bff08c6d19e818acf0e1b8b4b701f5b
11Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
12---
13 tests/auto/widgets/widgets.pro | 5 ++++-
14 1 file changed, 4 insertions(+), 1 deletion(-)
15
16diff --git a/tests/auto/widgets/widgets.pro b/tests/auto/widgets/widgets.pro
17index 441eea0..7bab18f 100644
18--- a/tests/auto/widgets/widgets.pro
19+++ b/tests/auto/widgets/widgets.pro
20@@ -1,7 +1,6 @@
21 TEMPLATE = subdirs
22
23 SUBDIRS += \
24- qwebengineaccessibility \
25 qwebenginedefaultsurfaceformat \
26 qwebenginedownloads \
27 qwebenginefaviconmanager \
28@@ -14,6 +13,10 @@ SUBDIRS += \
29 qwebenginesettings \
30 qwebengineview
31
32+qtConfig(accessibility) {
33+ SUBDIRS += qwebengineaccessibility
34+}
35+
36 contains(WEBENGINE_CONFIG, use_spellchecker):!cross_compile {
37 !contains(WEBENGINE_CONFIG, use_native_spellchecker) {
38 SUBDIRS += qwebenginespellcheck
39--
402.7.4
41
diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
deleted file mode 100644
index 148b0629..00000000
--- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
+++ /dev/null
@@ -1,97 +0,0 @@
1From e7d1e5dfdece59f247a1d71ad0ca1b0c8cadda21 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 15 Mar 2017 13:53:28 +0200
4Subject: [PATCH] Force host toolchain configuration
5
6Force gcc/g++ to be used for parts using host toolchain, since
7the option(host_build) does not work in yocto builds.
8
9Don't use QT_ARCH for the host architecture, since that's always
10the target architecture in bitbake builds, instead ask specifically
11for the qmakes's host architecture.
12
13Change-Id: I38329d545e527dbc5892547b6951822171ab761f
14Upstream-Status: Inappropriate [OE specific]
15Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
16---
17 src/buildtools/configure_host.pro | 14 +++++++-------
18 src/core/config/linux.pri | 2 +-
19 2 files changed, 8 insertions(+), 8 deletions(-)
20
21diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
22index f1b3d47..1212372 100644
23--- a/src/buildtools/configure_host.pro
24+++ b/src/buildtools/configure_host.pro
25@@ -4,7 +4,7 @@ TEMPLATE = aux
26 # Pick up the host toolchain
27 option(host_build)
28
29-GN_HOST_CPU = $$gnArch($$QT_ARCH)
30+GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch)
31 !isEmpty(QT_TARGET_ARCH): GN_TARGET_CPU = $$gnArch($$QT_TARGET_ARCH)
32 else: GN_TARGET_CPU = $$GN_HOST_CPU
33 GN_OS = $$gnOS()
34@@ -29,9 +29,9 @@ GN_CONTENTS = \
35 "import(\"//build/config/sysroot.gni\")" \
36 "import(\"//build/toolchain/gcc_toolchain.gni\")" \
37 "gcc_toolchain(\"host\") {" \
38-" cc = \"$$which($$QMAKE_CC)\" " \
39-" cxx = \"$$which($$QMAKE_CXX)\" " \
40-" ld = \"$$which($$QMAKE_LINK)\" " \
41+" cc = \"$$which(gcc)\" " \
42+" cxx = \"$$which(g++)\" " \
43+" ld = \"$$which(g++)\" " \
44 " ar = \"$$which(ar)\" " \
45 " nm = \"$$which(nm)\" " \
46 " toolchain_args = { " \
47@@ -42,9 +42,9 @@ GN_CONTENTS = \
48 " } " \
49 "}" \
50 "gcc_toolchain(\"v8_snapshot\") {" \
51-" cc = \"$$which($$QMAKE_CC)\" " \
52-" cxx = \"$$which($$QMAKE_CXX)\" " \
53-" ld = \"$$which($$QMAKE_LINK)\" " \
54+" cc = \"$$which(gcc)\" " \
55+" cxx = \"$$which(g++)\" " \
56+" ld = \"$$which(g++)\" " \
57 " ar = \"$$which(ar)\" " \
58 " nm = \"$$which(nm)\" " \
59 " toolchain_args = { " \
60diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
61index 714c864..f66ca55 100644
62--- a/src/core/config/linux.pri
63+++ b/src/core/config/linux.pri
64@@ -98,7 +98,7 @@ contains(QT_ARCH, "mips"):!host_build {
65
66 host_build {
67 gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
68- GN_HOST_CPU = $$gnArch($$QT_ARCH)
69+ GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch)
70 gn_args += host_cpu=\"$$GN_HOST_CPU\"
71 # Don't bother trying to use system libraries in this case
72 gn_args += use_glib=false
73diff --git a/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py b/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py
74index 75b9690..601f688 100755
75--- a/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py
76+++ b/src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py
77@@ -298,14 +298,14 @@ def write_gn_ninja(path, root_gen_dir, options):
78 ld = os.environ.get('LD', 'link.exe')
79 ar = os.environ.get('AR', 'lib.exe')
80 else:
81- cc = os.environ.get('CC', 'cc')
82- cxx = os.environ.get('CXX', 'c++')
83+ cc = os.environ.get('CC_host', 'gcc')
84+ cxx = os.environ.get('CXX_host', 'g++')
85 ld = cxx
86- ar = os.environ.get('AR', 'ar')
87+ ar = os.environ.get('AR_host', 'ar')
88
89- cflags = os.environ.get('CFLAGS', '').split()
90- cflags_cc = os.environ.get('CXXFLAGS', '').split()
91- ldflags = os.environ.get('LDFLAGS', '').split()
92+ cflags = os.environ.get('CFLAGS_host', '').split()
93+ cflags_cc = os.environ.get('CXXFLAGS_host', '').split()
94+ ldflags = os.environ.get('LDFLAGS_host', '').split()
95 include_dirs = [root_gen_dir, SRC_ROOT]
96 libs = []
97
diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-workaround-for-too-long-.rps-file-name.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-workaround-for-too-long-.rps-file-name.patch
deleted file mode 100644
index 42ceeacf..00000000
--- a/recipes-qt/qt5/qtwebengine/0001-chromium-workaround-for-too-long-.rps-file-name.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From c72097e8790553771daf3231124c3fbe1a438379 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Thu, 30 Mar 2017 11:37:24 +0300
4Subject: [PATCH] chromium: workaround for too long .rps file name
5
6Ninja may fail when the build directory is too long:
7
8ninja: error: WriteFile(__third_party_WebKit_Source_bindings_modules_\
9interfaces_info_individual_modules__home_qt_work_build_build-nitrogen\
106x_tmp_work_cortexa9hf-neon-mx6qdl-poky-linux-gnueabi_qtwebengine_5.9\
11.0_gitAUTOINC_29afdb0a34_049134677a-r0_build_src_toolchain_target__ru\
12le.rsp): Unable to create file. File name too long
13
14Task-number: QTBUG-59769
15Change-Id: I73c5e64ae5174412be2a675e35b0b6047f2bf4c1
16---
17 src/3rdparty/chromium/tools/gn/ninja_action_target_writer.cc | 9 +++++++++
18 1 file changed, 9 insertions(+)
19
20diff --git a/src/3rdparty/chromium/tools/gn/ninja_action_target_writer.cc b/src/3rdparty/chromium/tools/gn/ninja_action_target_writer.cc
21index a5bc6cd..5cefbfe 100644
22--- a/src/3rdparty/chromium/tools/gn/ninja_action_target_writer.cc
23+++ b/src/3rdparty/chromium/tools/gn/ninja_action_target_writer.cc
24@@ -115,9 +115,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() {
25 // strictly necessary for regular one-shot actions, but it's easier to
26 // just always define unique_name.
27 std::string rspfile = custom_rule_name;
28+
29+ //quick workaround if filename length > 255 - ".rsp", just cut the dirs starting from the end
30+ //please note ".$unique_name" is not used at the moment
31+ int pos = 0;
32+ std::string delimiter("_");
33+ while (rspfile.length() > 251 && (pos = rspfile.find_last_of(delimiter)) != std::string::npos)
34+ rspfile = rspfile.substr(0,pos);
35+
36 if (!target_->sources().empty())
37 rspfile += ".$unique_name";
38 rspfile += ".rsp";
39+
40 out_ << " rspfile = " << rspfile << std::endl;
41
42 // Response file contents.
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index d89c8320..deef5737 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -126,13 +126,14 @@ RDEPENDS_${PN}-examples += " \
126 qtdeclarative-qmlplugins \ 126 qtdeclarative-qmlplugins \
127" 127"
128 128
129QT_MODULE_BRANCH_CHROMIUM = "56-based" 129QT_MODULE_BRANCH_CHROMIUM = "58-based"
130 130
131# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9 131# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9
132# 5.9.meta-qt5.3 132# 5.9.meta-qt5.3
133SRC_URI += " \ 133SRC_URI += " \
134 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ 134 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
135 file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \ 135 file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \
136 file://0001-Build-accessibility-tests-only-when-Qt-is-configured.patch \
136 file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ 137 file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \
137 file://0003-Include-dependency-to-QCoreApplication-translate.patch \ 138 file://0003-Include-dependency-to-QCoreApplication-translate.patch \
138 file://0004-Force-host-toolchain-configuration.patch \ 139 file://0004-Force-host-toolchain-configuration.patch \
@@ -162,8 +163,8 @@ SRC_URI_append_libc-musl = "\
162 file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ 163 file://0016-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \
163" 164"
164 165
165SRCREV_qtwebengine = "c11c2c8981e647c1eb2c6753ce77d436b92fff87" 166SRCREV_qtwebengine = "f32b3514a5186bc4f5452f004324bdb7782d30a3"
166SRCREV_chromium = "02fb09feaed516d49c50f51172d687adf382e49e" 167SRCREV_chromium = "582c5493439ba9ac57c6c14c706f530741f5bfc8"
167SRCREV = "${SRCREV_qtwebengine}" 168SRCREV = "${SRCREV_qtwebengine}"
168 169
169SRCREV_FORMAT = "qtwebengine_chromium" 170SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb
index 3e3e4a0b..b8b6ee71 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 = "a24c780b60d7d8bc00c4a48042cf7f32db777d55" 20SRCREV = "7efef7478b60f6aeb7babb0663234cf8dcb8a265"
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 8b3c3f50..9fc931e9 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -22,6 +22,7 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
22# 5.9.meta-qt5.2 22# 5.9.meta-qt5.2
23SRC_URI += "\ 23SRC_URI += "\
24 file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \ 24 file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \
25 file://0001-Remove-unused-check-for-private_tests.patch \
25 file://0002-Exclude-backtrace-API-for-non-glibc-libraries.patch \ 26 file://0002-Exclude-backtrace-API-for-non-glibc-libraries.patch \
26" 27"
27 28
@@ -87,4 +88,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db
87RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" 88RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
88export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" 89export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
89 90
90SRCREV = "97c4a80a1282c8c3eaa343011286b76fd4838c5f" 91SRCREV = "7e104c57a70fdf551bb3d22a5d637cdcbc69dbea"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index 0f72d63a..28951057 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
11 11
12DEPENDS += "qtbase qtdeclarative" 12DEPENDS += "qtbase qtdeclarative"
13 13
14SRCREV = "492981b93295f575ad77b6767dc5b8851287aa2e" 14SRCREV = "71b5fc5dd10e9edce8db886f6c05b7950b3cca6e"
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index 79089aec..57abc40d 100644
--- a/recipes-qt/qt5/qtwebview_git.bb
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
19COMPATIBLE_MACHINE_armv7ve = "(.*)" 19COMPATIBLE_MACHINE_armv7ve = "(.*)"
20COMPATIBLE_MACHINE_aarch64 = "(.*)" 20COMPATIBLE_MACHINE_aarch64 = "(.*)"
21 21
22SRCREV = "ec640efd1d82cdc88157159cbaa048815696ee25" 22SRCREV = "7e71daf48c2ee3c3518cbfe6103d212772ccf414"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index d15fc2d9..2d4e4139 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 = "160435b0eb076c31a021004eeede143fc265bce4" 16SRCREV = "ec2c0f4db6350a304dcf901b9adbadc895864c14"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index d4fccafe..9fc1b5e9 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = " \
17 17
18DEPENDS += "qtbase" 18DEPENDS += "qtbase"
19 19
20SRCREV = "8d7e1e0ec06724a4d332c050e9260530c708e773" 20SRCREV = "9e26cfa167778f3d9444aedcb23c8476683b3785"
21 21
22BBCLASSEXTEND =+ "native nativesdk" 22BBCLASSEXTEND =+ "native nativesdk"
23 23
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-08-18 19:53:13 +0000