summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5')
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb6
-rw-r--r--recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch2
-rw-r--r--recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch2
-rw-r--r--recipes-qt/qt5/qt3d_git.bb4
-rw-r--r--recipes-qt/qt5/qt5-git.inc4
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb6
-rw-r--r--recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch6
-rw-r--r--recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch2
-rw-r--r--recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch2
-rw-r--r--recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch4
-rw-r--r--recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch6
-rw-r--r--recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch4
-rw-r--r--recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch2
-rw-r--r--recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch4
-rw-r--r--recipes-qt/qt5/qtbase/0009-Always-build-uic.patch2
-rw-r--r--recipes-qt/qt5/qtbase_git.bb4
-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/qtenginio_git.bb1
-rw-r--r--recipes-qt/qt5/qtgamepad_git.bb2
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb11
-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.bb6
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb4
-rw-r--r--recipes-qt/qt5/qtnetworkauth_git.bb2
-rw-r--r--recipes-qt/qt5/qtquick1_git.bb5
-rw-r--r--recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch4
-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.bb4
-rw-r--r--recipes-qt/qt5/qtscript_git.bb2
-rw-r--r--recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch4
-rw-r--r--recipes-qt/qt5/qtscxml_git.bb4
-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/qtsystems_git.bb2
-rw-r--r--recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch12
-rw-r--r--recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch2
-rw-r--r--recipes-qt/qt5/qttools_git.bb4
-rw-r--r--recipes-qt/qt5/qttranslations_git.bb9
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch5
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb4
-rw-r--r--recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch2
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb4
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb11
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch6
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch4
-rw-r--r--recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch8
-rw-r--r--recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch241
-rw-r--r--recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch2
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb11
-rw-r--r--recipes-qt/qt5/qtwebkit-examples_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch2
-rw-r--r--recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch2
-rw-r--r--recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch89
-rw-r--r--recipes-qt/qt5/qtwebkit_git.bb5
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb12
-rw-r--r--recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch22
-rw-r--r--recipes-qt/qt5/qtwebview_git.bb6
-rw-r--r--recipes-qt/qt5/qtx11extras_git.bb2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
76 files changed, 134 insertions, 507 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index d229c21d..87bd5019 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -26,7 +26,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
26 26
27# common for qtbase-native, qtbase-nativesdk and qtbase 27# common for qtbase-native, qtbase-nativesdk and qtbase
28# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared 28# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared
29# 5.9.meta-qt5-shared.1 29# 5.9.meta-qt5-shared.2
30SRC_URI += "\ 30SRC_URI += "\
31 file://0001-Add-linux-oe-g-platform.patch \ 31 file://0001-Add-linux-oe-g-platform.patch \
32 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ 32 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -40,7 +40,7 @@ SRC_URI += "\
40 40
41# common for qtbase-native and nativesdk-qtbase 41# common for qtbase-native and nativesdk-qtbase
42# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native 42# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native
43# 5.9.meta-qt5-native.1 43# 5.9.meta-qt5-native.2
44SRC_URI += " \ 44SRC_URI += " \
45 file://0009-Always-build-uic.patch \ 45 file://0009-Always-build-uic.patch \
46" 46"
@@ -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 = "f6b36eaafec24b4c67efff621d380a4ca4257d0b" 200SRCREV = "73573fce295caef35da706a8c8c796ec18e6baf1"
diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
index 8cf1f501..5aba2bfc 100644
--- a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
+++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
@@ -1,4 +1,4 @@
1From dd0f3fefeeefb31ec8cf2417bd3f447f7b9c25c6 Mon Sep 17 00:00:00 2001 1From 7cb46d20ad89f37828ff9f96363a112eadf11dbd Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@theqtcompany.com> 2From: Samuli Piippo <samuli.piippo@theqtcompany.com>
3Date: Wed, 10 Feb 2016 09:02:09 +0200 3Date: Wed, 10 Feb 2016 09:02:09 +0200
4Subject: [PATCH] Allow a tools-only build 4Subject: [PATCH] Allow a tools-only build
diff --git a/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch b/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch
index eeb402f6..1f2f682f 100644
--- a/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch
+++ b/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch
@@ -1,4 +1,4 @@
1From ec40913bc563e3cb0abc1965ce457d3a2fe663b3 Mon Sep 17 00:00:00 2001 1From 99fb23c0258ed0dacb03dc2eb57792c42b33316f Mon Sep 17 00:00:00 2001
2From: Kim Kulling <kim.kulling@googlemail.com> 2From: Kim Kulling <kim.kulling@googlemail.com>
3Date: Mon, 7 Nov 2016 17:19:49 +0100 3Date: Mon, 7 Nov 2016 17:19:49 +0100
4Subject: [PATCH] Fix BlenderDNA for clang cross compiler. 4Subject: [PATCH] Fix BlenderDNA for clang cross compiler.
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 4226bac6..c354db4b 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -12,7 +12,7 @@ DEPENDS += "qtbase"
12DEPENDS_class-target += "qtdeclarative qt3d-native" 12DEPENDS_class-target += "qtdeclarative qt3d-native"
13 13
14# Patches from https://github.com/meta-qt5/qt3d/commits/b5.9 14# Patches from https://github.com/meta-qt5/qt3d/commits/b5.9
15# 5.9.meta-qt5.1 15# 5.9.meta-qt5.2
16SRC_URI += " \ 16SRC_URI += " \
17 file://0001-Allow-a-tools-only-build.patch \ 17 file://0001-Allow-a-tools-only-build.patch \
18 file://0002-Fix-BlenderDNA-for-clang-cross-compiler.patch \ 18 file://0002-Fix-BlenderDNA-for-clang-cross-compiler.patch \
@@ -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 = "f39d0a0c32cc489849a0cd5c2880f6e824223485" 40SRCREV = "9d8c9ada161ad97634992c444196add0abb4f9d1"
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 927912fd..ffa70e53 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -1,5 +1,5 @@
1# Copyright (C) 2012-2016 O.S. Systems Software LTDA. 1# Copyright (C) 2012-2016 O.S. Systems Software LTDA.
2# Copyright (C) 2013-2016 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.9"
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16
17PV = "5.9.0+git${SRCPV}" 17PV = "5.9.2+git${SRCPV}"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 336df95b..54a0b785 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -21,7 +21,7 @@ require qt5-git.inc
21 21
22# common for qtbase-native, qtbase-nativesdk and qtbase 22# common for qtbase-native, qtbase-nativesdk and qtbase
23# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared 23# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared
24# 5.9.meta-qt5-shared.1 24# 5.9.meta-qt5-shared.2
25SRC_URI += "\ 25SRC_URI += "\
26 file://0001-Add-linux-oe-g-platform.patch \ 26 file://0001-Add-linux-oe-g-platform.patch \
27 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ 27 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -35,7 +35,7 @@ SRC_URI += "\
35 35
36# common for qtbase-native and nativesdk-qtbase 36# common for qtbase-native and nativesdk-qtbase
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.1 38# 5.9.meta-qt5-native.2
39SRC_URI += " \ 39SRC_URI += " \
40 file://0009-Always-build-uic.patch \ 40 file://0009-Always-build-uic.patch \
41" 41"
@@ -114,4 +114,4 @@ do_install() {
114 install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} 114 install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS}
115} 115}
116 116
117SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b" 117SRCREV = "73573fce295caef35da706a8c8c796ec18e6baf1"
diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
index 28c26603..a8fe4338 100644
--- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
@@ -1,4 +1,4 @@
1From e13425e6f1e784b0b016cf68a54dfbae32995b86 Mon Sep 17 00:00:00 2001 1From 85da054ff867fbf1a4c10e3f1cad782123ffdfe4 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Mon, 15 Apr 2013 04:29:32 +0200 3Date: Mon, 15 Apr 2013 04:29:32 +0200
4Subject: [PATCH] Add linux-oe-g++ platform 4Subject: [PATCH] Add linux-oe-g++ platform
@@ -30,10 +30,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
30 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h 30 create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
31 31
32diff --git a/configure b/configure 32diff --git a/configure b/configure
33index 73679de621..5a0eebce50 100755 33index 08b49a8d12..5876721743 100755
34--- a/configure 34--- a/configure
35+++ b/configure 35+++ b/configure
36@@ -709,7 +709,7 @@ fi 36@@ -712,7 +712,7 @@ fi
37 # is where the resulting variable is written to 37 # is where the resulting variable is written to
38 setBootstrapVariable() 38 setBootstrapVariable()
39 { 39 {
diff --git a/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch b/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
index 5ee6e049..b67a7ef1 100644
--- a/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
+++ b/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
@@ -1,4 +1,4 @@
1From 5ed152f8caa7ef00fb20d19a06ab5f7887e9aba6 Mon Sep 17 00:00:00 2001 1From b6d5179ad7c907bc3343bcf3586cef6226d0c8ed Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 6 Apr 2013 13:15:07 +0200 3Date: Sat, 6 Apr 2013 13:15:07 +0200
4Subject: [PATCH] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS 4Subject: [PATCH] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS
diff --git a/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
index 7ff1ff71..ae06ea6f 100644
--- a/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++ b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -1,4 +1,4 @@
1From 77fab782e8a199f9ede83bc97cbce21a544961c2 Mon Sep 17 00:00:00 2001 1From 8cf43041691140faf5f56b42bebfa00d8ebc8da6 Mon Sep 17 00:00:00 2001
2From: Holger Freyther <zecke@selfish.org> 2From: Holger Freyther <zecke@selfish.org>
3Date: Wed, 26 Sep 2012 17:22:30 +0200 3Date: Wed, 26 Sep 2012 17:22:30 +0200
4Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the 4Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the
diff --git a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
index 5ab6a7b1..8ef4f61c 100644
--- a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
+++ b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
@@ -1,4 +1,4 @@
1From 4848804312f0045b53c85db113ac9e42fe1b7360 Mon Sep 17 00:00:00 2001 1From f02c4f742e90023e87d148bda48401b11815d8ba Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com> 2From: Denys Dmytriyenko <denys@ti.com>
3Date: Tue, 25 Aug 2015 10:05:15 -0400 3Date: Tue, 25 Aug 2015 10:05:15 -0400
4Subject: [PATCH] configure: bump path length from 256 to 512 characters 4Subject: [PATCH] configure: bump path length from 256 to 512 characters
@@ -15,7 +15,7 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
15 1 file changed, 3 insertions(+), 3 deletions(-) 15 1 file changed, 3 insertions(+), 3 deletions(-)
16 16
17diff --git a/configure.pri b/configure.pri 17diff --git a/configure.pri b/configure.pri
18index be1b166080..52f03bf3f2 100644 18index 76bb27e4ae..9ac81027c9 100644
19--- a/configure.pri 19--- a/configure.pri
20+++ b/configure.pri 20+++ b/configure.pri
21@@ -796,10 +796,10 @@ defineTest(qtConfOutput_preparePaths) { 21@@ -796,10 +796,10 @@ defineTest(qtConfOutput_preparePaths) {
diff --git a/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch
index 8538901f..610299d2 100644
--- a/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch
+++ b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch
@@ -1,4 +1,4 @@
1From 6ecb404346525a92f4c8926aa285662f3f5010b3 Mon Sep 17 00:00:00 2001 1From 3114a9cd19b15f6b5ca99c4ce961ae5b80bfb3ab Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Mon, 24 Oct 2016 09:45:18 +0300 3Date: Mon, 24 Oct 2016 09:45:18 +0300
4Subject: [PATCH] Disable all unknown features instead of erroring out 4Subject: [PATCH] Disable all unknown features instead of erroring out
@@ -10,10 +10,10 @@ Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447
10 1 file changed, 2 insertions(+), 1 deletion(-) 10 1 file changed, 2 insertions(+), 1 deletion(-)
11 11
12diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf 12diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
13index 966c43108c..32f0dd0041 100644 13index afeb4f3d1d..aec5253c25 100644
14--- a/mkspecs/features/qt_configure.prf 14--- a/mkspecs/features/qt_configure.prf
15+++ b/mkspecs/features/qt_configure.prf 15+++ b/mkspecs/features/qt_configure.prf
16@@ -1180,7 +1180,8 @@ defineReplace(qtConfEvaluateSingleExpression) { 16@@ -1235,7 +1235,8 @@ defineReplace(qtConfEvaluateSingleExpression) {
17 error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.") 17 error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.")
18 return($$result) 18 return($$result)
19 } 19 }
diff --git a/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch b/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
index 253815bd..eaa5da84 100644
--- a/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
+++ b/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
@@ -1,4 +1,4 @@
1From 3730ac03a1473a0e1fdfe1537b73818ab99961e9 Mon Sep 17 00:00:00 2001 1From 515acdcfe158982f31b31e410bbedb3db94bea1c Mon Sep 17 00:00:00 2001
2From: Pascal Bach <pascal.bach@siemens.com> 2From: Pascal Bach <pascal.bach@siemens.com>
3Date: Wed, 11 May 2016 15:20:41 +0200 3Date: Wed, 11 May 2016 15:20:41 +0200
4Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS 4Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS
@@ -30,7 +30,7 @@ Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
30 2 files changed, 10 insertions(+) 30 2 files changed, 10 insertions(+)
31 31
32diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 32diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
33index 4f342d67d7..202b723882 100644 33index 55c74aad66..f9ec328c83 100644
34--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 34--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
35+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 35+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
36@@ -9,6 +9,11 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) 36@@ -9,6 +9,11 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
diff --git a/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch b/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch
index 68e4b201..4d3e4b6e 100644
--- a/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch
+++ b/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch
@@ -1,4 +1,4 @@
1From 2fa6b447302abbaf1fd710e94b92692a300baaaf Mon Sep 17 00:00:00 2001 1From 6875848e2250ef439115ff2063713ce7bfb9597d Mon Sep 17 00:00:00 2001
2From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> 2From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
3Date: Wed, 7 Jun 2017 21:00:49 +0900 3Date: Wed, 7 Jun 2017 21:00:49 +0900
4Subject: [PATCH] Delete qlonglong and qulonglong 4Subject: [PATCH] Delete qlonglong and qulonglong
diff --git a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch
index 678de529..14074fb4 100644
--- a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch
+++ b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch
@@ -1,4 +1,4 @@
1From 41d7028d2239a98a76cc91939edb2cb728019d08 Mon Sep 17 00:00:00 2001 1From 66da19d96d9a6ea9142df8fcbc0c3b7d960ee6b9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 27 Jul 2017 08:02:51 -0700 3Date: Thu, 27 Jul 2017 08:02:51 -0700
4Subject: [PATCH] Replace pthread_yield with sched_yield 4Subject: [PATCH] Replace pthread_yield with sched_yield
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 2 files changed, 5 insertions(+), 4 deletions(-) 14 2 files changed, 5 insertions(+), 4 deletions(-)
15 15
16diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp 16diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
17index b6106e8c9e..6d6ea0b739 100644 17index f9ddd59aaa..2f92db983d 100644
18--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp 18--- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
19+++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp 19+++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
20@@ -34,7 +34,7 @@ 20@@ -34,7 +34,7 @@
diff --git a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
index 118a4f29..2a1d534b 100644
--- a/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
+++ b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
@@ -1,4 +1,4 @@
1From 294e4c718407e66631ce36c37258217c9adb3f83 Mon Sep 17 00:00:00 2001 1From bf173918731c626b6c8b84eb826c921e5c6d44f5 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
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 1c18d0dc..aaa59f33 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = " \
16 16
17# common for qtbase-native, qtbase-nativesdk and qtbase 17# common for qtbase-native, qtbase-nativesdk and qtbase
18# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared 18# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared
19# 5.9.meta-qt5-shared.1 19# 5.9.meta-qt5-shared.2
20SRC_URI += "\ 20SRC_URI += "\
21 file://0001-Add-linux-oe-g-platform.patch \ 21 file://0001-Add-linux-oe-g-platform.patch \
22 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ 22 file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -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 = "f6b36eaafec24b4c67efff621d380a4ca4257d0b" 225SRCREV = "73573fce295caef35da706a8c8c796ec18e6baf1"
diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb
index b2a07247..25cd72ba 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 = "25447e889dc43c0831100bee1625a6f667d364cf"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index 6b895aaa..d3447efc 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 = "1f47b1a7ae58702dccc57a9ccbaa905441f4fecb"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 0d13dc40..9e91a1d4 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 = "94cc2b914a027fbcb7a1eb6cb34af45d0c07d2a4"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index 0cbd04e6..471cfee5 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 = "3f8ae713dfdbaeb34bdc52d905fe5ca16765cf7f"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index ecd64ee3..12e5f4eb 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -29,6 +29,6 @@ do_install_append_class-nativesdk() {
29 29
30EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" 30EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
31 31
32SRCREV = "96f6ba5f562073f508cd8569ac354592fdd48f4a" 32SRCREV = "7c45b035b97ce705d536932965673dca7cfa489e"
33 33
34BBCLASSEXTEND =+ "native nativesdk" 34BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb
index 8b4fb714..1fa8e826 100644
--- a/recipes-qt/qt5/qtenginio_git.bb
+++ b/recipes-qt/qt5/qtenginio_git.bb
@@ -14,4 +14,3 @@ DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
14 14
15QT_MODULE_BRANCH = "dev" 15QT_MODULE_BRANCH = "dev"
16SRCREV = "0555cf73c8b5abd41d8a4ff02457315c9e7c667d" 16SRCREV = "0555cf73c8b5abd41d8a4ff02457315c9e7c667d"
17
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb
index 94f04a49..a771d9da 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 = "1fc40deed6993265c436783cc367285bf9a2266a"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index edb150e3..6c6f3aef 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -3,16 +3,11 @@ 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.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ 6 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
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 \ 10 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
13 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
14 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
15 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
16" 11"
17 12
18DEPENDS += "qtdeclarative" 13DEPENDS += "qtdeclarative"
@@ -23,4 +18,4 @@ RDEPENDS_${PN}-dev = ""
23# http://errors.yoctoproject.org/Errors/Build/44912/ 18# http://errors.yoctoproject.org/Errors/Build/44912/
24LDFLAGS_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)}"
25 20
26SRCREV = "db93af5b2bb49af74fbad6c9cd80bd7010434e78" 21SRCREV = "b6ff12df5496f3d296bb438ae343d5f771e93fec"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index 4dd64df2..1e022f4a 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 = "144a3535db9f95e60972d3c3b6eaceb65a604577"
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..7db1676d 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 dbc899b088817cf6529d7e5cb8be7a6a95556127 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 459897a8..d97e05d0 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 c50a917a..19f895e9 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \
14DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" 14DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols"
15 15
16# Patches from https://github.com/meta-qt5/qtlocation/commits/b5.9 16# Patches from https://github.com/meta-qt5/qtlocation/commits/b5.9
17# 5.9.meta-qt5.1 17# 5.9.meta-qt5.2
18SRC_URI += "file://0001-Make-mapbox-gl-build-configurable.patch" 18SRC_URI += "file://0001-Make-mapbox-gl-build-configurable.patch"
19 19
20PACKAGECONFIG ??= "" 20PACKAGECONFIG ??= ""
@@ -34,7 +34,7 @@ SRC_URI += " \
34 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \ 34 ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
35" 35"
36 36
37SRCREV_qtlocation = "888d351cb0c7fe6d05ab1efe8d4dbb4b6f06cd5f" 37SRCREV_qtlocation = "c832af789766fcebd8cfb15e53ce14f36278ca6d"
38SRCREV_qtlocation-mapboxgl = "d45c177e8a23eefcc94930af9fa085e61136bb94" 38SRCREV_qtlocation-mapboxgl = "9ecbe3642fb4a53b558598239b59bf1d0224c25b"
39 39
40SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" 40SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 998f32f5..729b3ffd 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -26,7 +26,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
26EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', '-no-gstreamer', d)}" 26EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', '-no-gstreamer', d)}"
27 27
28# Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.9 28# Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.9
29# 5.9.meta-qt5.1 29# 5.9.meta-qt5.2
30SRC_URI += "\ 30SRC_URI += "\
31 file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ 31 file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \
32" 32"
@@ -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 = "559c305ded730e23505e8b29536a98dc59e2acfa" 38SRCREV = "343e281f0e7cc7fd9e1558e4d92f5019fa565181"
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb
index eb5e4f61..0655b425 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 = "3d93f6436596e349e43c3798b675af66db71df8a"
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index 1f680e62..eaa36611 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -24,4 +24,7 @@ do_configure_prepend() {
24} 24}
25 25
26QT_MODULE_BRANCH = "dev" 26QT_MODULE_BRANCH = "dev"
27SRCREV = "695460401d9a89d2f156016d51601b2e59b64105" 27# one commit behind:
28# 8a7b80eb Use QRandomGenerator instead of q?rand
29# because QRandomGenerator is only since Qt 5.10
30SRCREV = "9bf0edd9bd46ecb900bcdc3349d14869b87ab7de"
diff --git a/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch b/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
index 85fcc158..2e644803 100644
--- a/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
+++ b/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch
@@ -1,4 +1,4 @@
1From fca6212d5ebc5851f28e820e4ff0ebe04a9d44d7 Mon Sep 17 00:00:00 2001 1From 3248edbde8859f62f453215876fbcb89dd788513 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com> 2From: Denys Dmytriyenko <denys@ti.com>
3Date: Thu, 31 Mar 2016 19:57:01 -0400 3Date: Thu, 31 Mar 2016 19:57:01 -0400
4Subject: [PATCH] texteditor: fix invalid use of incomplete type 'class QDebug' 4Subject: [PATCH] texteditor: fix invalid use of incomplete type 'class QDebug'
@@ -11,7 +11,7 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com>
11 1 file changed, 1 insertion(+) 11 1 file changed, 1 insertion(+)
12 12
13diff --git a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp 13diff --git a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp
14index bdecf5b..811a761 100644 14index 69da88f0..9039191e 100644
15--- a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp 15--- a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp
16+++ b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp 16+++ b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp
17@@ -54,6 +54,7 @@ 17@@ -54,6 +54,7 @@
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index a84cfb32..e123f0d2 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 = "63f2f55462f2f040cfe175ada8aa1e01168597fc"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 0ea314b8..50d6ba6c 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -23,9 +23,9 @@ FILES_${PN}-qmlplugins += " \
23" 23"
24 24
25# Patches from https://github.com/meta-qt5/qtquickcontrols/commits/b5.9 25# Patches from https://github.com/meta-qt5/qtquickcontrols/commits/b5.9
26# 5.9.meta-qt5.1 26# 5.9.meta-qt5.2
27SRC_URI += " \ 27SRC_URI += " \
28 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ 28 file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \
29" 29"
30 30
31SRCREV = "dacb91916b202208681471ba764504c7c7d086f0" 31SRCREV = "a77494140324c3ede1f7c16086593c070d81e2b3"
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb
index a7e34472..1e90323b 100644
--- a/recipes-qt/qt5/qtremoteobjects_git.bb
+++ b/recipes-qt/qt5/qtremoteobjects_git.bb
@@ -12,7 +12,7 @@ require qt5-git.inc
12DEPENDS += "qtbase qtdeclarative qtremoteobjects-native" 12DEPENDS += "qtbase qtdeclarative qtremoteobjects-native"
13 13
14# Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.9 14# Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.9
15# 5.9.meta-qt5.1 15# 5.9.meta-qt5.2
16SRC_URI += " \ 16SRC_URI += " \
17 file://0001-Allow-a-tools-only-build.patch \ 17 file://0001-Allow-a-tools-only-build.patch \
18" 18"
@@ -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 = "ae0b101884b05355e3a7bc06dbca722ad3d08d0f" 27SRCREV = "6e0341bc878ff82d3c1039dcce09f92269546189"
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 e7acafe5..9061c3c7 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 = "e00ca9b6bec2adf78fd14e02376ecf1b55a93b0c" 32SRCREV = "86ee61734e0331459f9cfeb1ad56f773b7e994be"
diff --git a/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch b/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch
index 0b90a66b..dc988fa6 100644
--- a/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch
+++ b/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch
@@ -1,4 +1,4 @@
1From 210049f0e53f7fb8e5c44325b13947add9618f89 Mon Sep 17 00:00:00 2001 1From 89c9f60679b21629412503a17358426bf211a81b Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Tue, 10 Jan 2017 15:28:26 +0200 3Date: Tue, 10 Jan 2017 15:28:26 +0200
4Subject: [PATCH] Use external host bin path for cmake file 4Subject: [PATCH] Use external host bin path for cmake file
@@ -14,7 +14,7 @@ Change-Id: Idb814be705e9cbaad7f1e68b5d7cdb79c4b65008
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/src/scxml/Qt5ScxmlConfigExtras.cmake.in b/src/scxml/Qt5ScxmlConfigExtras.cmake.in 16diff --git a/src/scxml/Qt5ScxmlConfigExtras.cmake.in b/src/scxml/Qt5ScxmlConfigExtras.cmake.in
17index edb320a..c2f8be8 100644 17index edb320a..ce7f2df 100644
18--- a/src/scxml/Qt5ScxmlConfigExtras.cmake.in 18--- a/src/scxml/Qt5ScxmlConfigExtras.cmake.in
19+++ b/src/scxml/Qt5ScxmlConfigExtras.cmake.in 19+++ b/src/scxml/Qt5ScxmlConfigExtras.cmake.in
20@@ -40,7 +40,7 @@ if (NOT TARGET Qt5::qscxmlc) 20@@ -40,7 +40,7 @@ if (NOT TARGET Qt5::qscxmlc)
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index e9ca8c19..36ca665d 100644
--- a/recipes-qt/qt5/qtscxml_git.bb
+++ b/recipes-qt/qt5/qtscxml_git.bb
@@ -10,10 +10,10 @@ require qt5-git.inc
10 10
11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" 11DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
12 12
13SRCREV = "eff82ac957e051f16f64c287f2dfaec9049bdfc1" 13SRCREV = "a1dff1a11ad303a1f82f181e6386194de90ec08f"
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.1 16# 5.9.meta-qt5.2
17SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch" 17SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch"
18 18
19do_install_append_class-nativesdk() { 19do_install_append_class-nativesdk() {
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 17d06394..6b2c28e3 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 \
7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
9 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
10 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ 6 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
11 file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ 7 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
8 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
9 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
10 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
12" 11"
13 12
14DEPENDS += "qtbase qtdeclarative" 13DEPENDS += "qtbase qtdeclarative"
15 14
16SRCREV = "0c3c4d01ea34ed98a0d2928662f07b673f00535d" 15SRCREV = "1673dbed00ba68209b6de95981f1e3b4a2a24682"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 93a826bd..d3a83a72 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 = "1d37c357c843a2622d2af7e1684576e19a8c7c30"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index 957000c4..056e2377 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 = "93b539140c06da07d330c9ecad67ab5ed3f9b0c8"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index fb8d44e1..40854e0b 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 = "0fcd0160662941a9ba800b36671e88d82790bd95"
diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb
index 7c155a28..911a7098 100644
--- a/recipes-qt/qt5/qtsystems_git.bb
+++ b/recipes-qt/qt5/qtsystems_git.bb
@@ -30,4 +30,4 @@ do_install_append() {
30 30
31QT_MODULE_BRANCH = "dev" 31QT_MODULE_BRANCH = "dev"
32 32
33SRCREV = "434af789f0d56ca7a521ca2d9ec8cf3b1057fd37" 33SRCREV = "f364358a817ba57fa5aa9c67e731241249e704f8"
diff --git a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch
index ed25390b..7549ce9c 100644
--- a/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch
+++ b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch
@@ -1,4 +1,4 @@
1From e0387540876944a20461d60d2208191c734e00b1 Mon Sep 17 00:00:00 2001 1From 0098107f710e363d41b4913758302b43adccf2bd Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Wed, 4 Jun 2014 11:28:16 +0200 3Date: Wed, 4 Jun 2014 11:28:16 +0200
4Subject: [PATCH] add noqtwebkit configuration 4Subject: [PATCH] add noqtwebkit configuration
@@ -16,16 +16,16 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
16 2 files changed, 3 insertions(+), 3 deletions(-) 16 2 files changed, 3 insertions(+), 3 deletions(-)
17 17
18diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro 18diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro
19index 540c9689..2312b521 100644 19index 82f55092..ef07ee03 100644
20--- a/src/assistant/assistant/assistant.pro 20--- a/src/assistant/assistant/assistant.pro
21+++ b/src/assistant/assistant/assistant.pro 21+++ b/src/assistant/assistant/assistant.pro
22@@ -1,4 +1,4 @@ 22@@ -1,4 +1,4 @@
23-false:qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) { 23-qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) {
24+false:qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) { 24+qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) {
25 # FIXME: currently broken
26 BROWSER = qtwebkit 25 BROWSER = qtwebkit
27 } else { 26 } else {
28@@ -76,7 +76,7 @@ SOURCES += aboutdialog.cpp \ 27 BROWSER = qtextbrowser
28@@ -75,7 +75,7 @@ SOURCES += aboutdialog.cpp \
29 openpagesmanager.cpp \ 29 openpagesmanager.cpp \
30 openpagesswitcher.cpp 30 openpagesswitcher.cpp
31 31
diff --git a/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch b/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch
index b2e017eb..80f2ae73 100644
--- a/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch
+++ b/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch
@@ -1,4 +1,4 @@
1From 779278a109450ae84d5deb2e1e1c0dd9b737f1a2 Mon Sep 17 00:00:00 2001 1From 105277d4878ee1627bfb3be3d10833020e6923fc Mon Sep 17 00:00:00 2001
2From: Cody P Schafer <dev@codyps.com> 2From: Cody P Schafer <dev@codyps.com>
3Date: Thu, 9 Jul 2015 11:28:19 -0400 3Date: Thu, 9 Jul 2015 11:28:19 -0400
4Subject: [PATCH] linguist-tools cmake: allow overriding the location for 4Subject: [PATCH] linguist-tools cmake: allow overriding the location for
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 871b0613..32d65d6a 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -15,7 +15,7 @@ inherit ptest
15DEPENDS += "qtbase qtdeclarative qtxmlpatterns" 15DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
16 16
17# Patches from https://github.com/meta-qt5/qttools/commits/b5.9 17# Patches from https://github.com/meta-qt5/qttools/commits/b5.9
18# 5.9.meta-qt5.1 18# 5.9.meta-qt5.2
19SRC_URI += " \ 19SRC_URI += " \
20 file://run-ptest \ 20 file://run-ptest \
21 file://0001-add-noqtwebkit-configuration.patch \ 21 file://0001-add-noqtwebkit-configuration.patch \
@@ -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 = "88e02bb0a9b97d68a4b270e4ddfb6d0847c702a9" 33SRCREV = "fdc5749b5603653c5d0c59db267f44fd1609457e"
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 822517f6..0238ce91 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 = "325a90e07e9dce4e5c915549e6c31a86423dfdd3"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch b/recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch
index 8518ae96..c74854f3 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch
+++ b/recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch
@@ -1,4 +1,4 @@
1From 78106c5b939cc7d84710fe4c8e2a356ac1f110ef Mon Sep 17 00:00:00 2001 1From 2e76f24615766593ad6eb182627fa9d0bdba3c2d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 12 Jul 2017 23:59:52 -0700 3Date: Wed, 12 Jul 2017 23:59:52 -0700
4Subject: [PATCH] include sys/time.h for timeval 4Subject: [PATCH] include sys/time.h for timeval
@@ -23,6 +23,3 @@ index 1b9673f..924be7b 100644
23 #ifdef _WIN32 23 #ifdef _WIN32
24 #include <winsock.h> // timeval 24 #include <winsock.h> // timeval
25 #else 25 #else
26--
272.13.2
28
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index ec1dc42f..122d0681 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
7" 7"
8 8
9# Patches from https://github.com/meta-qt5/qtvirtualkeyboard/commits/b5.9 9# Patches from https://github.com/meta-qt5/qtvirtualkeyboard/commits/b5.9
10# 5.9.meta-qt5.1 10# 5.9.meta-qt5.2
11SRC_URI += "file://0001-include-sys-time.h-for-timeval.patch" 11SRC_URI += "file://0001-include-sys-time.h-for-timeval.patch"
12 12
13# To enabled Nuance T9 Write support, you need to provide the licensed components 13# To enabled Nuance T9 Write support, you need to provide the licensed components
@@ -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 = "bdf61afe76e94ef03da1332c4540646f18f5852f" 56SRCREV = "dd8c39ea9312ec1441b3fdd830f9d42fe3258b58"
diff --git a/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch b/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
index a86868e9..11acd5fd 100644
--- a/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
+++ b/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
@@ -1,4 +1,4 @@
1From 434be8d326adb02b7b0960481f045dc1a443cfce Mon Sep 17 00:00:00 2001 1From c4fae91b3d2b2b0f64e3fafac456a6a917c69e88 Mon Sep 17 00:00:00 2001
2From: Raphael Freudiger <laser_b@gmx.ch> 2From: Raphael Freudiger <laser_b@gmx.ch>
3Date: Tue, 10 Jan 2017 15:49:55 +0100 3Date: Tue, 10 Jan 2017 15:49:55 +0100
4Subject: [PATCH] fix build without xkbcommon-evdev 4Subject: [PATCH] fix build without xkbcommon-evdev
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index cece86ed..9847f393 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -37,10 +37,10 @@ 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 = "7f70da6a644bc5b690066f0ab4814e1358f57e81"
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.1 43# 5.9.meta-qt5.2
44# From https://bugreports.qt.io/browse/QTBUG-57767 44# From https://bugreports.qt.io/browse/QTBUG-57767
45SRC_URI += " \ 45SRC_URI += " \
46 file://0001-fix-build-without-xkbcommon-evdev.patch \ 46 file://0001-fix-build-without-xkbcommon-evdev.patch \
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index f1167a9e..7e12a337 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -3,18 +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.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ 6 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
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 \ 10 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
13 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
14 file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
15 file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
16" 11"
17 12
18DEPENDS += "qtdeclarative qtwebsockets" 13DEPENDS += "qtdeclarative qtwebsockets"
19 14
20SRCREV = "6383f0fc5eec4935697a6d2d2f87b511bbeb678e" 15SRCREV = "b5229df6a08a902b11a2fc9529af6385f4d985d5"
diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
index 44c3f0b2..0e9ea724 100644
--- a/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
@@ -1,4 +1,4 @@
1From 1634633d27cea7369111c9ea6d08be8515c15ccd Mon Sep 17 00:00:00 2001 1From d559da6ab0834aeb7307008015b6232e586fea00 Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com> 2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Thu, 24 Dec 2015 12:46:58 -0200 3Date: Thu, 24 Dec 2015 12:46:58 -0200
4Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX 4Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX
diff --git a/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch
index a91a2982..275ef9e8 100644
--- a/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch
@@ -1,4 +1,4 @@
1From 491576d7e67d00b93106592140e5d7f0f34ea641 Mon Sep 17 00:00:00 2001 1From 96746f09947cc36f6c9fc8631bc6a6e7f59efe24 Mon Sep 17 00:00:00 2001
2From: Frieder Schrempf <frieder.schrempf@online.de> 2From: Frieder Schrempf <frieder.schrempf@online.de>
3Date: Mon, 1 Dec 2014 14:34:40 +0000 3Date: Mon, 1 Dec 2014 14:34:40 +0000
4Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform 4Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform
@@ -12,10 +12,10 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12 1 file changed, 6 insertions(+) 12 1 file changed, 6 insertions(+)
13 13
14diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf 14diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
15index eb421f8b..4513742d 100644 15index 56894e58..ef418a4c 100644
16--- a/mkspecs/features/functions.prf 16--- a/mkspecs/features/functions.prf
17+++ b/mkspecs/features/functions.prf 17+++ b/mkspecs/features/functions.prf
18@@ -33,6 +33,12 @@ defineTest(isPlatformSupported) { 18@@ -21,6 +21,12 @@ defineTest(isPlatformSupported) {
19 return(false) 19 return(false)
20 } 20 }
21 gcc:!clang:!isGCCVersionSupported(): return(false) 21 gcc:!clang:!isGCCVersionSupported(): return(false)
diff --git a/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch b/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
index d5567c35..6ada3f94 100644
--- a/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
+++ b/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
@@ -1,4 +1,4 @@
1From 6b48d76b5af38a49f8e438e45c387f01b263e483 Mon Sep 17 00:00:00 2001 1From 06e9e7844ffa2b6985e5fa7a1c475c8a54ca252a Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com> 2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Fri, 25 Dec 2015 18:16:05 -0200 3Date: Fri, 25 Dec 2015 18:16:05 -0200
4Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor 4Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor
@@ -9,7 +9,7 @@ Signed-off-by: Cleiton Bueno <cleitonrbueno@gmail.com>
9 1 file changed, 2 insertions(+) 9 1 file changed, 2 insertions(+)
10 10
11diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h 11diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
12index 2ecd70d7..703d1a92 100644 12index 19ecf5e1..f6f638ee 100644
13--- a/src/webengine/api/qquickwebengineview_p_p.h 13--- a/src/webengine/api/qquickwebengineview_p_p.h
14+++ b/src/webengine/api/qquickwebengineview_p_p.h 14+++ b/src/webengine/api/qquickwebengineview_p_p.h
15@@ -59,6 +59,8 @@ 15@@ -59,6 +59,8 @@
diff --git a/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch
index 5f9eb3a7..4a1a975f 100644
--- a/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch
@@ -1,4 +1,4 @@
1From b1a6f73d49a340e99145a4c4cf70dc796ed632ff Mon Sep 17 00:00:00 2001 1From a0b1a742813d0846472fab4aada2388bf2d42d80 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 15 Mar 2017 13:53:28 +0200 3Date: Wed, 15 Mar 2017 13:53:28 +0200
4Subject: [PATCH] chromium: Force host toolchain configuration 4Subject: [PATCH] chromium: Force host toolchain configuration
diff --git a/recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch
index 2fa1764d..8c0484bd 100644
--- a/recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch
+++ b/recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch
@@ -1,4 +1,4 @@
1From 95a6e3fd9e8498cb1f59120d402ec8ecfcd3ec59 Mon Sep 17 00:00:00 2001 1From bfd5e19fea1315d10b3217acaf92dfc32018ad03 Mon Sep 17 00:00:00 2001
2From: Cleiton Bueno <cleitonrbueno@gmail.com> 2From: Cleiton Bueno <cleitonrbueno@gmail.com>
3Date: Thu, 24 Dec 2015 15:59:51 -0200 3Date: Thu, 24 Dec 2015 15:59:51 -0200
4Subject: [PATCH] Include dependency to QCoreApplication::translate() 4Subject: [PATCH] Include dependency to QCoreApplication::translate()
diff --git a/recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
index 8785842a..d3c7a315 100644
--- a/recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
+++ b/recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
@@ -1,4 +1,4 @@
1From 8910e65fd777120261f16c4a35ace2b0dc6181b3 Mon Sep 17 00:00:00 2001 1From 6d4d1b4cd380c51a6709c97524fbce0e0f09ce39 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:01:12 -0700 3Date: Fri, 7 Jul 2017 14:01:12 -0700
4Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not 4Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not
diff --git a/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch
index 142595a3..258afd53 100644
--- a/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch
+++ b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch
@@ -1,4 +1,4 @@
1From e81f0a5139f8f1ea131438def3fe1aabe997aeff Mon Sep 17 00:00:00 2001 1From 5106be504b7edb7bc75309d581dfd33a89ed04fc Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io> 2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Wed, 15 Mar 2017 13:53:28 +0200 3Date: Wed, 15 Mar 2017 13:53:28 +0200
4Subject: [PATCH] Force host toolchain configuration 4Subject: [PATCH] Force host toolchain configuration
@@ -13,10 +13,10 @@ Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
13 1 file changed, 6 insertions(+), 6 deletions(-) 13 1 file changed, 6 insertions(+), 6 deletions(-)
14 14
15diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro 15diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
16index fd27643e..f9acb6ff 100644 16index f1b3d47b..521c507b 100644
17--- a/src/buildtools/configure_host.pro 17--- a/src/buildtools/configure_host.pro
18+++ b/src/buildtools/configure_host.pro 18+++ b/src/buildtools/configure_host.pro
19@@ -28,9 +28,9 @@ GN_CONTENTS = \ 19@@ -29,9 +29,9 @@ GN_CONTENTS = \
20 "import(\"//build/config/sysroot.gni\")" \ 20 "import(\"//build/config/sysroot.gni\")" \
21 "import(\"//build/toolchain/gcc_toolchain.gni\")" \ 21 "import(\"//build/toolchain/gcc_toolchain.gni\")" \
22 "gcc_toolchain(\"host\") {" \ 22 "gcc_toolchain(\"host\") {" \
@@ -29,7 +29,7 @@ index fd27643e..f9acb6ff 100644
29 " ar = \"$$which(ar)\" " \ 29 " ar = \"$$which(ar)\" " \
30 " nm = \"$$which(nm)\" " \ 30 " nm = \"$$which(nm)\" " \
31 " toolchain_args = { " \ 31 " toolchain_args = { " \
32@@ -41,9 +41,9 @@ GN_CONTENTS = \ 32@@ -42,9 +42,9 @@ GN_CONTENTS = \
33 " } " \ 33 " } " \
34 "}" \ 34 "}" \
35 "gcc_toolchain(\"v8_snapshot\") {" \ 35 "gcc_toolchain(\"v8_snapshot\") {" \
diff --git a/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
index 05b813b2..71e36bbd 100644
--- a/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
+++ b/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
@@ -1,4 +1,4 @@
1From 86f467724070e854c8c6b13269951c97c0832dae Mon Sep 17 00:00:00 2001 1From 6d92d4b6f7adf913da77b4aae837a5880e64aa21 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:09:06 -0700 3Date: Fri, 7 Jul 2017 14:09:06 -0700
4Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux 4Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux
diff --git a/recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch b/recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch
deleted file mode 100644
index c63086d5..00000000
--- a/recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch
+++ /dev/null
@@ -1,241 +0,0 @@
1From a8c0deca850ca519b3f146c71492a8f42a33dd84 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?J=C3=BCri=20Valdmann?= <juri.valdmann@qt.io>
3Date: Tue, 20 Jun 2017 15:36:43 +0200
4Subject: [PATCH] Always compile QWebEnginePage::print
5
6- Remove two out of five layers of ifdefs around and inside this method.
7- Now always compiled but will yield an error if printing is disabled.
8- Remove printing-related ifdefs from demobrowser.
9
10Task-number: QTBUG-61510
11Change-Id: I79781189d3d3fb62db0a2216b2b989e3fa1d1f86
12Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
13Reviewed-by: Rolf Eike Beer <eb@emlix.com>
14---
15 examples/webenginewidgets/demobrowser/browsermainwindow.cpp | 12 ------------
16 examples/webenginewidgets/demobrowser/browsermainwindow.h | 6 ------
17 examples/webenginewidgets/demobrowser/printtopdfdialog.cpp | 7 -------
18 src/webenginewidgets/api/qwebenginepage.cpp | 10 ++--------
19 src/webenginewidgets/api/qwebenginepage.h | 8 --------
20 5 files changed, 2 insertions(+), 41 deletions(-)
21
22diff --git a/examples/webenginewidgets/demobrowser/browsermainwindow.cpp b/examples/webenginewidgets/demobrowser/browsermainwindow.cpp
23index 327d7a9d..14d49f7f 100644
24--- a/examples/webenginewidgets/demobrowser/browsermainwindow.cpp
25+++ b/examples/webenginewidgets/demobrowser/browsermainwindow.cpp
26@@ -109,9 +109,7 @@ BrowserMainWindow::BrowserMainWindow(QWidget *parent, Qt::WindowFlags flags)
27 , m_historyForward(0)
28 , m_stop(0)
29 , m_reload(0)
30-#ifndef QT_NO_PRINTER
31 , m_currentPrinter(nullptr)
32-#endif
33 {
34 setToolButtonStyle(Qt::ToolButtonFollowStyle);
35 setAttribute(Qt::WA_DeleteOnClose, true);
36@@ -312,9 +310,7 @@ void BrowserMainWindow::setupMenu()
37 #if defined(QWEBENGINEPAGE_PRINT)
38 fileMenu->addAction(tr("P&rint Preview..."), this, SLOT(slotFilePrintPreview()));
39 #endif
40-#ifndef QT_NO_PRINTER
41 fileMenu->addAction(tr("&Print..."), this, SLOT(slotFilePrint()), QKeySequence::Print);
42-#endif
43 fileMenu->addAction(tr("&Print to PDF..."), this, SLOT(slotFilePrintToPDF()));
44 fileMenu->addSeparator();
45
46@@ -702,23 +698,19 @@ void BrowserMainWindow::slotFileOpen()
47
48 void BrowserMainWindow::slotFilePrintPreview()
49 {
50-#ifndef QT_NO_PRINTPREVIEWDIALOG
51 if (!currentTab())
52 return;
53 QPrintPreviewDialog *dialog = new QPrintPreviewDialog(this);
54 connect(dialog, SIGNAL(paintRequested(QPrinter*)),
55 currentTab(), SLOT(print(QPrinter*)));
56 dialog->exec();
57-#endif
58 }
59
60 void BrowserMainWindow::slotFilePrint()
61 {
62-#ifndef QT_NO_PRINTER
63 if (!currentTab())
64 return;
65 printRequested(currentTab()->page());
66-#endif
67 }
68
69 void BrowserMainWindow::slotHandlePdfPrinted(const QByteArray& result)
70@@ -751,7 +743,6 @@ void BrowserMainWindow::slotFilePrintToPDF()
71 currentTab()->page()->printToPdf(invoke(this, &BrowserMainWindow::slotHandlePdfPrinted), dialog->pageLayout());
72 }
73
74-#ifndef QT_NO_PRINTER
75 void BrowserMainWindow::slotHandlePagePrinted(bool result)
76 {
77 Q_UNUSED(result);
78@@ -763,7 +754,6 @@ void BrowserMainWindow::slotHandlePagePrinted(bool result)
79
80 void BrowserMainWindow::printRequested(QWebEnginePage *page)
81 {
82-#ifndef QT_NO_PRINTDIALOG
83 if (m_currentPrinter)
84 return;
85 m_currentPrinter = new QPrinter();
86@@ -774,9 +764,7 @@ void BrowserMainWindow::printRequested(QWebEnginePage *page)
87 return;
88 }
89 page->print(m_currentPrinter, invoke(this, &BrowserMainWindow::slotHandlePagePrinted));
90-#endif
91 }
92-#endif
93
94 void BrowserMainWindow::slotPrivateBrowsing()
95 {
96diff --git a/examples/webenginewidgets/demobrowser/browsermainwindow.h b/examples/webenginewidgets/demobrowser/browsermainwindow.h
97index 91e1c1d2..5bbbb292 100644
98--- a/examples/webenginewidgets/demobrowser/browsermainwindow.h
99+++ b/examples/webenginewidgets/demobrowser/browsermainwindow.h
100@@ -56,9 +56,7 @@
101 #include <QtCore/QUrl>
102
103 QT_BEGIN_NAMESPACE
104-#ifndef QT_NO_PRINTER
105 class QPrinter;
106-#endif
107 class QWebEnginePage;
108 QT_END_NAMESPACE
109
110@@ -142,10 +140,8 @@ private slots:
111 void slotSwapFocus();
112 void slotHandlePdfPrinted(const QByteArray&);
113
114-#ifndef QT_NO_PRINTER
115 void slotHandlePagePrinted(bool result);
116 void printRequested(QWebEnginePage *page);
117-#endif
118 void geometryChangeRequested(const QRect &geometry);
119 void updateToolbarActionText(bool visible);
120 void updateBookmarksToolbarActionText(bool visible);
121@@ -180,9 +176,7 @@ private:
122 QAction *m_restoreLastSession;
123 QAction *m_addBookmark;
124
125-#ifndef QT_NO_PRINTER
126 QPrinter *m_currentPrinter;
127-#endif
128
129 QIcon m_reloadIcon;
130 QIcon m_stopIcon;
131diff --git a/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp b/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp
132index 0f3b1765..50a8bb91 100644
133--- a/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp
134+++ b/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp
135@@ -52,10 +52,8 @@
136 #include "ui_printtopdfdialog.h"
137
138 #include <QtCore/QDir>
139-#ifndef QT_NO_PRINTER
140 #include <QtPrintSupport/QPageSetupDialog>
141 #include <QtPrintSupport/QPrinter>
142-#endif // QT_NO_PRINTER
143 #include <QtWidgets/QFileDialog>
144
145 PrintToPdfDialog::PrintToPdfDialog(const QString &filePath, QWidget *parent) :
146@@ -66,11 +64,8 @@ PrintToPdfDialog::PrintToPdfDialog(const QString &filePath, QWidget *parent) :
147 ui->setupUi(this);
148 setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
149 connect(ui->chooseFilePathButton, &QToolButton::clicked, this, &PrintToPdfDialog::onChooseFilePathButtonClicked);
150-#ifndef QT_NO_PRINTER
151 connect(ui->choosePageLayoutButton, &QToolButton::clicked, this, &PrintToPdfDialog::onChoosePageLayoutButtonClicked);
152-#else
153 ui->choosePageLayoutButton->hide();
154-#endif // QT_NO_PRINTER
155 updatePageLayoutLabel();
156 setFilePath(filePath);
157 }
158@@ -82,7 +77,6 @@ PrintToPdfDialog::~PrintToPdfDialog()
159
160 void PrintToPdfDialog::onChoosePageLayoutButtonClicked()
161 {
162-#ifndef QT_NO_PRINTER
163 QPrinter printer;
164 printer.setPageLayout(currentPageLayout);
165
166@@ -92,7 +86,6 @@ void PrintToPdfDialog::onChoosePageLayoutButtonClicked()
167 currentPageLayout.setPageSize(printer.pageLayout().pageSize());
168 currentPageLayout.setOrientation(printer.pageLayout().orientation());
169 updatePageLayoutLabel();
170-#endif // QT_NO_PRINTER
171 }
172
173 void PrintToPdfDialog::onChooseFilePathButtonClicked()
174diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
175index 82720ae3..20d3268c 100644
176--- a/src/webenginewidgets/api/qwebenginepage.cpp
177+++ b/src/webenginewidgets/api/qwebenginepage.cpp
178@@ -80,11 +80,9 @@
179 #include <QMenu>
180 #include <QMessageBox>
181 #include <QMimeData>
182-#if defined(QT_PRINTSUPPORT_LIB)
183-#ifndef QT_NO_PRINTER
184+#ifdef ENABLE_PRINTING
185 #include <QPrinter>
186-#endif //QT_NO_PRINTER
187-#endif //QT_PRINTSUPPORT_LIB
188+#endif
189 #include <QStandardPaths>
190 #include <QStyle>
191 #include <QTimer>
192@@ -2052,8 +2050,6 @@ void QWebEnginePage::printToPdf(const QWebEngineCallback<const QByteArray&> &res
193 #endif // if defined(ENABLE_PDF)
194 }
195
196-#if defined(QT_PRINTSUPPORT_LIB)
197-#ifndef QT_NO_PRINTER
198 /*!
199 \fn void QWebEnginePage::print(QPrinter *printer, FunctorOrLambda resultCallback)
200 Renders the current content of the page into a temporary PDF document, then prints it using \a printer.
201@@ -2090,8 +2086,6 @@ void QWebEnginePage::print(QPrinter *printer, const QWebEngineCallback<bool> &re
202 d->m_callbacks.invokeDirectly(resultCallback, false);
203 #endif // if defined(ENABLE_PDF)
204 }
205-#endif // if defined(QT_NO_PRINTER)
206-#endif // if defined(QT_PRINTSUPPORT_LIB)
207
208 /*!
209 \since 5.7
210diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
211index c7d5a19e..5619639c 100644
212--- a/src/webenginewidgets/api/qwebenginepage.h
213+++ b/src/webenginewidgets/api/qwebenginepage.h
214@@ -55,11 +55,7 @@
215
216 QT_BEGIN_NAMESPACE
217 class QMenu;
218-#if defined(QT_PRINTSUPPORT_LIB)
219-#ifndef QT_NO_PRINTER
220 class QPrinter;
221-#endif // QT_NO_PRINTER
222-#endif // QT_PRINTSUPPORT_LIB
223
224 class QWebChannel;
225 class QWebEngineContextMenuData;
226@@ -294,15 +290,11 @@ public:
227 void printToPdf(const QWebEngineCallback<const QByteArray&> &resultCallback, const QPageLayout &layout = QPageLayout(QPageSize(QPageSize::A4), QPageLayout::Portrait, QMarginsF()));
228 #endif
229
230-#if defined(QT_PRINTSUPPORT_LIB)
231-#ifndef QT_NO_PRINTER
232 #ifdef Q_QDOC
233 void print(QPrinter *printer, FunctorOrLambda resultCallback);
234 #else
235 void print(QPrinter *printer, const QWebEngineCallback<bool> &resultCallback);
236 #endif // QDOC
237-#endif // QT_NO_PRINTER
238-#endif // QT_PRINTSUPPORT_LIB
239
240 const QWebEngineContextMenuData &contextMenuData() const;
241
diff --git a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch
index 2d7bd02b..00c875b0 100644
--- a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch
+++ b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch
@@ -1,4 +1,4 @@
1From 0a409a773f2b2936a2f1868d983e7bd1c92110bd Mon Sep 17 00:00:00 2001 1From 8780db69819ba37c8e2364ba361b03badf3c3ee4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:37:49 -0700 3Date: Fri, 7 Jul 2017 14:37:49 -0700
4Subject: [PATCH] chromium: musl: include fcntl.h for loff_t 4Subject: [PATCH] chromium: musl: include fcntl.h for loff_t
diff --git a/recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
index f58de8f2..085cb012 100644
--- a/recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
+++ b/recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
@@ -1,4 +1,4 @@
1From 375b70a99760c156b45e60def9bafd04902fb5a4 Mon Sep 17 00:00:00 2001 1From b360b036bb1ad31a74c056ce5d19e0271d75ff57 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:38:37 -0700 3Date: Fri, 7 Jul 2017 14:38:37 -0700
4Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t 4Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t
diff --git a/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch
index c3b1cbb2..e23cabe3 100644
--- a/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch
+++ b/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch
@@ -1,4 +1,4 @@
1From 314cfb7b41be8fc4f962956e0acd34f110114c6e Mon Sep 17 00:00:00 2001 1From 455a6603a33a87dfb7ab85a09587f534d9f5d984 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:54:38 -0700 3Date: Fri, 7 Jul 2017 14:54:38 -0700
4Subject: [PATCH] chromium: musl: linux != glibc, make the distinction 4Subject: [PATCH] chromium: musl: linux != glibc, make the distinction
diff --git a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
index 550fd79e..53e8a817 100644
--- a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
+++ b/recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
@@ -1,4 +1,4 @@
1From bc3745992889e3dc3b42c890b6a458038c6994e0 Mon Sep 17 00:00:00 2001 1From aa3bfc656b3c84aba04c8294ad17c630141f4b09 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 15:09:02 -0700 3Date: Fri, 7 Jul 2017 15:09:02 -0700
4Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols 4Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols
diff --git a/recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch b/recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
index 82a2ccc5..385e729d 100644
--- a/recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
+++ b/recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
@@ -1,4 +1,4 @@
1From de4e672044de11c5927aeb42a554f5eced0abf6c Mon Sep 17 00:00:00 2001 1From 85b21493f19bd2046f84836e03f0a9c32862bce8 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 15:12:39 -0700 3Date: Fri, 7 Jul 2017 15:12:39 -0700
4Subject: [PATCH] chromium: musl: Use correct member name __si_fields from 4Subject: [PATCH] chromium: musl: Use correct member name __si_fields from
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 98797493..2815cb9b 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -16,7 +16,7 @@ DEPENDS += " \
16 ninja-native \ 16 ninja-native \
17 yasm-native \ 17 yasm-native \
18 qtwebchannel \ 18 qtwebchannel \
19 qtbase qtdeclarative qtxmlpatterns qtquickcontrols \ 19 qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtquickcontrols2 \
20 qtlocation \ 20 qtlocation \
21 libdrm fontconfig pixman openssl pango cairo icu pciutils \ 21 libdrm fontconfig pixman openssl pango cairo icu pciutils \
22 libcap \ 22 libcap \
@@ -130,18 +130,17 @@ RDEPENDS_${PN}-examples += " \
130QT_MODULE_BRANCH_CHROMIUM = "56-based" 130QT_MODULE_BRANCH_CHROMIUM = "56-based"
131 131
132# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9 132# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9
133# 5.9.meta-qt5.1 133# 5.9.meta-qt5.2
134SRC_URI += " \ 134SRC_URI += " \
135 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \ 135 ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
136 file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \ 136 file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \
137 file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \ 137 file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \
138 file://0003-Include-dependency-to-QCoreApplication-translate.patch \ 138 file://0003-Include-dependency-to-QCoreApplication-translate.patch \
139 file://0004-Force-host-toolchain-configuration.patch \ 139 file://0004-Force-host-toolchain-configuration.patch \
140 file://0005-Always-compile-QWebEnginePage-print.patch \
141" 140"
142 141
143# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based 142# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based
144# 56-based.meta-qt5.1 143# 56-based.meta-qt5.2
145SRC_URI += " \ 144SRC_URI += " \
146 file://0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \ 145 file://0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \
147 file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \ 146 file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \
@@ -163,8 +162,8 @@ SRC_URI_append_libc-musl = "\
163 file://0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \ 162 file://0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \
164" 163"
165 164
166SRCREV_qtwebengine = "73f7be5b2a95eab3dce11caede538eeb7beb71f2" 165SRCREV_qtwebengine = "99f84ffd2c0c78014a24534a863aa1c755abd51c"
167SRCREV_chromium = "aa2fdd6be3d465280d2a0c3aacdc738bb4ffec05" 166SRCREV_chromium = "21508b5b5421f10ba8627c3c66c5281efb39b2f9"
168SRCREV = "${SRCREV_qtwebengine}" 167SRCREV = "${SRCREV_qtwebengine}"
169 168
170SRCREV_FORMAT = "qtwebengine_chromium" 169SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb
index 286aecae..3e3e4a0b 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 = "a24c780b60d7d8bc00c4a48042cf7f32db777d55"
diff --git a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
index d393dc41..764b0305 100644
--- a/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
+++ b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
@@ -1,4 +1,4 @@
1From f8bcac01fd5d95d0df8342809c53917aff1bf798 Mon Sep 17 00:00:00 2001 1From c4e691a8dd2037d9b359e0de9d4790da9078f74e Mon Sep 17 00:00:00 2001
2From: Trevor Woerner <trevor.woerner@linaro.org> 2From: Trevor Woerner <trevor.woerner@linaro.org>
3Date: Fri, 7 Feb 2014 04:07:17 +0100 3Date: Fri, 7 Feb 2014 04:07:17 +0100
4Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH) 4Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH)
diff --git a/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch b/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch
index 147a7baa..cec6376d 100644
--- a/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch
+++ b/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch
@@ -1,4 +1,4 @@
1From 5d4f3219be0b66d63765e077644a51e18b1f4502 Mon Sep 17 00:00:00 2001 1From fc2773961eaa536e6a617ded7c1a972d979fa2e4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 5 Jun 2015 19:55:05 -0700 3Date: Fri, 5 Jun 2015 19:55:05 -0700
4Subject: [PATCH] Exclude backtrace() API for non-glibc libraries 4Subject: [PATCH] Exclude backtrace() API for non-glibc libraries
diff --git a/recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch b/recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch
deleted file mode 100644
index debbda1e..00000000
--- a/recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch
+++ /dev/null
@@ -1,89 +0,0 @@
1From 240bd33ba3e78fcc0e5e3299d9e0e53299ea07f8 Mon Sep 17 00:00:00 2001
2From: Konstantin Tokarev <annulen@yandex.ru>
3Date: Thu, 4 May 2017 15:12:37 +0300
4Subject: [PATCH] Fix compilation with ICU 59
5
6Upstream fix: https://bugs.webkit.org/show_bug.cgi?id=171612
7
8Task-number: QTBUG-60532
9Change-Id: I6014feea213aa70ebe40b09d9d1a03fd1ed3c843
10Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
11---
12 Source/JavaScriptCore/API/JSStringRef.cpp | 6 +++---
13 Source/JavaScriptCore/runtime/DateConversion.cpp | 3 ++-
14 Source/WTF/wtf/TypeTraits.h | 3 +++
15 Source/WebKit2/Shared/API/c/WKString.cpp | 2 +-
16 4 files changed, 9 insertions(+), 5 deletions(-)
17
18diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp
19index 812f3d413..77a3fd0f4 100644
20--- a/Source/JavaScriptCore/API/JSStringRef.cpp
21+++ b/Source/JavaScriptCore/API/JSStringRef.cpp
22@@ -37,7 +37,7 @@ using namespace WTF::Unicode;
23 JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars)
24 {
25 initializeThreading();
26- return OpaqueJSString::create(chars, numChars).leakRef();
27+ return OpaqueJSString::create(reinterpret_cast<const UChar*>(chars), numChars).leakRef();
28 }
29
30 JSStringRef JSStringCreateWithUTF8CString(const char* string)
31@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string)
32 JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars)
33 {
34 initializeThreading();
35- return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef();
36+ return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast<const UChar*>(chars), numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef();
37 }
38
39 JSStringRef JSStringRetain(JSStringRef string)
40@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string)
41
42 const JSChar* JSStringGetCharactersPtr(JSStringRef string)
43 {
44- return string->characters();
45+ return reinterpret_cast<const JSChar*>(string->characters());
46 }
47
48 size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)
49diff --git a/Source/JavaScriptCore/runtime/DateConversion.cpp b/Source/JavaScriptCore/runtime/DateConversion.cpp
50index 0b57f012d..05e27338b 100644
51--- a/Source/JavaScriptCore/runtime/DateConversion.cpp
52+++ b/Source/JavaScriptCore/runtime/DateConversion.cpp
53@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, DateTimeFormat format, bool as
54 #if OS(WINDOWS)
55 TIME_ZONE_INFORMATION timeZoneInformation;
56 GetTimeZoneInformation(&timeZoneInformation);
57- const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
58+ const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
59+ String timeZoneName(reinterpret_cast<const UChar*>(winTimeZoneName));
60 #else
61 struct tm gtm = t;
62 char timeZoneName[70];
63diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h
64index 9df2c95cf..f5d6121fd 100644
65--- a/Source/WTF/wtf/TypeTraits.h
66+++ b/Source/WTF/wtf/TypeTraits.h
67@@ -72,6 +72,9 @@ namespace WTF {
68 template<> struct IsInteger<unsigned long> { static const bool value = true; };
69 template<> struct IsInteger<long long> { static const bool value = true; };
70 template<> struct IsInteger<unsigned long long> { static const bool value = true; };
71+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(_HAS_CHAR16_T_LANGUAGE_SUPPORT) && _HAS_CHAR16_T_LANGUAGE_SUPPORT)
72+ template<> struct IsInteger<char16_t> { static const bool value = true; };
73+#endif
74 #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
75 template<> struct IsInteger<wchar_t> { static const bool value = true; };
76 #endif
77diff --git a/Source/WebKit2/Shared/API/c/WKString.cpp b/Source/WebKit2/Shared/API/c/WKString.cpp
78index cbac67dd8..23400a64e 100644
79--- a/Source/WebKit2/Shared/API/c/WKString.cpp
80+++ b/Source/WebKit2/Shared/API/c/WKString.cpp
81@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef)
82 size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength)
83 {
84 COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar);
85- return (toImpl(stringRef)->getCharacters(static_cast<UChar*>(buffer), bufferLength));
86+ return (toImpl(stringRef)->getCharacters(reinterpret_cast<UChar*>(buffer), bufferLength));
87 }
88
89 size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef)
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 0792c4ad..8b3c3f50 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -19,11 +19,10 @@ ARM_INSTRUCTION_SET_armv4 = "arm"
19ARM_INSTRUCTION_SET_armv5 = "arm" 19ARM_INSTRUCTION_SET_armv5 = "arm"
20 20
21# Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.9 21# Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.9
22# 5.9.meta-qt5.1 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://0002-Exclude-backtrace-API-for-non-glibc-libraries.patch \ 25 file://0002-Exclude-backtrace-API-for-non-glibc-libraries.patch \
26 file://0003-Fix-compilation-with-ICU-59.patch \
27" 26"
28 27
29PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel \ 28PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel \
@@ -88,4 +87,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db
88RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" 87RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
89export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" 88export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
90 89
91SRCREV = "f27089657a207ef8c5c9d27d661d3d12c3af8df2" 90SRCREV = "97c4a80a1282c8c3eaa343011286b76fd4838c5f"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index 41ec27f6..448ce5c4 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 & (GPL-3 | LGPL-3.0)"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ 6 file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
7 file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ 7 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
8 file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ 8 file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
9 file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \ 9 file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
10" 10"
11 11
12DEPENDS += "qtbase qtdeclarative" 12DEPENDS += "qtbase qtdeclarative"
13 13
14SRCREV = "1421c3e4ae4213ca18f2f51d5ddb38e223450222" 14SRCREV = "fb71c823a7ae823345518ca33ccfe273fcf76494"
diff --git a/recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch b/recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch
deleted file mode 100644
index 82087b9a..00000000
--- a/recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1From b946b6ea4a2a30bd12ecd036e40c9ef671681ba8 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Fri, 2 Jun 2017 13:12:18 +0300
4Subject: [PATCH] Add missing include for qWarning
5
6Change-Id: I7c7699e7a2b7ce59e4f659d460ec835f59bba439
7---
8 src/webview/qquickwebview.cpp | 1 +
9 1 file changed, 1 insertion(+)
10
11diff --git a/src/webview/qquickwebview.cpp b/src/webview/qquickwebview.cpp
12index d760564..fbbbfd6 100644
13--- a/src/webview/qquickwebview.cpp
14+++ b/src/webview/qquickwebview.cpp
15@@ -39,6 +39,7 @@
16 #include <QtWebView/private/qwebviewloadrequest_p.h>
17 #include <QtQml/qqmlengine.h>
18 #include <QtCore/qmutex.h>
19+#include <QtCore/QDebug>
20
21 namespace {
22
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index 8b79aa1c..0bbb09ea 100644
--- a/recipes-qt/qt5/qtwebview_git.bb
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -9,10 +9,6 @@ LIC_FILES_CHKSUM = " \
9require qt5.inc 9require qt5.inc
10require qt5-git.inc 10require qt5-git.inc
11 11
12# Patches from https://github.com/meta-qt5/qtwebview/commits/b5.9
13# 5.9.meta-qt5.1
14SRC_URI += "file://0001-Add-missing-include-for-qWarning.patch"
15
16DEPENDS += "qtbase qtwebengine" 12DEPENDS += "qtbase qtwebengine"
17 13
18COMPATIBLE_MACHINE = "(-)" 14COMPATIBLE_MACHINE = "(-)"
@@ -23,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
23COMPATIBLE_MACHINE_armv7ve = "(.*)" 19COMPATIBLE_MACHINE_armv7ve = "(.*)"
24COMPATIBLE_MACHINE_aarch64 = "(.*)" 20COMPATIBLE_MACHINE_aarch64 = "(.*)"
25 21
26SRCREV = "6e55abf3b6a5f373cd4b649c2318a45c49b40589" 22SRCREV = "e4016a67bbffefed71a407494e249e978d212b3d"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index bf03e9bb..ed1440c1 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 = "f65d50eb063ad3c9a1d6f008f66e881d2e15f1d8"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 30e52629..7c18079a 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 = "c1c3af0ae456247c9bcd30161d51a94c9b38dc52" 20SRCREV = "fcfa824402bb4edaf644fad786dac3560c743ebe"
21 21
22BBCLASSEXTEND =+ "native nativesdk" 22BBCLASSEXTEND =+ "native nativesdk"
23 23