Skip to contentSkip to conversation

qtbase, qtgraphicaleffect, qtmultimedia, qtscript, qtlocation, qtwayland: disable gold to work around binutils bug

PATCH In review Martin Jansa 2 participants 12 messages Aug 21, 2017 – Aug 25, 2017

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/7 qtbase, qtgraphicaleffect, qtmultimedia, qtscript, qtlocation, qtwayland: disable gold to work around binutils bug

---
 recipes-qt/qt5/qtbase_git.bb             | 25 ++++++++++++++++++++++++-
 recipes-qt/qt5/qtgraphicaleffects_git.bb |  4 ++++
 recipes-qt/qt5/qtlocation_git.bb         |  4 ++++
 recipes-qt/qt5/qtmultimedia_git.bb       |  4 ++++
 recipes-qt/qt5/qtscript_git.bb           |  4 ++++
 recipes-qt/qt5/qtwayland_git.bb          |  4 ++++
 6 files changed, 44 insertions(+), 1 deletion(-)
recipes-qt/qt5/qtbase_git.bb +24 -1
index 8cd23a0..550968c 100644
@@ -41,6 +41,28 @@ SRC_URI += "\
 # for syncqt
 RDEPENDS_${PN}-tools += "perl"
 
+# workaround for gold bug:
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=842304
+# https://sourceware.org/bugzilla/show_bug.cgi?id=21712
+# it's triggered only in combination of gold and security_flags.inc,
+# because security_flags.inc now enable pie by default.
+# Adding -no-pie or changing -fuse-ld=gold to -fuse-ld=bfd
+# works around this issue, will use -fuse-ld=bfd as it's considered
+# binutils bug.
+# OE @ ~/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/build/tests/auto/corelib/kernel/qmetatype $ i586-oe-linux-g++  -m32 -march=i586 --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/recipe-sysroot -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/recipe-sysroot -Wl,-O1 -fuse-ld=gold -Wl,--enable-new-dtags -o tst_qmetatype .obj/tst_qmetatype.o   -L/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/build/lib -lQt5Test -lQt5Core -lpthread
+# .obj/tst_qmetatype.o(.qtversion+0x0): error: unexpected reloc 3 against global symbol qt_version_tag without base register in object file when generating a position-independent output file
+# collect2: error: ld returned 1 exit status
+#
+# with -no-pie:
+# OE @ ~/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/build/tests/auto/corelib/kernel/qmetatype $ i586-oe-linux-g++ -no-pie -m32 -march=i586 --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/recipe-sysroot -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/recipe-sysroot -Wl,-O1 -fuse-ld=gold -Wl,--enable-new-dtags -o tst_qmetatype .obj/tst_qmetatype.o   -L/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/build/lib -lQt5Test -lQt5Core -lpthread
+#
+# with -fuse-ld=gold replaced with -fuse-ld=bfd:
+# OE @ ~/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/build/tests/auto/corelib/kernel/qmetatype $ i586-oe-linux-g++  -m32 -march=i586 --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/recipe-sysroot -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed --sysroot=/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/recipe-sysroot -Wl,-O1 -fuse-ld=bfd -Wl,--enable-new-dtags -o tst_qmetatype .obj/tst_qmetatype.o   -L/OE/build/oe-core/tmp-glibc/work/i586-oe-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/build/lib -lQt5Test -lQt5Core -lpthread
+#
+# http://errors.yoctoproject.org/Errors/Details/150329/
+QT_CONFIG_FLAGS_GOLD_x86 = "-no-use-gold-linker"
+LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
+
 # separate some parts of PACKAGECONFIG which are often changed
 PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}"
 PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
@@ -129,8 +151,9 @@ PACKAGECONFIG[libproxy] = "-libproxy,-no-libproxy,libproxy"
 PACKAGECONFIG[libinput] = "-libinput,-no-libinput,libinput"
 PACKAGECONFIG[journald] = "-journald,-no-journald,systemd"
 
+QT_CONFIG_FLAGS_GOLD = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '-use-gold-linker', '-no-use-gold-linker', d)}"
 QT_CONFIG_FLAGS += " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '-use-gold-linker', '-no-use-gold-linker', d)} \
+    ${QT_CONFIG_FLAGS_GOLD} \
     -shared \
     -silent \
     -no-pch \
recipes-qt/qt5/qtgraphicaleffects_git.bb +4 -0
index f4b43e7..eadd4bc 100644
@@ -20,3 +20,7 @@ DEPENDS += "qtdeclarative"
 RDEPENDS_${PN}-dev = ""
 
 SRCREV = "1583bb5569cfc50141d879107a46146d5ccccf28"
+
+# The same issue as in qtbase:
+# http://errors.yoctoproject.org/Errors/Build/44912/
+LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
recipes-qt/qt5/qtlocation_git.bb +4 -0
index f25d57e..ab96029 100644
@@ -21,3 +21,7 @@ PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy"
 EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
 
 SRCREV = "41cc347040226d2c5c16b9df001d03f2724b87e5"
+
+# The same issue as in qtbase:
+# http://errors.yoctoproject.org/Errors/Details/152640/
+LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
recipes-qt/qt5/qtmultimedia_git.bb +4 -0
index 7d3c3cc..aa79e3f 100644
@@ -34,3 +34,7 @@ SRC_URI += "\
 "
 
 SRCREV = "544a8a4251ff9694780e563ddb6e4af1325e0115"
+
+# The same issue as in qtbase:
+# http://errors.yoctoproject.org/Errors/Build/44914/
+LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
recipes-qt/qt5/qtscript_git.bb +4 -0
index 3f8b64a..2875988 100644
@@ -26,3 +26,7 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
 DEPENDS += "qtbase"
 
 SRCREV = "c35df2ec0ee05351912e768d298a7c627dbdd1ef"
+
+# The same issue as in qtbase:
+# http://errors.yoctoproject.org/Errors/Build/44915/
+LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
recipes-qt/qt5/qtwayland_git.bb +4 -0
index bcddb32..ffe2208 100644
@@ -50,3 +50,7 @@ SRC_URI += " \
 "
 
 BBCLASSEXTEND =+ "native nativesdk"
+
+# The same issue as in qtbase:
+# http://errors.yoctoproject.org/Errors/Details/152641/
+LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
Signature · 1 line
2.14.1
#1 lore raw

PATCH v2 2/7 Upgrade to Qt 5.9.0

From: Samuli Piippo <[email protected]>

* adapt QtWebEngine recipe to use GN instead of GYP
* add QtRemoteObjects and QtWebView as a new Qt modules
* update available QtBase configure arguments
* remove obsolete patches
* patch all .pc files to remove build paths
* include generated QML cache files in packages
* the patch "configure paths for target qmake properly" could not be applied anymore and support must be done differently

* QtWebEngine now requires gcc-multilib to be installed on the host system, because the host tools are built to the same bitness as the target (arm -> x86, aarch64 -> x86-64)

* refresh the patches to match with b5.9* branches on:
https://github.com/meta-qt5/qtbase
https://github.com/meta-qt5/qtwebengine
and 56-based branch on
https://github.com/meta-qt5/qtwebengine-chromium

---
 classes/qmake5_base.bbclass                        |   6 +-
 recipes-qt/qt5/nativesdk-qtbase_git.bb             |  22 ++--
 .../qt5/qt3d/0001-Allow-a-tools-only-build.patch   |  15 ++-
 ...2-Fix-BlenderDNA-for-clang-cross-compiler.patch |  56 ++++-----
 recipes-qt/qt5/qt3d_git.bb                         |   2 +-
 recipes-qt/qt5/qt5-git.inc                         |   4 +-
 recipes-qt/qt5/qt5.inc                             |  10 +-
 recipes-qt/qt5/qtbase-native_git.bb                |  24 ++--
 .../qt5/qtbase/0001-Add-linux-oe-g-platform.patch  |  14 +--
 ...ake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch} |   6 +-
 ...-allow-to-set-qt.conf-from-the-outside-u.patch} |   6 +-
 ...ump-path-length-from-256-to-512-character.patch |  34 ++++++
 ...le-Fix-pkgconfig-and-libtool-replacements.patch | 106 -----------------
 ...unknown-features-instead-of-erroring-out.patch} |   6 +-
 ...ump-path-length-from-256-to-512-character.patch |  33 ------
 ...wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch} |   4 +-
 ... => 0007-Delete-qlonglong-and-qulonglong.patch} |   2 +-
 ...8-Replace-pthread_yield-with-sched_yield.patch} |  10 +-
 ...build-uic.patch => 0009-Always-build-uic.patch} |   6 +-
 ...-Disable-Wformat-security-with-clang-as-w.patch |  28 -----
 ...configure-paths-for-target-qmake-properly.patch |  75 ------------
 recipes-qt/qt5/qtbase_git.bb                       |  26 ++--
 recipes-qt/qt5/qtcanvas3d_git.bb                   |   2 +-
 recipes-qt/qt5/qtcharts_git.bb                     |   2 +-
 recipes-qt/qt5/qtconnectivity_git.bb               |   6 +-
 recipes-qt/qt5/qtdatavis3d_git.bb                  |   2 +-
 .../qtdeclarative/0002-Fix-memory-leak-in-V4.patch |  44 -------
 ...leak-in-QQuickWindowPrivate-deliverTouchA.patch |  84 -------------
 recipes-qt/qt5/qtdeclarative_git.bb                |   8 +-
 recipes-qt/qt5/qtenginio_git.bb                    |   5 -
 recipes-qt/qt5/qtgamepad_git.bb                    |   2 +-
 recipes-qt/qt5/qtgraphicaleffects_git.bb           |   4 +-
 recipes-qt/qt5/qtimageformats_git.bb               |   2 +-
 .../0001-Make-mapbox-gl-build-configurable.patch   |  27 +++++
 recipes-qt/qt5/qtlocation_git.bb                   |  15 ++-
 recipes-qt/qt5/qtmultimedia_git.bb                 |   8 +-
 recipes-qt/qt5/qtnetworkauth_git.bb                |   3 +-
 recipes-qt/qt5/qtquick1_git.bb                     |   2 +-
 ...rols2-fix-compilation-of-examples-textedi.patch |  28 -----
 recipes-qt/qt5/qtquickcontrols2_git.bb             |  10 +-
 recipes-qt/qt5/qtquickcontrols_git.bb              |   7 +-
 .../0001-Allow-a-tools-only-build.patch            |  37 ++++++
 recipes-qt/qt5/qtremoteobjects_git.bb              |  27 +++++
 recipes-qt/qt5/qtscript_git.bb                     |   4 +-
 recipes-qt/qt5/qtscxml_git.bb                      |   2 +-
 recipes-qt/qt5/qtsensors_git.bb                    |   2 +-
 recipes-qt/qt5/qtserialbus_git.bb                  |   2 +-
 recipes-qt/qt5/qtserialport_git.bb                 |   2 +-
 recipes-qt/qt5/qtsvg_git.bb                        |   2 +-
 ...t-help-fix-linking-of-dependent-libraries.patch |  29 -----
 recipes-qt/qt5/qttools_git.bb                      |   8 +-
 recipes-qt/qt5/qttranslations_git.bb               |   2 +-
 recipes-qt/qt5/qtvirtualkeyboard_git.bb            |   2 +-
 recipes-qt/qt5/qtwayland_git.bb                    |   6 +-
 recipes-qt/qt5/qtwebchannel_git.bb                 |   2 +-
 ...nge-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch} |   2 +-
 ...se.gypi-include-atomicops_internals_x86_g.patch |  24 ----
 ...rf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch |  27 -----
 ....prf-allow-build-for-linux-oe-g-platform.patch} |  14 +--
 ...uickwebengineview_p_p.h-add-include-QCol.patch} |   4 +-
 ...romium-Force-host-toolchain-configuration.patch |  40 +++++++
 ...rf-Make-sure-we-only-use-the-file-name-to.patch |  26 ----
 ...dependency-to-QCoreApplication-translate.patch} |   8 +-
 ...l-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch} |   2 +-
 .../0003-chromium-v8-fix-build-with-gcc7.patch     | 131 ---------------------
 .../0004-Force-host-toolchain-configuration.patch  |  44 +++++++
 .../0004-chromium-WebKit-fix-build-with-gcc7.patch |  41 -------
 ...l-Avoid-mallinfo-APIs-on-non-glibc-linux.patch} |   8 +-
 ...chromium-musl-include-fcntl.h-for-loff_t.patch} |   6 +-
 ...l-use-off64_t-instead-of-the-internal-__.patch} |   2 +-
 ...um-musl-linux-glibc-make-the-distinction.patch} |   2 +-
 ...l-allocator-Do-not-include-glibc_weak_sy.patch} |   6 +-
 ...l-Use-correct-member-name-__si_fields-fr.patch} |   2 +-
 ...romium-musl-Match-syscalls-to-match-musl.patch} |   8 +-
 ...l-Define-res_ninit-and-res_nclose-for-no.patch} |   2 +-
 ...romium-musl-Do-not-define-__sbrk-on-musl.patch} |   2 +-
 ...m-musl-Adjust-default-pthread-stack-size.patch} |  30 ++---
 ...l-include-asm-generic-ioctl.h-for-TCGETS.patch} |   6 +-
 ...l-tcmalloc-Use-off64_t-insread-of-__off6.patch} |   6 +-
 ...romium-musl-link-with-libexecinfo-on-musl.patch |  22 ----
 recipes-qt/qt5/qtwebengine_git.bb                  |  88 +++++++-------
 recipes-qt/qt5/qtwebkit-examples_git.bb            |   2 +-
 .../qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch  |  76 ------------
 recipes-qt/qt5/qtwebkit_git.bb                     |   3 +-
 recipes-qt/qt5/qtwebsockets_git.bb                 |   2 +-
 .../0001-Add-missing-include-for-qWarning.patch    |  22 ++++
 recipes-qt/qt5/qtwebview_git.bb                    |  24 ++++
 recipes-qt/qt5/qtx11extras_git.bb                  |   2 +-
 recipes-qt/qt5/qtxmlpatterns_git.bb                |   2 +-
 89 files changed, 518 insertions(+), 1051 deletions(-)
 rename recipes-qt/qt5/qtbase/{0003-Add-external-hostbindir-option.patch => 0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch} (95%)
 rename recipes-qt/qt5/qtbase/{0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch => 0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch} (89%)
 create mode 100644 recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch
 delete mode 100644 recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
 rename recipes-qt/qt5/qtbase/{0006-Disable-all-unknown-features-instead-of-erroring-out.patch => 0005-Disable-all-unknown-features-instead-of-erroring-out.patch} (85%)
 delete mode 100644 recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch
 rename recipes-qt/qt5/qtbase/{0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch => 0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch} (95%)
 rename recipes-qt/qt5/qtbase/{0008-Delete-qlonglong-and-qulonglong.patch => 0007-Delete-qlonglong-and-qulonglong.patch} (92%)
 rename recipes-qt/qt5/qtbase/{0010-Replace-pthread_yield-with-sched_yield.patch => 0008-Replace-pthread_yield-with-sched_yield.patch} (90%)
 rename recipes-qt/qt5/qtbase/{0011-Always-build-uic.patch => 0009-Always-build-uic.patch} (83%)
 delete mode 100644 recipes-qt/qt5/qtbase/0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch
 delete mode 100644 recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
 delete mode 100644 recipes-qt/qt5/qtdeclarative/0002-Fix-memory-leak-in-V4.patch
 delete mode 100644 recipes-qt/qt5/qtdeclarative/0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch
 create mode 100644 recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch
 delete mode 100644 recipes-qt/qt5/qtquickcontrols2/0001-qtquickcontrols2-fix-compilation-of-examples-textedi.patch
 create mode 100644 recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch
 create mode 100644 recipes-qt/qt5/qtremoteobjects_git.bb
 delete mode 100644 recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
 rename recipes-qt/qt5/qtwebengine/{0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch => 0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch} (97%)
 delete mode 100644 recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch
 delete mode 100644 recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch
 rename recipes-qt/qt5/qtwebengine/{0003-functions.prf-allow-build-for-linux-oe-g-platform.patch => 0001-functions.prf-allow-build-for-linux-oe-g-platform.patch} (64%)
 rename recipes-qt/qt5/qtwebengine/{0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch => 0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch} (88%)
 create mode 100644 recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch
 delete mode 100644 recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch
 rename recipes-qt/qt5/qtwebengine/{0005-Include-dependency-to-QCoreApplication-translate.patch => 0003-Include-dependency-to-QCoreApplication-translate.patch} (80%)
 rename recipes-qt/qt5/qtwebengine/{0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch => 0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch} (93%)
 delete mode 100644 recipes-qt/qt5/qtwebengine/0003-chromium-v8-fix-build-with-gcc7.patch
 create mode 100644 recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch
 delete mode 100644 recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch
 rename recipes-qt/qt5/qtwebengine/{0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch => 0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch} (88%)
 rename recipes-qt/qt5/qtwebengine/{0007-chromium-musl-include-fcntl.h-for-loff_t.patch => 0005-chromium-musl-include-fcntl.h-for-loff_t.patch} (85%)
 rename recipes-qt/qt5/qtwebengine/{0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch => 0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch} (97%)
 rename recipes-qt/qt5/qtwebengine/{0009-chromium-musl-linux-glibc-make-the-distinction.patch => 0007-chromium-musl-linux-glibc-make-the-distinction.patch} (94%)
 rename recipes-qt/qt5/qtwebengine/{0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch => 0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch} (85%)
 rename recipes-qt/qt5/qtwebengine/{0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch => 0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch} (94%)
 rename recipes-qt/qt5/qtwebengine/{0012-chromium-musl-Match-syscalls-to-match-musl.patch => 0010-chromium-musl-Match-syscalls-to-match-musl.patch} (84%)
 rename recipes-qt/qt5/qtwebengine/{0013-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch => 0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch} (97%)
 rename recipes-qt/qt5/qtwebengine/{0014-chromium-musl-Do-not-define-__sbrk-on-musl.patch => 0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch} (94%)
 rename recipes-qt/qt5/qtwebengine/{0015-chromium-musl-Adjust-default-pthread-stack-size.patch => 0013-chromium-musl-Adjust-default-pthread-stack-size.patch} (70%)
 rename recipes-qt/qt5/qtwebengine/{0016-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch => 0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch} (82%)
 rename recipes-qt/qt5/qtwebengine/{0018-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch => 0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch} (88%)
 delete mode 100644 recipes-qt/qt5/qtwebengine/0017-chromium-musl-link-with-libexecinfo-on-musl.patch
 delete mode 100644 recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch
 create mode 100644 recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch
 create mode 100644 recipes-qt/qt5/qtwebview_git.bb
classes/qmake5_base.bbclass +4 -2
index df8f624..a556f4f 100644
@@ -214,7 +214,9 @@ qmake5_base_do_install() {
     qmake5_base_fix_install ${STAGING_DIR_HOST}
     qmake5_base_fix_install ${STAGING_DIR_NATIVE}
 
-    if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>/dev/null; then
-        sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/Qt5*.pc
+    if ls ${D}${libdir}/pkgconfig/*.pc >/dev/null 2>/dev/null; then
+        sed -i ${D}${libdir}/pkgconfig/*.pc \
+            -e "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" \
+            -e "s@${STAGING_DIR_TARGET}@@g"
     fi
 }
recipes-qt/qt5/nativesdk-qtbase_git.bb +10 -12
index 6f334c1..e1b30c9 100644
@@ -27,20 +27,18 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
 # common for qtbase-native, qtbase-nativesdk and qtbase
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
-    file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
-    file://0003-Add-external-hostbindir-option.patch \
-    file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \
-    file://0005-configure-bump-path-length-from-256-to-512-character.patch \
-    file://0006-Disable-all-unknown-features-instead-of-erroring-out.patch \
-    file://0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
-    file://0008-Delete-qlonglong-and-qulonglong.patch \
-    file://0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch \
-    file://0010-Replace-pthread_yield-with-sched_yield.patch \
+    file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
+    file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
+    file://0004-configure-bump-path-length-from-256-to-512-character.patch \
+    file://0005-Disable-all-unknown-features-instead-of-erroring-out.patch \
+    file://0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
+    file://0007-Delete-qlonglong-and-qulonglong.patch \
+    file://0008-Replace-pthread_yield-with-sched_yield.patch \
 "
 
 # common for qtbase-native and nativesdk-qtbase
 SRC_URI += " \
-    file://0011-Always-build-uic.patch \
+    file://0009-Always-build-uic.patch \
 "
 
 # CMake's toolchain configuration of nativesdk-qtbase
@@ -118,6 +116,7 @@ do_configure() {
         -no-opengl \
         -no-openssl \
         -no-xcb \
+        -no-feature-bearermanagement \
         -no-icu \
         -verbose \
         -release \
@@ -137,7 +136,6 @@ do_configure() {
         -testsdir ${OE_QMAKE_PATH_TESTS} \
         -hostbindir ${OE_QMAKE_PATH_HOST_BINS} \
         -hostdatadir ${OE_QMAKE_PATH_HOST_DATA} \
-        -host-option CROSS_COMPILE=${HOST_PREFIX} \
         -external-hostbindir ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS} \
         -no-glib \
         -no-iconv \
@@ -195,4 +193,4 @@ fakeroot do_generate_qt_environment_file() {
 
 addtask generate_qt_environment_file after do_install before do_package
 
-SRCREV = "49dc9aa409d727824f26b246054a22b5a7dd5980"
+SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b"
recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch +13 -2
index ba4e2d0..8cf1f50 100644
@@ -1,4 +1,4 @@
-From 22ccc94b5501509b516fce17195a598d04dcc2f3 Mon Sep 17 00:00:00 2001
+From dd0f3fefeeefb31ec8cf2417bd3f447f7b9c25c6 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <[email protected]>
 Date: Wed, 10 Feb 2016 09:02:09 +0200
 Subject: [PATCH] Allow a tools-only build
@@ -6,7 +6,8 @@ Subject: [PATCH] Allow a tools-only build
 ---
  qt3d.pro                                  | 7 ++++++-
  src/3rdparty/assimp/assimp_dependency.pri | 2 +-
- 2 files changed, 7 insertions(+), 2 deletions(-)
+ tools/tools.pro                           | 2 +-
+ 3 files changed, 8 insertions(+), 3 deletions(-)
 
 diff --git a/qt3d.pro b/qt3d.pro
 index 2cc347a1c..81cdeefb0 100644
@@ -38,3 +39,13 @@ index 8ba2d9a41..e973d93dd 100644
      QMAKE_USE_PRIVATE += assimp
  } else {
      include(assimp.pri)
+diff --git a/tools/tools.pro b/tools/tools.pro
+index 8e973aecb..ad51db585 100644
+--- a/tools/tools.pro
++++ b/tools/tools.pro
+@@ -1,4 +1,4 @@
+ TEMPLATE = subdirs
+ QT_FOR_CONFIG += 3dcore-private
+-!android:qtConfig(assimp):qtConfig(commandlineparser): \
++!android:tools-only|qtConfig(assimp):qtConfig(commandlineparser): \
+     SUBDIRS += qgltf
recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch +28 -28

68 lines not on this page · raw message

recipes-qt/qt5/qt3d_git.bb +1 -1
index 2891470..41b5fbc 100644
@@ -35,6 +35,6 @@ do_configure_prepend() {
          ${S}/src/quick3d/imports/input/importsinput.pro
 }
 
-SRCREV = "440589a0747d9668fec3ff924b390d75be5c6733"
+SRCREV = "f39d0a0c32cc489849a0cd5c2880f6e824223485"
 
 BBCLASSEXTEND += "native nativesdk"
recipes-qt/qt5/qt5-git.inc +2 -2
index 1cb115f..927912f 100644
@@ -2,7 +2,7 @@
 # Copyright (C) 2013-2016 Martin Jansa <[email protected]>
 
 QT_MODULE ?= "${BPN}"
-QT_MODULE_BRANCH ?= "5.8"
+QT_MODULE_BRANCH ?= "5.9"
 QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
 
 # each module needs to define valid SRCREV
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"
 
 S = "${WORKDIR}/git"
 
-PV = "5.8.0+git${SRCPV}"
+PV = "5.9.0+git${SRCPV}"
recipes-qt/qt5/qt5.inc +9 -1
index 90d7896..4b5fe8a 100644
@@ -97,34 +97,42 @@ FILES_${PN}-qmldesigner += " \
     ${OE_QMAKE_PATH_QML}/*/*/*/designer \
 "
 
-# qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*js}
+# qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*.qmlc,*.js,*.jsc}
 FILES_${PN}-qmlplugins = " \
     ${OE_QMAKE_PATH_QML}/*.qmltypes \
     ${OE_QMAKE_PATH_QML}/*/*${SOLIBSDEV} \
     ${OE_QMAKE_PATH_QML}/*/qmldir \
     ${OE_QMAKE_PATH_QML}/*/*.qmltypes \
     ${OE_QMAKE_PATH_QML}/*/*.qml \
+    ${OE_QMAKE_PATH_QML}/*/*.qmlc \
     ${OE_QMAKE_PATH_QML}/*/*.js \
+    ${OE_QMAKE_PATH_QML}/*/*.jsc \
     ${OE_QMAKE_PATH_QML}/*/*.png \
     ${OE_QMAKE_PATH_QML}/*/*/*${SOLIBSDEV} \
     ${OE_QMAKE_PATH_QML}/*/*/qmldir \
     ${OE_QMAKE_PATH_QML}/*/*/*.qmltypes \
     ${OE_QMAKE_PATH_QML}/*/*/*.qml \
+    ${OE_QMAKE_PATH_QML}/*/*/*.qmlc \
     ${OE_QMAKE_PATH_QML}/*/*/*.js \
+    ${OE_QMAKE_PATH_QML}/*/*/*.jsc \
     ${OE_QMAKE_PATH_QML}/*/*/*.png \
     ${OE_QMAKE_PATH_QML}/*/*/*/*${SOLIBSDEV} \
     ${OE_QMAKE_PATH_QML}/*/*/*/qmldir \
     ${OE_QMAKE_PATH_QML}/*/*/*/images \
     ${OE_QMAKE_PATH_QML}/*/*/*/*.qmltypes \
     ${OE_QMAKE_PATH_QML}/*/*/*/*.qml \
+    ${OE_QMAKE_PATH_QML}/*/*/*/*.qmlc \
     ${OE_QMAKE_PATH_QML}/*/*/*/*.js \
+    ${OE_QMAKE_PATH_QML}/*/*/*/*.jsc \
     ${OE_QMAKE_PATH_QML}/*/*/*/*.png \
     ${OE_QMAKE_PATH_QML}/*/*/*/*.metainfo \
     ${OE_QMAKE_PATH_QML}/*/*/*/*/*${SOLIBSDEV} \
     ${OE_QMAKE_PATH_QML}/*/*/*/*/qmldir \
     ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qmltypes \
     ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qml \
+    ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qmlc \
     ${OE_QMAKE_PATH_QML}/*/*/*/*/*.js \
+    ${OE_QMAKE_PATH_QML}/*/*/*/*/*.jsc \
     ${OE_QMAKE_PATH_QML}/*/*/*/*/*/*.png \
     ${OE_QMAKE_PATH_IMPORTS}/*.qmltypes \
     ${OE_QMAKE_PATH_IMPORTS}/*/*${SOLIBSDEV} \
recipes-qt/qt5/qtbase-native_git.bb +10 -14
index c8bf008..84cb2b0 100644
@@ -22,20 +22,18 @@ require qt5-git.inc
 # common for qtbase-native, qtbase-nativesdk and qtbase
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
-    file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
-    file://0003-Add-external-hostbindir-option.patch \
-    file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \
-    file://0005-configure-bump-path-length-from-256-to-512-character.patch \
-    file://0006-Disable-all-unknown-features-instead-of-erroring-out.patch \
-    file://0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
-    file://0008-Delete-qlonglong-and-qulonglong.patch \
-    file://0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch \
-    file://0010-Replace-pthread_yield-with-sched_yield.patch \
+    file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
+    file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
+    file://0004-configure-bump-path-length-from-256-to-512-character.patch \
+    file://0005-Disable-all-unknown-features-instead-of-erroring-out.patch \
+    file://0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
+    file://0007-Delete-qlonglong-and-qulonglong.patch \
+    file://0008-Replace-pthread_yield-with-sched_yield.patch \
 "
 
 # common for qtbase-native and nativesdk-qtbase
 SRC_URI += " \
-    file://0011-Always-build-uic.patch \
+    file://0009-Always-build-uic.patch \
 "
 
 CLEANBROKEN = "1"
@@ -109,9 +107,7 @@ do_install() {
         done
     fi
 
-    # for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt)
-    # e.g. qt3d, qtwayland
-    ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
+    install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS}
 }
 
-SRCREV = "49dc9aa409d727824f26b246054a22b5a7dd5980"
+SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b"
recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +7 -7
index 3f373c7..28c2660 100644
@@ -1,4 +1,4 @@
-From 805b338154ed0262a7b8bf5c582ff5b193a55492 Mon Sep 17 00:00:00 2001
+From e13425e6f1e784b0b016cf68a54dfbae32995b86 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Mon, 15 Apr 2013 04:29:32 +0200
 Subject: [PATCH] Add linux-oe-g++ platform
@@ -30,10 +30,10 @@ Signed-off-by: Martin Jansa <[email protected]>
  create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
 
 diff --git a/configure b/configure
-index bc18e614d2..579a96d787 100755
+index 73679de621..5a0eebce50 100755
 --- a/configure
 +++ b/configure
-@@ -1614,7 +1614,7 @@ fi
+@@ -709,7 +709,7 @@ fi
  # is where the resulting variable is written to
  setBootstrapVariable()
  {
@@ -43,10 +43,10 @@ index bc18e614d2..579a96d787 100755
  
  # build qmake
 diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
-index 4ca7c6ba07..5b5ac13f1d 100644
+index 934a18a924..0f5b1b6333 100644
 --- a/mkspecs/features/configure.prf
 +++ b/mkspecs/features/configure.prf
-@@ -44,14 +44,14 @@ defineTest(qtCompileTest) {
+@@ -46,14 +46,14 @@ defineTest(qtCompileTest) {
      }
  
      # Clean up after previous run
@@ -64,10 +64,10 @@ index 4ca7c6ba07..5b5ac13f1d 100644
              msg = "test $$1 succeeded"
              write_file($$QMAKE_CONFIG_LOG, msg, append)
 diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
-index 999cd18154..2ac91ba519 100644
+index c00fdb73f8..0cf4de7b49 100644
 --- a/mkspecs/features/qt_functions.prf
 +++ b/mkspecs/features/qt_functions.prf
-@@ -67,7 +67,7 @@ defineTest(qtHaveModule) {
+@@ -69,7 +69,7 @@ defineTest(qtHaveModule) {
  defineTest(qtPrepareTool) {
      cmd = $$eval(QT_TOOL.$${2}.binary)
      isEmpty(cmd) {
recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch renamed from recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch +3 -3
similarity index 95%
rename from recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch
rename to recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch
index 9f1a2b2..5ee6e04 100644
@@ -1,9 +1,9 @@
-From 67977e16e5d0aecd931d8e4355c12cc907df592f Mon Sep 17 00:00:00 2001
+From 5ed152f8caa7ef00fb20d19a06ab5f7887e9aba6 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Sat, 6 Apr 2013 13:15:07 +0200
-Subject: [PATCH] Add -external-hostbindir option
+Subject: [PATCH] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS
 
-* cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS to determine path to host binaries
+... to determine path to host binaries
 
 Upstream-Status: Inappropriate [OE specific]
 
recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch renamed from recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +3 -3
similarity index 89%
rename from recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
rename to recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
index f985962..7ff1ff7 100644
@@ -1,4 +1,4 @@
-From 18e2f4368f22bf5ac8b2a36c30a7ad39ed97bf49 Mon Sep 17 00:00:00 2001
+From 77fab782e8a199f9ede83bc97cbce21a544961c2 Mon Sep 17 00:00:00 2001
 From: Holger Freyther <[email protected]>
 Date: Wed, 26 Sep 2012 17:22:30 +0200
 Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the
@@ -19,10 +19,10 @@ Signed-off-by: Martin Jansa <[email protected]>
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
-index 27fe10a79e..29ffcda203 100644
+index b4ba0b5b2e..11d4c00f39 100644
 --- a/src/corelib/global/qlibraryinfo.cpp
 +++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -164,7 +164,10 @@ void QLibrarySettings::load()
+@@ -172,7 +172,10 @@ void QLibrarySettings::load()
  QSettings *QLibraryInfoPrivate::findConfiguration()
  {
  #ifdef QT_BUILD_QMAKE
recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch new file +34 -0
new file mode 100644
index 0000000..5ab6a7b
@@ -0,0 +1,34 @@
+From 4848804312f0045b53c85db113ac9e42fe1b7360 Mon Sep 17 00:00:00 2001
+From: Denys Dmytriyenko <[email protected]>
+Date: Tue, 25 Aug 2015 10:05:15 -0400
+Subject: [PATCH] configure: bump path length from 256 to 512 characters
+
+Increase the path length that gets hardcoded into generated config.cpp file
+from 256 to 512 characters, as nativesdk path can be quite long.
+
+Also update length of EXT_PREFIX and HOST_PREFIX now.
+
+Change-Id: If98dd57160efe9c98c36148cdf872f50b3d38118
+Signed-off-by: Denys Dmytriyenko <[email protected]>
+---
+ configure.pri | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.pri b/configure.pri
+index be1b166080..52f03bf3f2 100644
+--- a/configure.pri
++++ b/configure.pri
+@@ -796,10 +796,10 @@ defineTest(qtConfOutput_preparePaths) {
+         "static const char qt_configure_installation     [12+11]  = \"qt_instdate=2012-12-20\";" \
+         "" \
+         "/* Installation Info */" \
+-        "static const char qt_configure_prefix_path_str  [12+256] = \"qt_prfxpath=$$config.input.prefix\";" \
++        "static const char qt_configure_prefix_path_str  [12+512] = \"qt_prfxpath=$$config.input.prefix\";" \
+         "$${LITERAL_HASH}ifdef QT_BUILD_QMAKE" \
+-        "static const char qt_configure_ext_prefix_path_str   [12+256] = \"qt_epfxpath=$$config.input.extprefix\";" \
+-        "static const char qt_configure_host_prefix_path_str  [12+256] = \"qt_hpfxpath=$$config.input.hostprefix\";" \
++        "static const char qt_configure_ext_prefix_path_str   [12+512] = \"qt_epfxpath=$$config.input.extprefix\";" \
++        "static const char qt_configure_host_prefix_path_str  [12+512] = \"qt_hpfxpath=$$config.input.hostprefix\";" \
+         "$${LITERAL_HASH}endif" \
+         "" \
+         "static const short qt_configure_str_offsets[] = {" \
recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch deleted +0 -106

106 lines not on this page · raw message

recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch renamed from recipes-qt/qt5/qtbase/0006-Disable-all-unknown-features-instead-of-erroring-out.patch +3 -3
similarity index 85%
rename from recipes-qt/qt5/qtbase/0006-Disable-all-unknown-features-instead-of-erroring-out.patch
rename to recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch
index c2b4438..8538901 100644
@@ -1,4 +1,4 @@
-From 8acdd69a4083080f4dd40001eee30209ec5de0b2 Mon Sep 17 00:00:00 2001
+From 6ecb404346525a92f4c8926aa285662f3f5010b3 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <[email protected]>
 Date: Mon, 24 Oct 2016 09:45:18 +0300
 Subject: [PATCH] Disable all unknown features instead of erroring out
@@ -10,10 +10,10 @@ Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
-index eaaa161270..fa3addae11 100644
+index 966c43108c..32f0dd0041 100644
 --- a/mkspecs/features/qt_configure.prf
 +++ b/mkspecs/features/qt_configure.prf
-@@ -1035,7 +1035,8 @@ defineReplace(qtConfEvaluateSingleExpression) {
+@@ -1180,7 +1180,8 @@ defineReplace(qtConfEvaluateSingleExpression) {
                      error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.")
                  return($$result)
              }
recipes-qt/qt5/qtbase/0005-configure-bump-path-length-from-256-to-512-character.patch deleted +0 -33
deleted file mode 100644
index 0c0d2c7..0000000
@@ -1,33 +0,0 @@
-From be9179d2cbb9009794940092d30dac7800708964 Mon Sep 17 00:00:00 2001
-From: Denys Dmytriyenko <[email protected]>
-Date: Tue, 25 Aug 2015 10:05:15 -0400
-Subject: [PATCH] configure: bump path length from 256 to 512 characters
-
-Increase the path length that gets hardcoded into generated config.cpp file
-from 256 to 512 characters, as nativesdk path can be quite long.
-
-Also update length of EXT_PREFIX and HOST_PREFIX now.
-
-Signed-off-by: Denys Dmytriyenko <[email protected]>
----
- configure | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure b/configure
-index 579a96d787..5af98cd77e 100755
---- a/configure
-+++ b/configure
-@@ -1551,10 +1551,10 @@ cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
- static const char qt_configure_installation          [12+11]    = "qt_instdate=2012-12-20";
- 
- /* Installation Info */
--static const char qt_configure_prefix_path_str       [256 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
-+static const char qt_configure_prefix_path_str       [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
- #ifdef QT_BUILD_QMAKE
--static const char qt_configure_ext_prefix_path_str   [256 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
--static const char qt_configure_host_prefix_path_str  [256 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX";
-+static const char qt_configure_ext_prefix_path_str   [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
-+static const char qt_configure_host_prefix_path_str  [512 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX";
- #endif
- 
- static const short qt_configure_str_offsets[] = {
recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch renamed from recipes-qt/qt5/qtbase/0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch +2 -2
similarity index 95%
rename from recipes-qt/qt5/qtbase/0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
rename to recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch
index b70b0d3..253815b 100644
@@ -1,4 +1,4 @@
-From 5316b420dc408d3a47daa3ba854a7883c911f6b9 Mon Sep 17 00:00:00 2001
+From 3730ac03a1473a0e1fdfe1537b73818ab99961e9 Mon Sep 17 00:00:00 2001
 From: Pascal Bach <[email protected]>
 Date: Wed, 11 May 2016 15:20:41 +0200
 Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS
@@ -30,7 +30,7 @@ Signed-off-by: Pascal Bach <[email protected]>
  2 files changed, 10 insertions(+)
 
 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index d2358cae4b..feb73c02a5 100644
+index 4f342d67d7..202b723882 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 @@ -9,6 +9,11 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch renamed from recipes-qt/qt5/qtbase/0008-Delete-qlonglong-and-qulonglong.patch +1 -1
similarity index 92%
rename from recipes-qt/qt5/qtbase/0008-Delete-qlonglong-and-qulonglong.patch
rename to recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch
index c992586..68e4b20 100644
@@ -1,4 +1,4 @@
-From 2755a80114433e75f08fbb0df0fee9f7526172aa Mon Sep 17 00:00:00 2001
+From 2fa6b447302abbaf1fd710e94b92692a300baaaf Mon Sep 17 00:00:00 2001
 From: Huang Qiyu <[email protected]>
 Date: Wed, 7 Jun 2017 21:00:49 +0900
 Subject: [PATCH] Delete qlonglong and qulonglong
recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch renamed from recipes-qt/qt5/qtbase/0010-Replace-pthread_yield-with-sched_yield.patch +5 -5
similarity index 90%
rename from recipes-qt/qt5/qtbase/0010-Replace-pthread_yield-with-sched_yield.patch
rename to recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch
index 5c625e0..678de52 100644
@@ -1,4 +1,4 @@
-From bbe822066913c0908b6366009517c19e828e1458 Mon Sep 17 00:00:00 2001
+From 41d7028d2239a98a76cc91939edb2cb728019d08 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Thu, 27 Jul 2017 08:02:51 -0700
 Subject: [PATCH] Replace pthread_yield with sched_yield
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <[email protected]>
  2 files changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
-index 7d9f56ef38..bc115ef61d 100644
+index b6106e8c9e..6d6ea0b739 100644
 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
 +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
 @@ -34,7 +34,7 @@
@@ -36,10 +36,10 @@ index 7d9f56ef38..bc115ef61d 100644
              QMetaType info(tp);
              if (!info.isValid()) {
 diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
-index fe1057bdde..e23e97b259 100644
+index 7340817ade..f34162a105 100644
 --- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
 +++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
-@@ -75,6 +75,7 @@
+@@ -77,6 +77,7 @@
  #include <stdlib.h>
  #include <sys/stat.h>
  #include <unistd.h>
@@ -47,7 +47,7 @@ index fe1057bdde..e23e97b259 100644
  #endif
  
  #include "private/qhostinfo_p.h"
-@@ -2129,8 +2130,8 @@ public slots:
+@@ -2131,8 +2132,8 @@ public slots:
  
  #if defined(Q_OS_MAC)
          pthread_yield_np();
recipes-qt/qt5/qtbase/0009-Always-build-uic.patch renamed from recipes-qt/qt5/qtbase/0011-Always-build-uic.patch +3 -3
similarity index 83%
rename from recipes-qt/qt5/qtbase/0011-Always-build-uic.patch
rename to recipes-qt/qt5/qtbase/0009-Always-build-uic.patch
index 244cc0b..118a4f2 100644
@@ -1,4 +1,4 @@
-From 7c42f9b42c34d75f6c8e21e55af9b0e58f5743cc Mon Sep 17 00:00:00 2001
+From 294e4c718407e66631ce36c37258217c9adb3f83 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Sat, 16 Nov 2013 00:32:30 +0100
 Subject: [PATCH] Always build uic
@@ -14,10 +14,10 @@ Signed-off-by: Martin Jansa <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/src.pro b/src/src.pro
-index 90d7e2b76c..4ca6b0bd01 100644
+index 43fc06f2e5..1e9d4dcc0d 100644
 --- a/src/src.pro
 +++ b/src/src.pro
-@@ -188,7 +188,7 @@ qtConfig(gui) {
+@@ -203,7 +203,7 @@ qtConfig(gui) {
          }
      }
  }
recipes-qt/qt5/qtbase/0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch deleted +0 -28
deleted file mode 100644
index 609cd84..0000000
@@ -1,28 +0,0 @@
-From 7bab0171601bc769403be62d145164137f1b7b66 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Tue, 25 Jul 2017 19:40:52 -0700
-Subject: [PATCH] tst_qstring: Disable Wformat-security with clang as well
-
-Currently, its only disabled for gcc, but we need to disable
-it with clang as well in order to compile it successfully with
-clang
-
-Signed-off-by: Khem Raj <[email protected]>
----
- tests/auto/corelib/tools/qstring/tst_qstring.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/tests/auto/corelib/tools/qstring/tst_qstring.cpp b/tests/auto/corelib/tools/qstring/tst_qstring.cpp
-index a0a872710c..20a9a9f9db 100644
---- a/tests/auto/corelib/tools/qstring/tst_qstring.cpp
-+++ b/tests/auto/corelib/tools/qstring/tst_qstring.cpp
-@@ -1066,6 +1066,9 @@ void tst_QString::acc_01()
- 
- QT_WARNING_PUSH
- QT_WARNING_DISABLE_GCC("-Wformat-security")
-+#ifdef __clang__
-+QT_WARNING_DISABLE_CLANG("-Wformat-security")
-+#endif
- 
- void tst_QString::isNull()
- {
recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch deleted +0 -75

75 lines not on this page · raw message

recipes-qt/qt5/qtbase_git.bb +9 -17
index 550968c..c535380 100644
@@ -17,25 +17,18 @@ LIC_FILES_CHKSUM = " \
 # common for qtbase-native, qtbase-nativesdk and qtbase
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
-    file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
-    file://0003-Add-external-hostbindir-option.patch \
-    file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \
-    file://0005-configure-bump-path-length-from-256-to-512-character.patch \
-    file://0006-Disable-all-unknown-features-instead-of-erroring-out.patch \
-    file://0007-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
-    file://0008-Delete-qlonglong-and-qulonglong.patch \
-    file://0009-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch \
-    file://0010-Replace-pthread_yield-with-sched_yield.patch \
+    file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
+    file://0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
+    file://0004-configure-bump-path-length-from-256-to-512-character.patch \
+    file://0005-Disable-all-unknown-features-instead-of-erroring-out.patch \
+    file://0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
+    file://0007-Delete-qlonglong-and-qulonglong.patch \
+    file://0008-Replace-pthread_yield-with-sched_yield.patch \
     file://run-ptest \
 "
 
 inherit ptest
 
-# only for target qtbase
-SRC_URI += "\
-    file://0011-configure-paths-for-target-qmake-properly.patch \
-"
-
 # LGPL-3.0 is used only in src/plugins/platforms/android/extract.cpp
 
 # for syncqt
@@ -66,7 +59,7 @@ LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -f
 # separate some parts of PACKAGECONFIG which are often changed
 PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}"
 PACKAGECONFIG_FB ?= "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
-PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xrender xinput2 glib xkb xkbcommon-evdev', '', d)}"
+PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xinput2 glib xkb xkbcommon-evdev', '', d)}"
 PACKAGECONFIG_FONTS ?= ""
 PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib"
 PACKAGECONFIG_DISTRO ?= ""
@@ -130,7 +123,6 @@ PACKAGECONFIG[sql-db2] = "-sql-db2,-no-sql-db2"
 PACKAGECONFIG[sql-sqlite2] = "-sql-sqlite2,-no-sql-sqlite2,sqlite"
 PACKAGECONFIG[sql-sqlite] = "-sql-sqlite -system-sqlite,-no-sql-sqlite,sqlite3"
 PACKAGECONFIG[xinput2] = "-xinput2,-no-xinput2,libxi"
-PACKAGECONFIG[xrender] = "-xrender,-no-xrender,libxrender"
 PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv"
 PACKAGECONFIG[xkb] = "-xkb,-no-xkb -no-xkbcommon,libxkbcommon"
 PACKAGECONFIG[xkbcommon-evdev] = "-xkbcommon-evdev,-no-xkbcommon-evdev,libxkbcommon,xkeyboard-config"
@@ -228,4 +220,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
 
 RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
 
-SRCREV = "49dc9aa409d727824f26b246054a22b5a7dd5980"
+SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b"
recipes-qt/qt5/qtcanvas3d_git.bb +1 -1
index 3ca6647..b2a0724 100644
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS = "qtdeclarative"
 
-SRCREV = "5962967a3712ee711fd9ab58da664a3eb0acb24e"
+SRCREV = "116737dc8fa244282dda95a8f13624b66fdb5521"
recipes-qt/qt5/qtcharts_git.bb +1 -1
index 1369dee..6b895aa 100644
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtdeclarative qtmultimedia"
 
-SRCREV = "057b3e2d6a96b42b890a0d007a8801d260c3de48"
+SRCREV = "de7f741c428febfe3c81a28f955996d2314953fc"
recipes-qt/qt5/qtconnectivity_git.bb +1 -5
index de7764d..0d13dc4 100644
@@ -4,13 +4,9 @@ require qt5-git.inc
 LICENSE = "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 )"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-    file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
     file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
     file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
-    file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
 "
 
@@ -23,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}"
 
 EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
 
-SRCREV = "1afb57ed92a25bbc000ea4c4d7662cb8b9e267ee"
+SRCREV = "8dcbf68e4579e03ea6d2808ac0c670169b59d0df"
recipes-qt/qt5/qtdatavis3d_git.bb +1 -1
index 7d6a51f..0cbd04e 100644
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
 
-SRCREV = "a78f8d6bef57dd4283094a52551705ee02909970"
+SRCREV = "84490ff75be5acdaeb3fd93900e4ebf7ba8f539b"
recipes-qt/qt5/qtdeclarative/0002-Fix-memory-leak-in-V4.patch deleted +0 -44

44 lines not on this page · raw message

recipes-qt/qt5/qtdeclarative/0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch deleted +0 -84

84 lines not on this page · raw message

recipes-qt/qt5/qtdeclarative_git.bb +1 -7
index 34a8897..2194d33 100644
@@ -5,20 +5,14 @@ require qt5-ptest.inc
 LICENSE = "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 )"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-    file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
     file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
     file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
-    file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
 "
 
 SRC_URI += " \
     file://0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch \
-    file://0002-Fix-memory-leak-in-V4.patch \
-    file://0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch \
 "
 
 DEPENDS += "qtbase"
@@ -39,6 +33,6 @@ do_install_append_class-nativesdk() {
 
 EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
 
-SRCREV = "fffb997e192a72b4dcd66edc2fbad5473dd359f3"
+SRCREV = "96f6ba5f562073f508cd8569ac354592fdd48f4a"
 
 BBCLASSEXTEND =+ "native nativesdk"
recipes-qt/qt5/qtenginio_git.bb +0 -5
index 2f32a88..8b4fb71 100644
@@ -15,8 +15,3 @@ DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
 QT_MODULE_BRANCH = "dev"
 SRCREV = "0555cf73c8b5abd41d8a4ff02457315c9e7c667d"
 
-do_install_append() {
-    if ls ${D}${libdir}/pkgconfig/Enginio.pc >/dev/null 2>/dev/null; then
-        sed -i "s@-L${STAGING_LIBDIR}@-L\${libdir}@g" ${D}${libdir}/pkgconfig/Enginio.pc
-    fi
-}
recipes-qt/qt5/qtgamepad_git.bb +1 -1
index 6abf8b7..94f04a4 100644
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
 
 EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
 
-SRCREV = "13bbe6ea378d127b9b1d70e2858e41e86e754dc7"
+SRCREV = "ef8850fee38e2552d535379a8477c9abebdf8bb4"
recipes-qt/qt5/qtgraphicaleffects_git.bb +2 -2
index eadd4bc..edb150e 100644
@@ -19,8 +19,8 @@ DEPENDS += "qtdeclarative"
 
 RDEPENDS_${PN}-dev = ""
 
-SRCREV = "1583bb5569cfc50141d879107a46146d5ccccf28"
-
 # The same issue as in qtbase:
 # http://errors.yoctoproject.org/Errors/Build/44912/
 LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
+
+SRCREV = "db93af5b2bb49af74fbad6c9cd80bd7010434e78"
recipes-qt/qt5/qtimageformats_git.bb +1 -1
index 3725441..4dd64df 100644
@@ -26,4 +26,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
 
 EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
 
-SRCREV = "cd2de115c6216ad747cf4803e65a4ce4af220795"
+SRCREV = "71ccf0dff82835ce7b5aed74c37829afdef44cde"
recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch new file +27 -0
new file mode 100644
index 0000000..49fcff6
@@ -0,0 +1,27 @@
+From f7c76b91e726a0e63e5226eb6e89b13e0c3509b7 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <[email protected]>
+Date: Wed, 7 Jun 2017 13:29:29 +0300
+Subject: [PATCH] Make mapbox-gl build configurable
+
+mapbox-gl-native won't compile for ARMv5 or older, so disable the
+build by default.
+
+Task-number: QTBUG-61289
+Change-Id: I5f26200f2735b363c3c322f9035b331b9159c47b
+---
+ src/plugins/geoservices/geoservices.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro
+index 0810d39..03fc119 100644
+--- a/src/plugins/geoservices/geoservices.pro
++++ b/src/plugins/geoservices/geoservices.pro
+@@ -6,7 +6,7 @@ qtConfig(concurrent) {
+     SUBDIRS += osm
+ }
+ 
+-qtConfig(c++14):!win32|mingw:!qnx {
++mapboxgl:qtConfig(c++14):!win32|mingw:!qnx {
+     !exists(../../3rdparty/mapbox-gl-native/CMakeLists.txt) {
+         warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.")
+     } else {
recipes-qt/qt5/qtlocation_git.bb +13 -2
index ab96029..7d434a4 100644
@@ -13,15 +13,26 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols"
 
+SRC_URI += "file://0001-Make-mapbox-gl-build-configurable.patch"
+
 PACKAGECONFIG ??= ""
 # older geoclue 0.12.99 is needed
 PACKAGECONFIG[geoclue] = ",,geoclue"
 PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy"
+PACKAGECONFIG[mapboxgl] = ""
 
+EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'mapboxgl', 'CONFIG+=mapboxgl', '', d)}"
 EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
 
-SRCREV = "41cc347040226d2c5c16b9df001d03f2724b87e5"
-
 # The same issue as in qtbase:
 # http://errors.yoctoproject.org/Errors/Details/152640/
 LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
+
+SRC_URI += " \
+    ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
+"
+
+SRCREV_qtlocation = "888d351cb0c7fe6d05ab1efe8d4dbb4b6f06cd5f"
+SRCREV_qtlocation-mapboxgl = "d45c177e8a23eefcc94930af9fa085e61136bb94"
+
+SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
recipes-qt/qt5/qtmultimedia_git.bb +2 -6
index aa79e3f..1996618 100644
@@ -4,13 +4,9 @@ require qt5-git.inc
 LICENSE = "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 )"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-    file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
     file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
     file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
-    file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
 "
 
@@ -33,8 +29,8 @@ SRC_URI += "\
     file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \
 "
 
-SRCREV = "544a8a4251ff9694780e563ddb6e4af1325e0115"
-
 # The same issue as in qtbase:
 # http://errors.yoctoproject.org/Errors/Build/44914/
 LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
+
+SRCREV = "559c305ded730e23505e8b29536a98dc59e2acfa"
recipes-qt/qt5/qtnetworkauth_git.bb +1 -2
index 5657c86..eb5e4f6 100644
@@ -1,7 +1,6 @@
 LICENSE = "BSD & GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
 "
 
@@ -10,4 +9,4 @@ require qt5-git.inc
 
 DEPENDS += "qtbase"
 
-SRCREV = "ec7663382bc6382323f3261ab199ec2edbeb5e37"
+SRCREV = "86c5036848ad004208803d9d497cfcd08c9623d6"
recipes-qt/qt5/qtquick1_git.bb +1 -1
index d41b838..1f680e6 100644
@@ -24,4 +24,4 @@ do_configure_prepend() {
 }
 
 QT_MODULE_BRANCH = "dev"
-SRCREV = "64faeb0d8003e699a4d09e7dcee1ef6eb10302ad"
+SRCREV = "695460401d9a89d2f156016d51601b2e59b64105"
recipes-qt/qt5/qtquickcontrols2/0001-qtquickcontrols2-fix-compilation-of-examples-textedi.patch deleted +0 -28
deleted file mode 100644
index d08c57e..0000000
@@ -1,28 +0,0 @@
-From 3696a416bd594d3f280c281cb2a66bc837829238 Mon Sep 17 00:00:00 2001
-From: Steffen Sledz <[email protected]>
-Date: Thu, 6 Jul 2017 13:28:07 +0200
-Subject: [PATCH] qtquickcontrols2: fix compilation of examples/texteditor
-
-git/examples/quickcontrols2/texteditor/documenthandler.cpp:284:18: error: invalid use of incomplete type 'class QDebug'
-          qWarning() << "load() called before DocumentHandler has QQmlEngine";
-
-Signed-off-by: Steffen Sledz <[email protected]>
----
- examples/quickcontrols2/texteditor/documenthandler.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/examples/quickcontrols2/texteditor/documenthandler.cpp b/examples/quickcontrols2/texteditor/documenthandler.cpp
-index e57946fd..94ca82ad 100644
---- a/examples/quickcontrols2/texteditor/documenthandler.cpp
-+++ b/examples/quickcontrols2/texteditor/documenthandler.cpp
-@@ -59,6 +59,7 @@
- #include <QTextCharFormat>
- #include <QTextCodec>
- #include <QTextDocument>
-+#include <QtCore/QDebug>
- 
- DocumentHandler::DocumentHandler(QObject *parent)
-     : QObject(parent)
--- 
-2.13.2
-
recipes-qt/qt5/qtquickcontrols2_git.bb +3 -7
index 371f4ae..a84cfb3 100644
@@ -4,14 +4,10 @@ require qt5-git.inc
 LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-3.0"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
-    file://LICENSE.LGPLv3;md5=a37e6cd7102174853307e03e6edc5f30 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
+    file://LICENSE.LGPLv3;md5=382747d0119037529ec2b98b24038eb0 \
+    file://LICENSE.GPLv3;md5=dce746aa5261707df6d6999ab9958d8b \
 "
 
 DEPENDS += "qtdeclarative"
 
-SRC_URI += " \
-    file://0001-qtquickcontrols2-fix-compilation-of-examples-textedi.patch \
-"
-
-SRCREV = "6f7852a307c7ebbdb3b6efa00cbf7626b072bbc1"
+SRCREV = "ef6b8d3081f0bf93d6d59e67c8e3f82c63c511c3"
recipes-qt/qt5/qtquickcontrols_git.bb +6 -1
index 69f3d3b..83ed908 100644
@@ -17,8 +17,13 @@ DEPENDS += "qtdeclarative"
 
 RDEPENDS_${PN}-dev = ""
 
+FILES_${PN}-qmlplugins += " \
+  ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Shaders \
+  ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
+"
+
 SRC_URI += " \
     file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \
 "
 
-SRCREV = "201c86391c7ff78d570fdec6e0c0b71eb1e9aae4"
+SRCREV = "dacb91916b202208681471ba764504c7c7d086f0"
recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch new file +37 -0
new file mode 100644
index 0000000..dfebc18
@@ -0,0 +1,37 @@
+From dd9d1e5ecdcd8267215523ad08ea893656a7f42d Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <[email protected]>
+Date: Wed, 7 Jun 2017 15:17:12 +0300
+Subject: [PATCH] Allow a tools-only build
+
+Change-Id: I3b33fc1c8877fc82568bd386b063e7a0aa57b706
+---
+ mkspecs/features/repccommon.pri | 2 +-
+ qtremoteobjects.pro             | 5 +++++
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/mkspecs/features/repccommon.pri b/mkspecs/features/repccommon.pri
+index 5e88bf8..6efd19e 100644
+--- a/mkspecs/features/repccommon.pri
++++ b/mkspecs/features/repccommon.pri
+@@ -3,7 +3,7 @@ cmd = $${QT.remoteobjects.bins}/repc
+ contains(QMAKE_HOST.os, Windows) {
+     cmd = $$system_path($${cmd}.exe)
+ }
+-exists($$cmd): QT_TOOL.repc.binary = $$cmd
++false:exists($$cmd): QT_TOOL.repc.binary = $$cmd
+ 
+ # qtPrepareTool honors QT_TOOL.repc.binary if set
+ qtPrepareTool(QMAKE_REPC, repc)
+diff --git a/qtremoteobjects.pro b/qtremoteobjects.pro
+index c2e2b6b..93c2bb5 100644
+--- a/qtremoteobjects.pro
++++ b/qtremoteobjects.pro
+@@ -2,3 +2,8 @@ CONFIG += examples_need_tools tests_need_tools
+ load(qt_parts)
+ 
+ SUBDIRS += mkspecs
++
++tools-only {
++    sub_tools.depends -= sub_src
++    SUBDIRS = sub_tools
++}
recipes-qt/qt5/qtremoteobjects_git.bb new file +27 -0
new file mode 100644
index 0000000..f563818
@@ -0,0 +1,27 @@
+LICENSE = "BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
+    file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+"
+
+require qt5.inc
+require qt5-git.inc
+
+DEPENDS += "qtbase qtdeclarative qtremoteobjects-native"
+
+SRC_URI += " \
+    file://0001-Allow-a-tools-only-build.patch \
+"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG_class-native ??= "tools-only"
+PACKAGECONFIG_class-nativesdk ??= "tools-only"
+PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
+
+EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
+
+SRCREV = "ae0b101884b05355e3a7bc06dbca722ad3d08d0f"
+
+BBCLASSEXTEND += "native nativesdk"
recipes-qt/qt5/qtscript_git.bb +2 -2
index 2875988..e7acafe 100644
@@ -25,8 +25,8 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
 
 DEPENDS += "qtbase"
 
-SRCREV = "c35df2ec0ee05351912e768d298a7c627dbdd1ef"
-
 # The same issue as in qtbase:
 # http://errors.yoctoproject.org/Errors/Build/44915/
 LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
+
+SRCREV = "e00ca9b6bec2adf78fd14e02376ecf1b55a93b0c"
recipes-qt/qt5/qtscxml_git.bb +1 -1
index d69d00f..c2c00e1 100644
@@ -10,7 +10,7 @@ require qt5-git.inc
 
 DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
 
-SRCREV = "4704292500b98143eee9b0fb0b6a34a858ed1253"
+SRCREV = "eff82ac957e051f16f64c287f2dfaec9049bdfc1"
 
 SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch"
 
recipes-qt/qt5/qtsensors_git.bb +1 -1
index 93a0971..17d0639 100644
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtdeclarative"
 
-SRCREV = "1220a31e6c2f91b34b4a05773621dddab8c4315a"
+SRCREV = "0c3c4d01ea34ed98a0d2928662f07b673f00535d"
recipes-qt/qt5/qtserialbus_git.bb +1 -1
index 325d975..93a826b 100644
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtserialport"
 
-SRCREV = "c8fe92ef54b2d310e8c8c143962fd6f43bf46c27"
+SRCREV = "20811e3b004af817e3f02982c755e8b1560b8c3d"
recipes-qt/qt5/qtserialport_git.bb +1 -1
index edecc04..957000c 100644
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
-SRCREV = "74aad2578ecb6739007449a06a54dd7abd64c85b"
+SRCREV = "687f5a9bd44a45a29d24925f29470c43d6729dee"
recipes-qt/qt5/qtsvg_git.bb +1 -1
index 24a0d91..fb8d44e 100644
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
-SRCREV = "1b3a7ae14d25f1caa3f6bedad3cfeb7d83b3904e"
+SRCREV = "4fd787e90c70afbaa168abb3efdb8757ba77f3a4"
recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch deleted +0 -29
deleted file mode 100644
index 17d5d51..0000000
@@ -1,29 +0,0 @@
-From 95a418157ce5f49052ec1c349581d1811a79c9eb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
-Date: Fri, 17 Jan 2014 14:33:19 +0100
-Subject: [PATCH] assistant/help: fix linking of dependent libraries
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-else we get:
-| ...ld: warning: libQt5CLucene.so.5, needed by ...libQt5Help.so, not found (try using -rpath or -rpath-link)
-| ...undefined reference to `QCLucenePhraseQuery::getTerms() const'
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Andreas Müller <[email protected]>
----
- src/assistant/help/help.pro | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/assistant/help/help.pro b/src/assistant/help/help.pro
-index 37d5ba4..8de8763 100644
---- a/src/assistant/help/help.pro
-+++ b/src/assistant/help/help.pro
-@@ -60,3 +60,5 @@ HEADERS += qhelpsearchindexwriter_clucene_p.h \
-     qhelpsearchindexreader_clucene_p.h
- 
- load(qt_module)
-+
-+LIBS += -lQt5CLucene
recipes-qt/qt5/qttools_git.bb +1 -7
index 5c0f51c..9ca90a2 100644
@@ -4,13 +4,9 @@ require qt5-git.inc
 LICENSE = "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 )"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-    file://LICENSE.LGPLv21;md5=fb91571854638f10b2e5f36562661a5a \
-    file://LICENSE.LGPLv3;md5=a909b94c1c9674b2aa15ff03a86f518a \
     file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
     file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
-    file://LICENSE.GPLv3;md5=bfdd8aa675169432d6d9b63d056de148 \
-    file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
 "
 
@@ -20,8 +16,6 @@ DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
 
 SRC_URI += " \
     file://run-ptest \
-    file://0002-assistant-help-fix-linking-of-dependent-libraries.patch \
-    file://0003-add-noqtwebkit-configuration.patch \
     file://0004-linguist-tools-cmake-allow-overriding-the-location-f.patch \
 "
 
@@ -33,7 +27,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
 
 EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
 
-SRCREV = "30c10900adecca55faa1d59c2f0caac74b1f9df6"
+SRCREV = "88e02bb0a9b97d68a4b270e4ddfb6d0847c702a9"
 
 BBCLASSEXTEND = "native nativesdk"
 
recipes-qt/qt5/qttranslations_git.bb +1 -1
index 53ab199..822517f 100644
@@ -114,4 +114,4 @@ FILES_${PN}-qt = " \
     ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \
 "
 
-SRCREV = "c0ae29b2328922f16cb2305f8579c2a869c871b0"
+SRCREV = "3e727a890f7856978469ee38ef0619b1b59a8ca7"
recipes-qt/qt5/qtvirtualkeyboard_git.bb +1 -1
index 244e529..2b865bb 100644
@@ -50,4 +50,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
 
 DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns"
 
-SRCREV = "cfa4ab4cbf13971d4b71ee920353822755a3bf31"
+SRCREV = "bdf61afe76e94ef03da1332c4540646f18f5852f"
recipes-qt/qt5/qtwayland_git.bb +1 -5
index ffe2208..91c7230 100644
@@ -7,13 +7,9 @@ DEPENDS_append_class-target = " libxkbcommon"
 LICENSE = "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 )"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-    file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
     file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
     file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
-    file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
 "
 
@@ -41,7 +37,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature
 
 EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
 
-SRCREV = "0e2a950895805457a45abe860bc91a7cc4ba405e"
+SRCREV = "f1cf62fa8e9ffa2548c9968906848596f50dbc0b"
 
 # From https://bugreports.qt.io/browse/QTBUG-57767
 SRC_URI += " \
recipes-qt/qt5/qtwebchannel_git.bb +1 -1
index d5f8685..f1167a9 100644
@@ -17,4 +17,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtdeclarative qtwebsockets"
 
-SRCREV = "e3ddde4b26a72d57beeeed4e2d3384896e3a399d"
+SRCREV = "6383f0fc5eec4935697a6d2d2f87b511bbeb678e"
recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch renamed from recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch +1 -1
similarity index 97%
rename from recipes-qt/qt5/qtwebengine/0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
rename to recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch
index 587b632..44c3f0b 100644
@@ -1,4 +1,4 @@
-From 79a62dbe498946f487edcb0228c350d9fe7e4d09 Mon Sep 17 00:00:00 2001
+From 1634633d27cea7369111c9ea6d08be8515c15ccd Mon Sep 17 00:00:00 2001
 From: Cleiton Bueno <[email protected]>
 Date: Thu, 24 Dec 2015 12:46:58 -0200
 Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX
recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch deleted +0 -24
deleted file mode 100644
index 560a027..0000000
@@ -1,24 +0,0 @@
-From d70a7ccba09ba96e0068ad253b3aac7a47125f8e Mon Sep 17 00:00:00 2001
-From: Martin Jansa <[email protected]>
-Date: Fri, 3 Oct 2014 03:52:11 +0200
-Subject: [PATCH] chromium base.gypi: include atomicops_internals_x86_gcc.cc
- when building for x64 arch
-
-Signed-off-by: Martin Jansa <[email protected]>
----
- chromium/base/base.gypi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromium/base/base.gypi b/chromium/base/base.gypi
-index a4da596070..13173d621e 100644
---- a/chromium/base/base.gypi
-+++ b/chromium/base/base.gypi
-@@ -845,7 +845,7 @@
-                 ['include', '^nix/'],
-               ],
-           }],
--          ['use_qt==1 and target_arch=="ia32"', {
-+          ['use_qt==1 and target_arch=="ia32" or target_arch=="x64"', {
-               'sources/': [
-                 ['include', 'atomicops_internals_x86_gcc.cc'],
-               ],
recipes-qt/qt5/qtwebengine/0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch deleted +0 -27
deleted file mode 100644
index 3d8b3b0..0000000
@@ -1,27 +0,0 @@
-From 2f3a16a0efaf02521425da2db7d88710da3074b4 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <[email protected]>
-Date: Mon, 30 Jun 2014 20:08:17 +0200
-Subject: [PATCH] functions.prf: Don't match QMAKE_EXT_CPP or QMAKE_EXT_H
- anywhere in path, but at the end
-
-Signed-off-by: Martin Jansa <[email protected]>
----
- tools/qmake/mkspecs/features/functions.prf | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
-index 236ee8ac..0333bdd1 100644
---- a/tools/qmake/mkspecs/features/functions.prf
-+++ b/tools/qmake/mkspecs/features/functions.prf
-@@ -319,9 +319,9 @@ defineReplace(mocOutput) {
-   out = $$1
-   # The order is important, since the output of the second replace would end up accidentaly transformed by the first one
-   for(ext, $$list($${QMAKE_EXT_CPP})): \
--      out = $$replace(out, ^(.*)($$re_escape($${ext})), $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC})
-+      out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC})
-   for(ext, $$list($${QMAKE_EXT_H})): \
--      out = $$replace(out, ^(.*)($$re_escape($${ext})), $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)})
-+      out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_H_MOD_MOC}\\1$${first(QMAKE_EXT_CPP)})
-   return($$out)
- }
- 
recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch renamed from recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch +7 -7
similarity index 64%
rename from recipes-qt/qt5/qtwebengine/0003-functions.prf-allow-build-for-linux-oe-g-platform.patch
rename to recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch
index a460178..a91a298 100644
@@ -1,4 +1,4 @@
-From 5ff09196304a38304893e0703a8a7d2df2ec889a Mon Sep 17 00:00:00 2001
+From 491576d7e67d00b93106592140e5d7f0f34ea641 Mon Sep 17 00:00:00 2001
 From: Frieder Schrempf <[email protected]>
 Date: Mon, 1 Dec 2014 14:34:40 +0000
 Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform
@@ -8,14 +8,14 @@ Upstream-Status: Inappropriate [OE specific]
 Signed-off-by: Frieder Schrempf <[email protected]>
 Signed-off-by: Martin Jansa <[email protected]>
 ---
- tools/qmake/mkspecs/features/functions.prf | 6 ++++++
+ mkspecs/features/functions.prf | 6 ++++++
  1 file changed, 6 insertions(+)
 
-diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
-index 687d34f8..5c0c40fd 100644
---- a/tools/qmake/mkspecs/features/functions.prf
-+++ b/tools/qmake/mkspecs/features/functions.prf
-@@ -21,6 +21,12 @@ defineTest(isPlatformSupported) {
+diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
+index eb421f8b..4513742d 100644
+--- a/mkspecs/features/functions.prf
++++ b/mkspecs/features/functions.prf
+@@ -33,6 +33,12 @@ defineTest(isPlatformSupported) {
        return(false)
      }
      gcc:!clang:!isGCCVersionSupported(): return(false)
recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch renamed from recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch +2 -2
similarity index 88%
rename from recipes-qt/qt5/qtwebengine/0004-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
rename to recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch
index 4001563..d5567c3 100644
@@ -1,4 +1,4 @@
-From 0e1143af443c80cd49663b55128ab4dd8e570ee1 Mon Sep 17 00:00:00 2001
+From 6b48d76b5af38a49f8e438e45c387f01b263e483 Mon Sep 17 00:00:00 2001
 From: Cleiton Bueno <[email protected]>
 Date: Fri, 25 Dec 2015 18:16:05 -0200
 Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor
@@ -9,7 +9,7 @@ Signed-off-by: Cleiton Bueno <[email protected]>
  1 file changed, 2 insertions(+)
 
 diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
-index d692140e..58528114 100644
+index 2ecd70d7..703d1a92 100644
 --- a/src/webengine/api/qquickwebengineview_p_p.h
 +++ b/src/webengine/api/qquickwebengineview_p_p.h
 @@ -59,6 +59,8 @@
recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch new file +40 -0
new file mode 100644
index 0000000..5f9eb3a
@@ -0,0 +1,40 @@
+From b1a6f73d49a340e99145a4c4cf70dc796ed632ff Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <[email protected]>
+Date: Wed, 15 Mar 2017 13:53:28 +0200
+Subject: [PATCH] chromium: Force host toolchain configuration
+
+Force gcc/g++ to be used for parts using host toolchain, since
+the option(host_build) does not work in yocto builds.
+
+Upstream-Status: Inappropriate [OE specific]
+Signed-off-by: Samuli Piippo <[email protected]>
+Signed-off-by: Martin Jansa <[email protected]>
+---
+ chromium/tools/gn/bootstrap/bootstrap.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py
+index 43d252b43e..e58347848e 100755
+--- a/chromium/tools/gn/bootstrap/bootstrap.py
++++ b/chromium/tools/gn/bootstrap/bootstrap.py
+@@ -298,14 +298,14 @@ def write_gn_ninja(path, root_gen_dir, options):
+     ld = os.environ.get('LD', 'link.exe')
+     ar = os.environ.get('AR', 'lib.exe')
+   else:
+-    cc = os.environ.get('CC', 'cc')
+-    cxx = os.environ.get('CXX', 'c++')
++    cc = os.environ.get('CC_host', 'gcc')
++    cxx = os.environ.get('CXX_host', 'g++')
+     ld = cxx
+-    ar = os.environ.get('AR', 'ar')
++    ar = os.environ.get('AR_host', 'ar')
+ 
+-  cflags = os.environ.get('CFLAGS', '').split()
+-  cflags_cc = os.environ.get('CXXFLAGS', '').split()
+-  ldflags = os.environ.get('LDFLAGS', '').split()
++  cflags = os.environ.get('CFLAGS_host', '').split()
++  cflags_cc = os.environ.get('CXXFLAGS_host', '').split()
++  ldflags = os.environ.get('LDFLAGS_host', '').split()
+   include_dirs = [root_gen_dir, SRC_ROOT]
+   libs = []
+ 
recipes-qt/qt5/qtwebengine/0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch deleted +0 -26
deleted file mode 100644
index 93e68b5..0000000
@@ -1,26 +0,0 @@
-From bf7f70ae0bf7345c2546f4f4bc371a9e8eeb0bd3 Mon Sep 17 00:00:00 2001
-From: Simon Busch <[email protected]>
-Date: Tue, 18 Nov 2014 10:38:18 +0100
-Subject: [PATCH] functions.prf: Make sure we only use the file name to
- generate it's moc'ed abbreviation
-
-Signed-off-by: Simon Busch <[email protected]>
-Signed-off-by: Martin Jansa <[email protected]>
----
- tools/qmake/mkspecs/features/functions.prf | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf
-index 0333bdd1..687d34f8 100644
---- a/tools/qmake/mkspecs/features/functions.prf
-+++ b/tools/qmake/mkspecs/features/functions.prf
-@@ -316,7 +316,8 @@ defineReplace(findIncludedMocFiles) {
- }
- 
- defineReplace(mocOutput) {
--  out = $$1
-+  in = $$1
-+  out = $$basename(in)
-   # The order is important, since the output of the second replace would end up accidentaly transformed by the first one
-   for(ext, $$list($${QMAKE_EXT_CPP})): \
-       out = $$replace(out, ^(.*)($$re_escape($${ext}))$, $${QMAKE_CPP_MOD_MOC}\\1$${QMAKE_EXT_CPP_MOC})
recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch renamed from recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch +4 -4
similarity index 80%
rename from recipes-qt/qt5/qtwebengine/0005-Include-dependency-to-QCoreApplication-translate.patch
rename to recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch
index 196ef4c..2fa1764 100644
@@ -1,4 +1,4 @@
-From d8fd8c8388c54a0322e60e8be49236df3862ec56 Mon Sep 17 00:00:00 2001
+From 95a6e3fd9e8498cb1f59120d402ec8ecfcd3ec59 Mon Sep 17 00:00:00 2001
 From: Cleiton Bueno <[email protected]>
 Date: Thu, 24 Dec 2015 15:59:51 -0200
 Subject: [PATCH] Include dependency to QCoreApplication::translate()
@@ -9,12 +9,12 @@ Signed-off-by: Cleiton Bueno <[email protected]>
  1 file changed, 2 insertions(+)
 
 diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h
-index b21d40b8..758d5335 100644
+index c378c327..1d33d956 100644
 --- a/src/core/media_capture_devices_dispatcher.h
 +++ b/src/core/media_capture_devices_dispatcher.h
-@@ -46,6 +46,8 @@
+@@ -45,6 +45,8 @@
+ #include <list>
  #include <map>
- #include <QtCore/qcompilerdetection.h>
  
 +#include <QCoreApplication>
 +
recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch renamed from recipes-qt/qt5/qtwebengine/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch +1 -1
similarity index 93%
rename from recipes-qt/qt5/qtwebengine/0005-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
rename to recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch
index b1a0857..8785842 100644
@@ -1,4 +1,4 @@
-From fac50c58630264d67e447c2dcdcf54b4f806d35e Mon Sep 17 00:00:00 2001
+From 8910e65fd777120261f16c4a35ace2b0dc6181b3 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 14:01:12 -0700
 Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not
recipes-qt/qt5/qtwebengine/0003-chromium-v8-fix-build-with-gcc7.patch deleted +0 -131

131 lines not on this page · raw message

recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch new file +44 -0

44 lines not on this page · raw message

recipes-qt/qt5/qtwebengine/0004-chromium-WebKit-fix-build-with-gcc7.patch deleted +0 -41

41 lines not on this page · raw message

recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch renamed from recipes-qt/qt5/qtwebengine/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch +4 -4
similarity index 88%
rename from recipes-qt/qt5/qtwebengine/0006-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
rename to recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
index 43982da..05b813b 100644
@@ -1,4 +1,4 @@
-From e7e4def6d1422b84a9d6a6f7b285515d96210e87 Mon Sep 17 00:00:00 2001
+From 86f467724070e854c8c6b13269951c97c0832dae Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 14:09:06 -0700
 Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux
@@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <[email protected]>
  2 files changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc
-index 3b1a933bce..a554d03739 100644
+index 7d0cb57931..10be59ebad 100644
 --- a/chromium/base/trace_event/malloc_dump_provider.cc
 +++ b/chromium/base/trace_event/malloc_dump_provider.cc
-@@ -103,6 +103,7 @@ MallocDumpProvider::~MallocDumpProvider() {}
+@@ -210,6 +210,7 @@ MallocDumpProvider::~MallocDumpProvider() {}
  // the current process.
  bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
                                        ProcessMemoryDump* pmd) {
@@ -21,7 +21,7 @@ index 3b1a933bce..a554d03739 100644
    size_t total_virtual_size = 0;
    size_t resident_size = 0;
    size_t allocated_objects_size = 0;
-@@ -195,7 +196,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
+@@ -321,7 +322,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
      pmd->DumpHeapUsage(metrics_by_context, overhead, "malloc");
    }
    tid_dumping_heap_ = kInvalidThreadId;
recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch renamed from recipes-qt/qt5/qtwebengine/0007-chromium-musl-include-fcntl.h-for-loff_t.patch +3 -3
similarity index 85%
rename from recipes-qt/qt5/qtwebengine/0007-chromium-musl-include-fcntl.h-for-loff_t.patch
rename to recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch
index 95a12b0..2d7bd02 100644
@@ -1,4 +1,4 @@
-From eac1905c90085d3b9de3764078022643dd1b5ce9 Mon Sep 17 00:00:00 2001
+From 0a409a773f2b2936a2f1868d983e7bd1c92110bd Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 14:37:49 -0700
 Subject: [PATCH] chromium: musl: include fcntl.h for loff_t
@@ -9,10 +9,10 @@ Signed-off-by: Khem Raj <[email protected]>
  1 file changed, 1 insertion(+)
 
 diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
-index bdbc4b7e3b..b53dd46c57 100644
+index b29ec2d29a..91f77dd88d 100644
 --- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
 +++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
-@@ -151,6 +151,7 @@ extern "C" {
+@@ -150,6 +150,7 @@ extern "C" {
  #include <stddef.h>
  #include <stdint.h>
  #include <string.h>
recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch renamed from recipes-qt/qt5/qtwebengine/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch +1 -1
similarity index 97%
rename from recipes-qt/qt5/qtwebengine/0008-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
rename to recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch
index d15a63f..f58de8f 100644
@@ -1,4 +1,4 @@
-From 1690ac56cc013c3a18aa3c83e0efae47cc9da4f0 Mon Sep 17 00:00:00 2001
+From 375b70a99760c156b45e60def9bafd04902fb5a4 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 14:38:37 -0700
 Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t
recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch renamed from recipes-qt/qt5/qtwebengine/0009-chromium-musl-linux-glibc-make-the-distinction.patch +1 -1
similarity index 94%
rename from recipes-qt/qt5/qtwebengine/0009-chromium-musl-linux-glibc-make-the-distinction.patch
rename to recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch
index 434d62c..c3b1cbb 100644
@@ -1,4 +1,4 @@
-From 71072da07e963ae1b05f9d956ef715de8d249c5d Mon Sep 17 00:00:00 2001
+From 314cfb7b41be8fc4f962956e0acd34f110114c6e Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 14:54:38 -0700
 Subject: [PATCH] chromium: musl: linux != glibc, make the distinction
recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch renamed from recipes-qt/qt5/qtwebengine/0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch +3 -3
similarity index 85%
rename from recipes-qt/qt5/qtwebengine/0010-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
rename to recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch
index 4393103..550fd79 100644
@@ -1,4 +1,4 @@
-From 43384ce7ab1d3b14820cb9bc0698130be9291a8e Mon Sep 17 00:00:00 2001
+From bc3745992889e3dc3b42c890b6a458038c6994e0 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 15:09:02 -0700
 Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols
@@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/chromium/base/allocator/allocator_shim.cc b/chromium/base/allocator/allocator_shim.cc
-index af08ec039f..15070b9a13 100644
+index 95480ea4b6..1de3d1a532 100644
 --- a/chromium/base/allocator/allocator_shim.cc
 +++ b/chromium/base/allocator/allocator_shim.cc
-@@ -244,7 +244,7 @@ void ShimFree(void* address) {
+@@ -266,7 +266,7 @@ void ShimFree(void* address) {
  // In the case of tcmalloc we also want to plumb into the glibc hooks
  // to avoid that allocations made in glibc itself (e.g., strdup()) get
  // accidentally performed on the glibc heap instead of the tcmalloc one.
recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch renamed from recipes-qt/qt5/qtwebengine/0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch +1 -1
similarity index 94%
rename from recipes-qt/qt5/qtwebengine/0011-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
rename to recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch
index 04e0012..82a2ccc 100644
@@ -1,4 +1,4 @@
-From 701bb2640d5e5b03e8e019600a076c93508e1541 Mon Sep 17 00:00:00 2001
+From de4e672044de11c5927aeb42a554f5eced0abf6c Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 15:12:39 -0700
 Subject: [PATCH] chromium: musl: Use correct member name __si_fields from
recipes-qt/qt5/qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch renamed from recipes-qt/qt5/qtwebengine/0012-chromium-musl-Match-syscalls-to-match-musl.patch +4 -4
similarity index 84%
rename from recipes-qt/qt5/qtwebengine/0012-chromium-musl-Match-syscalls-to-match-musl.patch
rename to recipes-qt/qt5/qtwebengine/0010-chromium-musl-Match-syscalls-to-match-musl.patch
index b5a0f84..235e2cc 100644
@@ -1,4 +1,4 @@
-From ad184ecc5e5e67d1f3862e9ed3f767dff9bbc414 Mon Sep 17 00:00:00 2001
+From e4d99e001315f1bb34e6ff6531c0a528640b76d8 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 15:24:49 -0700
 Subject: [PATCH] chromium: musl: Match syscalls to match musl
@@ -9,10 +9,10 @@ Signed-off-by: Khem Raj <[email protected]>
  1 file changed, 16 insertions(+)
 
 diff --git a/chromium/third_party/lss/linux_syscall_support.h b/chromium/third_party/lss/linux_syscall_support.h
-index 8a42c1c868..8e878c70f2 100644
+index 9dbd2391b2..a715de177c 100644
 --- a/chromium/third_party/lss/linux_syscall_support.h
 +++ b/chromium/third_party/lss/linux_syscall_support.h
-@@ -717,6 +717,14 @@ struct kernel_statfs {
+@@ -793,6 +793,14 @@ struct kernel_statfs {
  #endif
  
  
@@ -27,7 +27,7 @@ index 8a42c1c868..8e878c70f2 100644
  #if defined(__x86_64__)
  #ifndef ARCH_SET_GS
  #define ARCH_SET_GS             0x1001
-@@ -1134,6 +1142,14 @@ struct kernel_statfs {
+@@ -1210,6 +1218,14 @@ struct kernel_statfs {
  #ifndef __NR_fallocate
  #define __NR_fallocate          285
  #endif
recipes-qt/qt5/qtwebengine/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch renamed from recipes-qt/qt5/qtwebengine/0013-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch +1 -1
similarity index 97%
rename from recipes-qt/qt5/qtwebengine/0013-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
rename to recipes-qt/qt5/qtwebengine/0011-chromium-musl-Define-res_ninit-and-res_nclose-for-no.patch
index 68b8f45..da0858a 100644
@@ -1,4 +1,4 @@
-From c892406f07b4e214397c55de62eccac3d558b134 Mon Sep 17 00:00:00 2001
+From 80953719539b60ea6a908710d4bb7cb78acc6920 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 15:27:50 -0700
 Subject: [PATCH] chromium: musl: Define res_ninit and res_nclose for non-glibc
recipes-qt/qt5/qtwebengine/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch renamed from recipes-qt/qt5/qtwebengine/0014-chromium-musl-Do-not-define-__sbrk-on-musl.patch +1 -1
similarity index 94%
rename from recipes-qt/qt5/qtwebengine/0014-chromium-musl-Do-not-define-__sbrk-on-musl.patch
rename to recipes-qt/qt5/qtwebengine/0012-chromium-musl-Do-not-define-__sbrk-on-musl.patch
index c980189..16705e5 100644
@@ -1,4 +1,4 @@
-From be624e7cc1bc18e9e198bba16fcb224a7f9746fc Mon Sep 17 00:00:00 2001
+From 0b4922e1ed4b7f4e7ada7a840dec067f05c8e9f7 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 15:39:57 -0700
 Subject: [PATCH] chromium: musl: Do not define __sbrk on musl
recipes-qt/qt5/qtwebengine/0013-chromium-musl-Adjust-default-pthread-stack-size.patch renamed from recipes-qt/qt5/qtwebengine/0015-chromium-musl-Adjust-default-pthread-stack-size.patch +15 -15
similarity index 70%
rename from recipes-qt/qt5/qtwebengine/0015-chromium-musl-Adjust-default-pthread-stack-size.patch
rename to recipes-qt/qt5/qtwebengine/0013-chromium-musl-Adjust-default-pthread-stack-size.patch
index 997e312..82e49f6 100644
@@ -1,4 +1,4 @@
-From 295fd835b22203807962a3eea08a12b74ae54c2c Mon Sep 17 00:00:00 2001
+From 54cf1a5476fac8b7d5a18742a63abdec788989a7 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 16:41:23 -0700
 Subject: [PATCH] chromium: musl: Adjust default pthread stack size
@@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <[email protected]>
  2 files changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/chromium/base/threading/platform_thread_linux.cc b/chromium/base/threading/platform_thread_linux.cc
-index 95ed32418f..666e85ba33 100644
+index 92fbda5ee1..c41579d4ed 100644
 --- a/chromium/base/threading/platform_thread_linux.cc
 +++ b/chromium/base/threading/platform_thread_linux.cc
-@@ -96,7 +96,8 @@ void TerminateOnThread() {}
+@@ -175,7 +175,8 @@ void TerminateOnThread() {}
  
  size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
  #if !defined(THREAD_SANITIZER)
@@ -24,24 +24,24 @@ index 95ed32418f..666e85ba33 100644
    // ThreadSanitizer bloats the stack heavily. Evidence has been that the
    // default stack size isn't enough for some browser tests.
 diff --git a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp
-index 3c0a0395b1..2af6073e21 100644
+index 1d164f510a..3358deb256 100644
 --- a/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp
 +++ b/chromium/third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp
-@@ -73,7 +73,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize()
-     // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
-     // correctly for the main thread.
+@@ -68,7 +68,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() {
+ // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
+ // correctly for the main thread.
  
 -#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD)
 +#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD)
-     // pthread_getattr_np() can fail if the thread is not invoked by
-     // pthread_create() (e.g., the main thread of webkit_unit_tests).
-     // If so, a conservative size estimate is returned.
-@@ -135,7 +135,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize()
+   // pthread_getattr_np() can fail if the thread is not invoked by
+   // pthread_create() (e.g., the main thread of webkit_unit_tests).
+   // If so, a conservative size estimate is returned.
+@@ -135,7 +135,7 @@ size_t StackFrameDepth::getUnderestimatedStackSize() {
+ }
  
- void* StackFrameDepth::getStackStart()
- {
+ void* StackFrameDepth::getStackStart() {
 -#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD)
 +#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD)
-     pthread_attr_t attr;
-     int error;
+   pthread_attr_t attr;
+   int error;
  #if OS(FREEBSD)
recipes-qt/qt5/qtwebengine/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch renamed from recipes-qt/qt5/qtwebengine/0016-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch +3 -3
similarity index 82%
rename from recipes-qt/qt5/qtwebengine/0016-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch
rename to recipes-qt/qt5/qtwebengine/0014-chromium-musl-include-asm-generic-ioctl.h-for-TCGETS.patch
index 2e80de8..ac3afbf 100644
@@ -1,4 +1,4 @@
-From 91d9e3476c6432ae9ea8f8c0a9f6c435be844da0 Mon Sep 17 00:00:00 2001
+From 77bac704279103e74d8d7d35c933517dcfb9b7fc Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 17:15:34 -0700
 Subject: [PATCH] chromium: musl: include asm-generic/ioctl.h for TCGETS2
@@ -9,7 +9,7 @@ Signed-off-by: Khem Raj <[email protected]>
  1 file changed, 1 insertion(+)
 
 diff --git a/chromium/device/serial/serial_io_handler_posix.cc b/chromium/device/serial/serial_io_handler_posix.cc
-index 158c374a03..c08fb4a8ec 100644
+index a2ca2e2309..e139cdf9e9 100644
 --- a/chromium/device/serial/serial_io_handler_posix.cc
 +++ b/chromium/device/serial/serial_io_handler_posix.cc
 @@ -6,6 +6,7 @@
@@ -18,5 +18,5 @@ index 158c374a03..c08fb4a8ec 100644
  #include <termios.h>
 +#include <asm-generic/ioctls.h>
  
+ #include "base/files/file_util.h"
  #include "base/posix/eintr_wrapper.h"
- #include "build/build_config.h"
recipes-qt/qt5/qtwebengine/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch renamed from recipes-qt/qt5/qtwebengine/0018-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch +3 -3
similarity index 88%
rename from recipes-qt/qt5/qtwebengine/0018-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch
rename to recipes-qt/qt5/qtwebengine/0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch
index fe141aa..668697c 100644
@@ -1,4 +1,4 @@
-From d05c22bdabe10c0db9b65252e442251efc81a379 Mon Sep 17 00:00:00 2001
+From 27690efdf920cafeab96f70eec0c66803c908cd4 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Sat, 8 Jul 2017 09:08:23 -0700
 Subject: [PATCH] chromium: musl: tcmalloc: Use off64_t insread of __off64_t
@@ -9,10 +9,10 @@ Signed-off-by: Khem Raj <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
-index b53dd46c57..58da4d19d7 100644
+index 91f77dd88d..bb84a0b305 100644
 --- a/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
 +++ b/chromium/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
-@@ -1930,7 +1930,7 @@ typedef unsigned long int ulong;
+@@ -1929,7 +1929,7 @@ typedef unsigned long int ulong;
    #if defined(__x86_64__)
      /* Need to make sure __off64_t isn't truncated to 32-bits under x32.  */
      LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
recipes-qt/qt5/qtwebengine/0017-chromium-musl-link-with-libexecinfo-on-musl.patch deleted +0 -22
deleted file mode 100644
index 5e28adb..0000000
@@ -1,22 +0,0 @@
-From a8163b060b699aa6678c45c970f4fbc806a6c198 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Fri, 7 Jul 2017 17:41:43 -0700
-Subject: [PATCH] chromium: musl: link with libexecinfo on musl
-
-Signed-off-by: Khem Raj <[email protected]>
----
- chromium/base/base.gyp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/chromium/base/base.gyp b/chromium/base/base.gyp
-index 3c3aded640..347b7e7856 100644
---- a/chromium/base/base.gyp
-+++ b/chromium/base/base.gyp
-@@ -126,6 +126,7 @@
-               '-lrt',
-               # For 'native_library_linux.cc'
-               '-ldl',
-+              '-lexecinfo',
-             ],
-           },
-           'conditions': [
recipes-qt/qt5/qtwebengine_git.bb +43 -45

145 lines not on this page · raw message

recipes-qt/qt5/qtwebkit-examples_git.bb +1 -1
index 84b4d0b..286aeca 100644
@@ -17,4 +17,4 @@ DEPENDS += "qtwebkit qtxmlpatterns"
 RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
 RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"
 
-SRCREV = "f0898f83abdcacc8bd3bca3479884376b0963398"
+SRCREV = "822426abc77a74752b0ee0da4d0a1c106c4dac22"
recipes-qt/qt5/qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch deleted +0 -76

76 lines not on this page · raw message

recipes-qt/qt5/qtwebkit_git.bb +1 -2
index 3c52ef3..5c1ecfa 100644
@@ -20,7 +20,6 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
 
 SRC_URI += "\
     file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \
-    file://0002-Remove-TEXTREL-tag-in-x86.patch \
     file://0003-Exclude-backtrace-API-for-non-glibc-libraries.patch \
     file://0004-Fix-compilation-with-ICU-59.patch \
 "
@@ -87,4 +86,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db
 RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
 export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
 
-SRCREV = "74ac5b0f3489f9a08d083b6c9607c9d5c2d4afd2"
+SRCREV = "f27089657a207ef8c5c9d27d661d3d12c3af8df2"
recipes-qt/qt5/qtwebsockets_git.bb +1 -1
index 043b394..41ec27f 100644
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtdeclarative"
 
-SRCREV = "afb3c58d035db1119666c8556c215187be4f64b8"
+SRCREV = "1421c3e4ae4213ca18f2f51d5ddb38e223450222"
recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch new file +22 -0
new file mode 100644
index 0000000..82087b9
@@ -0,0 +1,22 @@
+From b946b6ea4a2a30bd12ecd036e40c9ef671681ba8 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <[email protected]>
+Date: Fri, 2 Jun 2017 13:12:18 +0300
+Subject: [PATCH] Add missing include for qWarning
+
+Change-Id: I7c7699e7a2b7ce59e4f659d460ec835f59bba439
+---
+ src/webview/qquickwebview.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/webview/qquickwebview.cpp b/src/webview/qquickwebview.cpp
+index d760564..fbbbfd6 100644
+--- a/src/webview/qquickwebview.cpp
++++ b/src/webview/qquickwebview.cpp
+@@ -39,6 +39,7 @@
+ #include <QtWebView/private/qwebviewloadrequest_p.h>
+ #include <QtQml/qqmlengine.h>
+ #include <QtCore/qmutex.h>
++#include <QtCore/QDebug>
+ 
+ namespace {
+ 
recipes-qt/qt5/qtwebview_git.bb new file +24 -0
new file mode 100644
index 0000000..d48b6c4
@@ -0,0 +1,24 @@
+LICENSE = "GFDL-1.3 & BSD & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = " \
+    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
+    file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
+    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
+    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
+"
+
+require qt5.inc
+require qt5-git.inc
+
+SRC_URI += "file://0001-Add-missing-include-for-qWarning.patch"
+
+DEPENDS += "qtbase qtwebengine"
+
+COMPATIBLE_MACHINE = "(-)"
+COMPATIBLE_MACHINE_x86 = "(.*)"
+COMPATIBLE_MACHINE_x86-64 = "(.*)"
+COMPATIBLE_MACHINE_armv6 = "(.*)"
+COMPATIBLE_MACHINE_armv7a = "(.*)"
+COMPATIBLE_MACHINE_armv7ve = "(.*)"
+COMPATIBLE_MACHINE_aarch64 = "(.*)"
+
+SRCREV = "6e55abf3b6a5f373cd4b649c2318a45c49b40589"
recipes-qt/qt5/qtx11extras_git.bb +1 -1
index 81c72ec..bf03e9b 100644
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
-SRCREV = "54cc3158acfc75d12338df3b678e013909e66f60"
+SRCREV = "9e83ff8713c1a3f69ce514bf3e31335194668da7"
recipes-qt/qt5/qtxmlpatterns_git.bb +1 -1
index 9333be0..30e5262 100644
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
-SRCREV = "9f7e01b582b1bd83cc6b8a854c510871335e2e74"
+SRCREV = "c1c3af0ae456247c9bcd30161d51a94c9b38dc52"
 
 BBCLASSEXTEND =+ "native nativesdk"
 
Signature · 1 line
2.14.1
#2 lore raw

PATCH v2 3/7 qtwebengine: add a fix for building demobrowser without printing support

In reply to Martin Jansa
---
 .../0005-Always-compile-QWebEnginePage-print.patch | 241 +++++++++++++++++++++
 recipes-qt/qt5/qtwebengine_git.bb                  |   6 +
 2 files changed, 247 insertions(+)
 create mode 100644 recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch new file +241 -0
new file mode 100644
index 0000000..c63086d
@@ -0,0 +1,241 @@
+From a8c0deca850ca519b3f146c71492a8f42a33dd84 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=BCri=20Valdmann?= <[email protected]>
+Date: Tue, 20 Jun 2017 15:36:43 +0200
+Subject: [PATCH] Always compile QWebEnginePage::print
+
+- Remove two out of five layers of ifdefs around and inside this method.
+- Now always compiled but will yield an error if printing is disabled.
+- Remove printing-related ifdefs from demobrowser.
+
+Task-number: QTBUG-61510
+Change-Id: I79781189d3d3fb62db0a2216b2b989e3fa1d1f86
+Reviewed-by: Allan Sandfeld Jensen <[email protected]>
+Reviewed-by: Rolf Eike Beer <[email protected]>
+---
+ examples/webenginewidgets/demobrowser/browsermainwindow.cpp | 12 ------------
+ examples/webenginewidgets/demobrowser/browsermainwindow.h   |  6 ------
+ examples/webenginewidgets/demobrowser/printtopdfdialog.cpp  |  7 -------
+ src/webenginewidgets/api/qwebenginepage.cpp                 | 10 ++--------
+ src/webenginewidgets/api/qwebenginepage.h                   |  8 --------
+ 5 files changed, 2 insertions(+), 41 deletions(-)
+
+diff --git a/examples/webenginewidgets/demobrowser/browsermainwindow.cpp b/examples/webenginewidgets/demobrowser/browsermainwindow.cpp
+index 327d7a9d..14d49f7f 100644
+--- a/examples/webenginewidgets/demobrowser/browsermainwindow.cpp
++++ b/examples/webenginewidgets/demobrowser/browsermainwindow.cpp
+@@ -109,9 +109,7 @@ BrowserMainWindow::BrowserMainWindow(QWidget *parent, Qt::WindowFlags flags)
+     , m_historyForward(0)
+     , m_stop(0)
+     , m_reload(0)
+-#ifndef QT_NO_PRINTER
+     , m_currentPrinter(nullptr)
+-#endif
+ {
+     setToolButtonStyle(Qt::ToolButtonFollowStyle);
+     setAttribute(Qt::WA_DeleteOnClose, true);
+@@ -312,9 +310,7 @@ void BrowserMainWindow::setupMenu()
+ #if defined(QWEBENGINEPAGE_PRINT)
+     fileMenu->addAction(tr("P&rint Preview..."), this, SLOT(slotFilePrintPreview()));
+ #endif
+-#ifndef QT_NO_PRINTER
+     fileMenu->addAction(tr("&Print..."), this, SLOT(slotFilePrint()), QKeySequence::Print);
+-#endif
+     fileMenu->addAction(tr("&Print to PDF..."), this, SLOT(slotFilePrintToPDF()));
+     fileMenu->addSeparator();
+ 
+@@ -702,23 +698,19 @@ void BrowserMainWindow::slotFileOpen()
+ 
+ void BrowserMainWindow::slotFilePrintPreview()
+ {
+-#ifndef QT_NO_PRINTPREVIEWDIALOG
+     if (!currentTab())
+         return;
+     QPrintPreviewDialog *dialog = new QPrintPreviewDialog(this);
+     connect(dialog, SIGNAL(paintRequested(QPrinter*)),
+             currentTab(), SLOT(print(QPrinter*)));
+     dialog->exec();
+-#endif
+ }
+ 
+ void BrowserMainWindow::slotFilePrint()
+ {
+-#ifndef QT_NO_PRINTER
+     if (!currentTab())
+         return;
+     printRequested(currentTab()->page());
+-#endif
+ }
+ 
+ void BrowserMainWindow::slotHandlePdfPrinted(const QByteArray& result)
+@@ -751,7 +743,6 @@ void BrowserMainWindow::slotFilePrintToPDF()
+     currentTab()->page()->printToPdf(invoke(this, &BrowserMainWindow::slotHandlePdfPrinted), dialog->pageLayout());
+ }
+ 
+-#ifndef QT_NO_PRINTER
+ void BrowserMainWindow::slotHandlePagePrinted(bool result)
+ {
+     Q_UNUSED(result);
+@@ -763,7 +754,6 @@ void BrowserMainWindow::slotHandlePagePrinted(bool result)
+ 
+ void BrowserMainWindow::printRequested(QWebEnginePage *page)
+ {
+-#ifndef QT_NO_PRINTDIALOG
+     if (m_currentPrinter)
+         return;
+     m_currentPrinter = new QPrinter();
+@@ -774,9 +764,7 @@ void BrowserMainWindow::printRequested(QWebEnginePage *page)
+         return;
+     }
+     page->print(m_currentPrinter, invoke(this, &BrowserMainWindow::slotHandlePagePrinted));
+-#endif
+ }
+-#endif
+ 
+ void BrowserMainWindow::slotPrivateBrowsing()
+ {
+diff --git a/examples/webenginewidgets/demobrowser/browsermainwindow.h b/examples/webenginewidgets/demobrowser/browsermainwindow.h
+index 91e1c1d2..5bbbb292 100644
+--- a/examples/webenginewidgets/demobrowser/browsermainwindow.h
++++ b/examples/webenginewidgets/demobrowser/browsermainwindow.h
+@@ -56,9 +56,7 @@
+ #include <QtCore/QUrl>
+ 
+ QT_BEGIN_NAMESPACE
+-#ifndef QT_NO_PRINTER
+ class QPrinter;
+-#endif
+ class QWebEnginePage;
+ QT_END_NAMESPACE
+ 
+@@ -142,10 +140,8 @@ private slots:
+     void slotSwapFocus();
+     void slotHandlePdfPrinted(const QByteArray&);
+ 
+-#ifndef QT_NO_PRINTER
+     void slotHandlePagePrinted(bool result);
+     void printRequested(QWebEnginePage *page);
+-#endif
+     void geometryChangeRequested(const QRect &geometry);
+     void updateToolbarActionText(bool visible);
+     void updateBookmarksToolbarActionText(bool visible);
+@@ -180,9 +176,7 @@ private:
+     QAction *m_restoreLastSession;
+     QAction *m_addBookmark;
+ 
+-#ifndef QT_NO_PRINTER
+     QPrinter *m_currentPrinter;
+-#endif
+ 
+     QIcon m_reloadIcon;
+     QIcon m_stopIcon;
+diff --git a/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp b/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp
+index 0f3b1765..50a8bb91 100644
+--- a/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp
++++ b/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp
+@@ -52,10 +52,8 @@
+ #include "ui_printtopdfdialog.h"
+ 
+ #include <QtCore/QDir>
+-#ifndef QT_NO_PRINTER
+ #include <QtPrintSupport/QPageSetupDialog>
+ #include <QtPrintSupport/QPrinter>
+-#endif // QT_NO_PRINTER
+ #include <QtWidgets/QFileDialog>
+ 
+ PrintToPdfDialog::PrintToPdfDialog(const QString &filePath, QWidget *parent) :
+@@ -66,11 +64,8 @@ PrintToPdfDialog::PrintToPdfDialog(const QString &filePath, QWidget *parent) :
+     ui->setupUi(this);
+     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+     connect(ui->chooseFilePathButton, &QToolButton::clicked, this, &PrintToPdfDialog::onChooseFilePathButtonClicked);
+-#ifndef QT_NO_PRINTER
+     connect(ui->choosePageLayoutButton, &QToolButton::clicked, this, &PrintToPdfDialog::onChoosePageLayoutButtonClicked);
+-#else
+     ui->choosePageLayoutButton->hide();
+-#endif // QT_NO_PRINTER
+     updatePageLayoutLabel();
+     setFilePath(filePath);
+ }
+@@ -82,7 +77,6 @@ PrintToPdfDialog::~PrintToPdfDialog()
+ 
+ void PrintToPdfDialog::onChoosePageLayoutButtonClicked()
+ {
+-#ifndef QT_NO_PRINTER
+     QPrinter printer;
+     printer.setPageLayout(currentPageLayout);
+ 
+@@ -92,7 +86,6 @@ void PrintToPdfDialog::onChoosePageLayoutButtonClicked()
+     currentPageLayout.setPageSize(printer.pageLayout().pageSize());
+     currentPageLayout.setOrientation(printer.pageLayout().orientation());
+     updatePageLayoutLabel();
+-#endif // QT_NO_PRINTER
+ }
+ 
+ void PrintToPdfDialog::onChooseFilePathButtonClicked()
+diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
+index 82720ae3..20d3268c 100644
+--- a/src/webenginewidgets/api/qwebenginepage.cpp
++++ b/src/webenginewidgets/api/qwebenginepage.cpp
+@@ -80,11 +80,9 @@
+ #include <QMenu>
+ #include <QMessageBox>
+ #include <QMimeData>
+-#if defined(QT_PRINTSUPPORT_LIB)
+-#ifndef QT_NO_PRINTER
++#ifdef ENABLE_PRINTING
+ #include <QPrinter>
+-#endif //QT_NO_PRINTER
+-#endif //QT_PRINTSUPPORT_LIB
++#endif
+ #include <QStandardPaths>
+ #include <QStyle>
+ #include <QTimer>
+@@ -2052,8 +2050,6 @@ void QWebEnginePage::printToPdf(const QWebEngineCallback<const QByteArray&> &res
+ #endif // if defined(ENABLE_PDF)
+ }
+ 
+-#if defined(QT_PRINTSUPPORT_LIB)
+-#ifndef QT_NO_PRINTER
+ /*!
+     \fn void QWebEnginePage::print(QPrinter *printer, FunctorOrLambda resultCallback)
+     Renders the current content of the page into a temporary PDF document, then prints it using \a printer.
+@@ -2090,8 +2086,6 @@ void QWebEnginePage::print(QPrinter *printer, const QWebEngineCallback<bool> &re
+     d->m_callbacks.invokeDirectly(resultCallback, false);
+ #endif // if defined(ENABLE_PDF)
+ }
+-#endif // if defined(QT_NO_PRINTER)
+-#endif // if defined(QT_PRINTSUPPORT_LIB)
+ 
+ /*!
+     \since 5.7
+diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
+index c7d5a19e..5619639c 100644
+--- a/src/webenginewidgets/api/qwebenginepage.h
++++ b/src/webenginewidgets/api/qwebenginepage.h
+@@ -55,11 +55,7 @@
+ 
+ QT_BEGIN_NAMESPACE
+ class QMenu;
+-#if defined(QT_PRINTSUPPORT_LIB)
+-#ifndef QT_NO_PRINTER
+ class QPrinter;
+-#endif // QT_NO_PRINTER
+-#endif // QT_PRINTSUPPORT_LIB
+ 
+ class QWebChannel;
+ class QWebEngineContextMenuData;
+@@ -294,15 +290,11 @@ public:
+     void printToPdf(const QWebEngineCallback<const QByteArray&> &resultCallback, const QPageLayout &layout = QPageLayout(QPageSize(QPageSize::A4), QPageLayout::Portrait, QMarginsF()));
+ #endif
+ 
+-#if defined(QT_PRINTSUPPORT_LIB)
+-#ifndef QT_NO_PRINTER
+ #ifdef Q_QDOC
+     void print(QPrinter *printer, FunctorOrLambda resultCallback);
+ #else
+     void print(QPrinter *printer, const QWebEngineCallback<bool> &resultCallback);
+ #endif // QDOC
+-#endif // QT_NO_PRINTER
+-#endif // QT_PRINTSUPPORT_LIB
+ 
+     const QWebEngineContextMenuData &contextMenuData() const;
+ 
recipes-qt/qt5/qtwebengine_git.bb +6 -0
index 19583f9..830e640 100644
@@ -129,12 +129,18 @@ RDEPENDS_${PN}-examples += " \
 
 QT_MODULE_BRANCH_CHROMIUM = "56-based"
 
+# Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9
 SRC_URI += " \
     ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
     file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \
     file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \
     file://0003-Include-dependency-to-QCoreApplication-translate.patch \
     file://0004-Force-host-toolchain-configuration.patch \
+    file://0005-Always-compile-QWebEnginePage-print.patch \
+"
+
+# Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based 
+SRC_URI += " \
     file://0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \
     file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \
 "
Signature · 1 line
2.14.1
#3 lore raw

PATCH v2 4/7 qt: refresh remaining patches and add links to meta-qt5 repos

In reply to Martin Jansa

* remove qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch which is already applied and fuzzy patch just apply the same section twice

* restore
qttools/0001-add-noqtwebkit-configuration.patch
which was removed from SRC_URI in 5.9 upgrade

* add comment with link to meta-qt5 repository where the meta-qt5 .patch files are maintained, include branch and tag name so that it's more clear from where these changes are exported (with:
git format-patch --no-numbered --no-signature)

---
 recipes-qt/qt5/nativesdk-qtbase_git.bb             |  4 +++
 recipes-qt/qt5/qt3d_git.bb                         |  2 ++
 recipes-qt/qt5/qtbase-native_git.bb                |  4 +++
 recipes-qt/qt5/qtbase_git.bb                       |  2 ++
 ...-QQmlExpression-leaking-QQmlError-objects.patch | 35 ----------------------
 recipes-qt/qt5/qtdeclarative_git.bb                |  4 ---
 recipes-qt/qt5/qtlocation_git.bb                   |  2 ++
 recipes-qt/qt5/qtmultimedia_git.bb                 |  2 ++
 recipes-qt/qt5/qtquickcontrols_git.bb              |  2 ++
 recipes-qt/qt5/qtremoteobjects_git.bb              |  2 ++
 recipes-qt/qt5/qtscxml_git.bb                      |  2 ++
 ...tch => 0001-add-noqtwebkit-configuration.patch} | 14 ++++-----
 ...ls-cmake-allow-overriding-the-location-f.patch} |  4 +--
 recipes-qt/qt5/qttools_git.bb                      |  5 +++-
 recipes-qt/qt5/qtvirtualkeyboard_git.bb            |  3 ++
 .../0001-fix-build-without-xkbcommon-evdev.patch   | 17 +++++------
 ...l-window-property-values-being-propagated.patch | 35 ----------------------
 recipes-qt/qt5/qtwayland_git.bb                    |  3 +-
 recipes-qt/qt5/qtwebengine_git.bb                  |  2 ++
 .../0001-qtwebkit-fix-QA-issue-bad-RPATH.patch     |  4 +--
 ...de-backtrace-API-for-non-glibc-libraries.patch} |  4 +--
 ...atch => 0003-Fix-compilation-with-ICU-59.patch} |  5 +---
 recipes-qt/qt5/qtwebkit_git.bb                     |  6 ++--
 recipes-qt/qt5/qtwebview_git.bb                    |  2 ++
 24 files changed, 60 insertions(+), 105 deletions(-)
 delete mode 100644 recipes-qt/qt5/qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch
 rename recipes-qt/qt5/qttools/{0003-add-noqtwebkit-configuration.patch => 0001-add-noqtwebkit-configuration.patch} (80%)
 rename recipes-qt/qt5/qttools/{0004-linguist-tools-cmake-allow-overriding-the-location-f.patch => 0002-linguist-tools-cmake-allow-overriding-the-location-f.patch} (95%)
 delete mode 100644 recipes-qt/qt5/qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch
 rename recipes-qt/qt5/qtwebkit/{0003-Exclude-backtrace-API-for-non-glibc-libraries.patch => 0002-Exclude-backtrace-API-for-non-glibc-libraries.patch} (93%)
 rename recipes-qt/qt5/qtwebkit/{0004-Fix-compilation-with-ICU-59.patch => 0003-Fix-compilation-with-ICU-59.patch} (98%)
recipes-qt/qt5/nativesdk-qtbase_git.bb +4 -0
index e1b30c9..d229c21 100644
@@ -25,6 +25,8 @@ require qt5-git.inc
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
+# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared
+# 5.9.meta-qt5-shared.1
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
     file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -37,6 +39,8 @@ SRC_URI += "\
 "
 
 # common for qtbase-native and nativesdk-qtbase
+# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native
+# 5.9.meta-qt5-native.1
 SRC_URI += " \
     file://0009-Always-build-uic.patch \
 "
recipes-qt/qt5/qt3d_git.bb +2 -0
index 41b5fbc..4226bac 100644
@@ -11,6 +11,8 @@ LIC_FILES_CHKSUM = " \
 DEPENDS += "qtbase"
 DEPENDS_class-target += "qtdeclarative qt3d-native"
 
+# Patches from https://github.com/meta-qt5/qt3d/commits/b5.9
+# 5.9.meta-qt5.1
 SRC_URI += " \
     file://0001-Allow-a-tools-only-build.patch \
     file://0002-Fix-BlenderDNA-for-clang-cross-compiler.patch \
recipes-qt/qt5/qtbase-native_git.bb +4 -0
index 84cb2b0..336df95 100644
@@ -20,6 +20,8 @@ require qt5-native.inc
 require qt5-git.inc
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
+# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared
+# 5.9.meta-qt5-shared.1
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
     file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -32,6 +34,8 @@ SRC_URI += "\
 "
 
 # common for qtbase-native and nativesdk-qtbase
+# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native
+# 5.9.meta-qt5-native.1
 SRC_URI += " \
     file://0009-Always-build-uic.patch \
 "
recipes-qt/qt5/qtbase_git.bb +2 -0
index c535380..1c18d0d 100644
@@ -15,6 +15,8 @@ LIC_FILES_CHKSUM = " \
 "
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
+# Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared
+# 5.9.meta-qt5-shared.1
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
     file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
recipes-qt/qt5/qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch deleted +0 -35
deleted file mode 100644
index 050a914..0000000
@@ -1,35 +0,0 @@
-From f9dcbf008b430aadd464985b7a618eca8173d264 Mon Sep 17 00:00:00 2001
-From: Robert Griebl <[email protected]>
-Date: Thu, 23 Feb 2017 15:11:13 +0100
-Subject: [PATCH 1/3] Fix QQmlExpression leaking QQmlError objects
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If the user doesn't clear any potential errors manually via clearError(),
-then do it automatically in the destructor. Found with valgrind.
-
-[ChangeLog][QtQml][QQmlExpression] Fixed memory leak
-
-Change-Id: If5b1181850c7463c939a7ba536d74e7054c53d60
-Reviewed-by: Simon Hausmann <[email protected]>
-Signed-off-by: Gordan Markuš <[email protected]>
----
- src/qml/qml/qqmlexpression.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/qml/qml/qqmlexpression.cpp b/src/qml/qml/qqmlexpression.cpp
-index 6afbd05..5cb3d4d 100644
---- a/src/qml/qml/qqmlexpression.cpp
-+++ b/src/qml/qml/qqmlexpression.cpp
-@@ -200,6 +200,7 @@ QQmlExpression::QQmlExpression(QQmlContextData *ctxt, QObject *scope,
- */
- QQmlExpression::~QQmlExpression()
- {
-+    clearError();
- }
- 
- /*!
--- 
-2.9.3
-
recipes-qt/qt5/qtdeclarative_git.bb +0 -4
index 2194d33..ecd64ee 100644
@@ -11,10 +11,6 @@ LIC_FILES_CHKSUM = " \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
 "
 
-SRC_URI += " \
-    file://0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch \
-"
-
 DEPENDS += "qtbase"
 
 PACKAGECONFIG ??= "qtxmlpatterns"
recipes-qt/qt5/qtlocation_git.bb +2 -0
index 7d434a4..c50a917 100644
@@ -13,6 +13,8 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols"
 
+# Patches from https://github.com/meta-qt5/qtlocation/commits/b5.9
+# 5.9.meta-qt5.1
 SRC_URI += "file://0001-Make-mapbox-gl-build-configurable.patch"
 
 PACKAGECONFIG ??= ""
recipes-qt/qt5/qtmultimedia_git.bb +2 -0
index 1996618..998f32f 100644
@@ -25,6 +25,8 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
 # Disable GStreamer if completely disabled
 EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', '-no-gstreamer', d)}"
 
+# Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.9
+# 5.9.meta-qt5.1
 SRC_URI += "\
     file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \
 "
recipes-qt/qt5/qtquickcontrols_git.bb +2 -0
index 83ed908..0ea314b 100644
@@ -22,6 +22,8 @@ FILES_${PN}-qmlplugins += " \
   ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
 "
 
+# Patches from https://github.com/meta-qt5/qtquickcontrols/commits/b5.9
+# 5.9.meta-qt5.1
 SRC_URI += " \
     file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \
 "
recipes-qt/qt5/qtremoteobjects_git.bb +2 -0
index f563818..a7e3447 100644
@@ -11,6 +11,8 @@ require qt5-git.inc
 
 DEPENDS += "qtbase qtdeclarative qtremoteobjects-native"
 
+# Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.9
+# 5.9.meta-qt5.1
 SRC_URI += " \
     file://0001-Allow-a-tools-only-build.patch \
 "
recipes-qt/qt5/qtscxml_git.bb +2 -0
index c2c00e1..e9ca8c1 100644
@@ -12,6 +12,8 @@ DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
 
 SRCREV = "eff82ac957e051f16f64c287f2dfaec9049bdfc1"
 
+# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9
+# 5.9.meta-qt5.1
 SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch"
 
 do_install_append_class-nativesdk() {
recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch renamed from recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch +7 -7
similarity index 80%
rename from recipes-qt/qt5/qttools/0003-add-noqtwebkit-configuration.patch
rename to recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch
index 88c39c7..ed25390 100644
@@ -1,4 +1,4 @@
-From a798e469e69e31248610a3b5f29c63c5d12cda26 Mon Sep 17 00:00:00 2001
+From e0387540876944a20461d60d2208191c734e00b1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
 Date: Wed, 4 Jun 2014 11:28:16 +0200
 Subject: [PATCH] add noqtwebkit configuration
@@ -16,16 +16,16 @@ Signed-off-by: Martin Jansa <[email protected]>
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro
-index ef5c595..9c2dc1c 100644
+index 540c9689..2312b521 100644
 --- a/src/assistant/assistant/assistant.pro
 +++ b/src/assistant/assistant/assistant.pro
 @@ -1,4 +1,4 @@
--qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) {
-+qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) {
+-false:qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) {
++false:qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) {
+     # FIXME: currently broken
      BROWSER = qtwebkit
  } else {
-     BROWSER = qtextbrowser
-@@ -75,7 +75,7 @@ SOURCES += aboutdialog.cpp \
+@@ -76,7 +76,7 @@ SOURCES += aboutdialog.cpp \
      openpagesmanager.cpp \
      openpagesswitcher.cpp
  
@@ -35,7 +35,7 @@ index ef5c595..9c2dc1c 100644
      QT += webkitwidgets
      SOURCES += helpviewer_qwv.cpp
 diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro
-index 500a153..b60fa2d 100644
+index 500a1534..b60fa2d9 100644
 --- a/src/designer/src/plugins/plugins.pro
 +++ b/src/designer/src/plugins/plugins.pro
 @@ -1,6 +1,6 @@
recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch renamed from recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch +2 -2
similarity index 95%
rename from recipes-qt/qt5/qttools/0004-linguist-tools-cmake-allow-overriding-the-location-f.patch
rename to recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch
index 1a201de..b2e017e 100644
@@ -1,4 +1,4 @@
-From f805a2bf4a0d35a01726d214279ba1caa81b278f Mon Sep 17 00:00:00 2001
+From 779278a109450ae84d5deb2e1e1c0dd9b737f1a2 Mon Sep 17 00:00:00 2001
 From: Cody P Schafer <[email protected]>
 Date: Thu, 9 Jul 2015 11:28:19 -0400
 Subject: [PATCH] linguist-tools cmake: allow overriding the location for
@@ -9,7 +9,7 @@ Subject: [PATCH] linguist-tools cmake: allow overriding the location for
  1 file changed, 3 insertions(+), 12 deletions(-)
 
 diff --git a/src/linguist/Qt5LinguistToolsConfig.cmake.in b/src/linguist/Qt5LinguistToolsConfig.cmake.in
-index 4318b16..2e3b70f 100644
+index 4318b16f..2e3b70fa 100644
 --- a/src/linguist/Qt5LinguistToolsConfig.cmake.in
 +++ b/src/linguist/Qt5LinguistToolsConfig.cmake.in
 @@ -26,6 +26,9 @@ get_filename_component(_qt5_linguisttools_install_prefix \"${CMAKE_CURRENT_LIST_
recipes-qt/qt5/qttools_git.bb +4 -1
index 9ca90a2..871b061 100644
@@ -14,9 +14,12 @@ inherit ptest
 
 DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
 
+# Patches from https://github.com/meta-qt5/qttools/commits/b5.9
+# 5.9.meta-qt5.1
 SRC_URI += " \
     file://run-ptest \
-    file://0004-linguist-tools-cmake-allow-overriding-the-location-f.patch \
+    file://0001-add-noqtwebkit-configuration.patch \
+    file://0002-linguist-tools-cmake-allow-overriding-the-location-f.patch \
 "
 
 FILES_${PN}-tools += "${datadir}${QT_DIR_NAME}/phrasebooks"
recipes-qt/qt5/qtvirtualkeyboard_git.bb +3 -0
index 2b865bb..ec1dc42 100644
@@ -5,6 +5,9 @@ LICENSE = "GPL-3.0 | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
 "
+
+# Patches from https://github.com/meta-qt5/qtvirtualkeyboard/commits/b5.9
+# 5.9.meta-qt5.1
 SRC_URI += "file://0001-include-sys-time.h-for-timeval.patch"
 
 # To enabled Nuance T9 Write support, you need to provide the licensed components
recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch +7 -10
index 555bb28..a86868e 100644
@@ -1,4 +1,4 @@
-From 2b72ad7955fe19abb4a0b4ebb6bc7aa498e454bc Mon Sep 17 00:00:00 2001
+From 434be8d326adb02b7b0960481f045dc1a443cfce Mon Sep 17 00:00:00 2001
 From: Raphael Freudiger <[email protected]>
 Date: Tue, 10 Jan 2017 15:49:55 +0100
 Subject: [PATCH] fix build without xkbcommon-evdev
@@ -16,17 +16,17 @@ Signed-off-by: Gordan Markuš <[email protected]>
  3 files changed, 11 insertions(+), 6 deletions(-)
 
 diff --git a/src/client/client.pro b/src/client/client.pro
-index 7482cfd..cb3578c 100644
+index eae7ad52..0bb7b188 100644
 --- a/src/client/client.pro
 +++ b/src/client/client.pro
-@@ -120,3 +120,5 @@ MODULE_PLUGIN_TYPES = \
+@@ -147,3 +147,5 @@ MODULE_PLUGIN_TYPES = \
              wayland-decoration-client \
              wayland-shell-integration
  load(qt_module)
 +
 +LIBS += -lxkbcommon
 diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro
-index dc9000d..4eebfd6 100644
+index dc9000d9..4eebfd64 100644
 --- a/src/compositor/compositor.pro
 +++ b/src/compositor/compositor.pro
 @@ -32,3 +32,5 @@ include ($$PWD/extensions/extensions.pri)
@@ -36,10 +36,10 @@ index dc9000d..4eebfd6 100644
 +
 +LIBS += -lxkbcommon
 diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp
-index 55381b4..5c054c6 100644
+index c30f7b18..e6f1a0b3 100644
 --- a/src/compositor/compositor_api/qwaylandkeyboard.cpp
 +++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp
-@@ -338,12 +338,6 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap *keymap)
+@@ -349,12 +349,6 @@ void QWaylandKeyboardPrivate::createXKBState(xkb_keymap *keymap)
      xkb_state = xkb_state_new(keymap);
  }
  
@@ -52,7 +52,7 @@ index 55381b4..5c054c6 100644
  
  void QWaylandKeyboardPrivate::createXKBKeymap()
  {
-@@ -373,6 +367,13 @@ void QWaylandKeyboardPrivate::createXKBKeymap()
+@@ -384,6 +378,13 @@ void QWaylandKeyboardPrivate::createXKBKeymap()
  }
  #endif
  
@@ -66,6 +66,3 @@ index 55381b4..5c054c6 100644
  void QWaylandKeyboardPrivate::sendRepeatInfo()
  {
      Q_FOREACH (Resource *resource, resourceMap()) {
--- 
-2.9.3
-
recipes-qt/qt5/qtwayland/0002-Fix-initial-window-property-values-being-propagated.patch deleted +0 -35
deleted file mode 100644
index 29c9180..0000000
@@ -1,35 +0,0 @@
-From 3d30fd8df9b55449844207295ad3d51cc8bb44b1 Mon Sep 17 00:00:00 2001
-From: Robert Griebl <[email protected]>
-Date: Thu, 15 Dec 2016 17:43:00 +0100
-Subject: [PATCH 2/2] Fix initial window property values being propagated
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This was broken since the the shell-surface refactoring.
-
-Change-Id: I130b7396e85c570a9d11d609af6b3016e3f706f0
-Reviewed-by: Dominik Holland <[email protected]>
-Reviewed-by: Paul Olav Tvete <[email protected]>
-Signed-off-by: Gordan Markuš <[email protected]>
----
- src/client/qwaylandwindow.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
-index c8be9c1..b6f16f0 100644
---- a/src/client/qwaylandwindow.cpp
-+++ b/src/client/qwaylandwindow.cpp
-@@ -176,6 +176,9 @@ void QWaylandWindow::initWindow()
-                 mShellSurface->setAppId(appId);
-             }
-         }
-+        // the user may have already set some window properties, so make sure to send them out
-+        for (auto it = m_properties.cbegin(); it != m_properties.cend(); ++it)
-+            mShellSurface->sendProperty(it.key(), it.value());
-     }
- 
-     // Enable high-dpi rendering. Scale() returns the screen scale factor and will
--- 
-2.9.3
-
recipes-qt/qt5/qtwayland_git.bb +2 -1
index 91c7230..cece86e 100644
@@ -39,10 +39,11 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
 
 SRCREV = "f1cf62fa8e9ffa2548c9968906848596f50dbc0b"
 
+# Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9
+# 5.9.meta-qt5.1
 # From https://bugreports.qt.io/browse/QTBUG-57767
 SRC_URI += " \
     file://0001-fix-build-without-xkbcommon-evdev.patch \
-    file://0002-Fix-initial-window-property-values-being-propagated.patch \
 "
 
 BBCLASSEXTEND =+ "native nativesdk"
recipes-qt/qt5/qtwebengine_git.bb +2 -0
index 830e640..9879749 100644
@@ -130,6 +130,7 @@ RDEPENDS_${PN}-examples += " \
 QT_MODULE_BRANCH_CHROMIUM = "56-based"
 
 # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9
+# 5.9.meta-qt5.1
 SRC_URI += " \
     ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
     file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \
@@ -140,6 +141,7 @@ SRC_URI += " \
 "
 
 # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based 
+# 56-based.meta-qt5.1
 SRC_URI += " \
     file://0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \
     file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \
recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch +2 -2
index d96636e..d393dc4 100644
@@ -1,4 +1,4 @@
-From 86bdd059606252b16c24432fbe4bba461406c1e4 Mon Sep 17 00:00:00 2001
+From f8bcac01fd5d95d0df8342809c53917aff1bf798 Mon Sep 17 00:00:00 2001
 From: Trevor Woerner <[email protected]>
 Date: Fri, 7 Feb 2014 04:07:17 +0100
 Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH)
@@ -14,7 +14,7 @@ Signed-off-by: Martin Jansa <[email protected]>
  1 file changed, 1 deletion(-)
 
 diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf
-index fd66af6..ef754c3 100644
+index fd66af670..ef754c367 100644
 --- a/Tools/qmake/mkspecs/features/unix/default_post.prf
 +++ b/Tools/qmake/mkspecs/features/unix/default_post.prf
 @@ -61,7 +61,6 @@ linux-*g++* {
recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch renamed from recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch +2 -2
similarity index 93%
rename from recipes-qt/qt5/qtwebkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
rename to recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch
index a16801b..147a7ba 100644
@@ -1,4 +1,4 @@
-From ed626df67e8287fadbfe2801c241c9717472dcf4 Mon Sep 17 00:00:00 2001
+From 5d4f3219be0b66d63765e077644a51e18b1f4502 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 5 Jun 2015 19:55:05 -0700
 Subject: [PATCH] Exclude backtrace() API for non-glibc libraries
@@ -12,7 +12,7 @@ Signed-off-by: Khem Raj <[email protected]>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp
-index 1b2091f..ba03a28 100644
+index 1b2091f53..ba03a28ec 100644
 --- a/Source/WTF/wtf/Assertions.cpp
 +++ b/Source/WTF/wtf/Assertions.cpp
 @@ -61,7 +61,7 @@
recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch renamed from recipes-qt/qt5/qtwebkit/0004-Fix-compilation-with-ICU-59.patch +1 -4
similarity index 98%
rename from recipes-qt/qt5/qtwebkit/0004-Fix-compilation-with-ICU-59.patch
rename to recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch
index e4a108e..debbda1 100644
@@ -1,4 +1,4 @@
-From d8d9b1eb468f5e5d5d9f0b196fc0acb641998c8b Mon Sep 17 00:00:00 2001
+From 240bd33ba3e78fcc0e5e3299d9e0e53299ea07f8 Mon Sep 17 00:00:00 2001
 From: Konstantin Tokarev <[email protected]>
 Date: Thu, 4 May 2017 15:12:37 +0300
 Subject: [PATCH] Fix compilation with ICU 59
@@ -87,6 +87,3 @@ index cbac67dd8..23400a64e 100644
  }
  
  size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef)
--- 
-2.13.3
-
recipes-qt/qt5/qtwebkit_git.bb +4 -2
index 5c1ecfa..0792c4a 100644
@@ -18,10 +18,12 @@ DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf-
 ARM_INSTRUCTION_SET_armv4 = "arm"
 ARM_INSTRUCTION_SET_armv5 = "arm"
 
+# Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.9
+# 5.9.meta-qt5.1
 SRC_URI += "\
     file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \
-    file://0003-Exclude-backtrace-API-for-non-glibc-libraries.patch \
-    file://0004-Fix-compilation-with-ICU-59.patch \
+    file://0002-Exclude-backtrace-API-for-non-glibc-libraries.patch \
+    file://0003-Fix-compilation-with-ICU-59.patch \
 "
 
 PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel \
recipes-qt/qt5/qtwebview_git.bb +2 -0
index d48b6c4..8b79aa1 100644
@@ -9,6 +9,8 @@ LIC_FILES_CHKSUM = " \
 require qt5.inc
 require qt5-git.inc
 
+# Patches from https://github.com/meta-qt5/qtwebview/commits/b5.9
+# 5.9.meta-qt5.1
 SRC_URI += "file://0001-Add-missing-include-for-qWarning.patch"
 
 DEPENDS += "qtbase qtwebengine"
Signature · 1 line
2.14.1
#4 lore raw

PATCH v2 5/7 qt: upgrade to latest revision in 5.9 branch

In reply to Martin Jansa

* 3 patches were included upstream

---
 recipes-qt/qt5/nativesdk-qtbase_git.bb             |   6 +-
 .../qt5/qt3d/0001-Allow-a-tools-only-build.patch   |   2 +-
 ...2-Fix-BlenderDNA-for-clang-cross-compiler.patch |   2 +-
 recipes-qt/qt5/qt3d_git.bb                         |   4 +-
 recipes-qt/qt5/qt5-git.inc                         |   4 +-
 recipes-qt/qt5/qtbase-native_git.bb                |   6 +-
 .../qt5/qtbase/0001-Add-linux-oe-g-platform.patch  |   6 +-
 ...make-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch |   2 +-
 ...o-allow-to-set-qt.conf-from-the-outside-u.patch |   2 +-
 ...ump-path-length-from-256-to-512-character.patch |   4 +-
 ...-unknown-features-instead-of-erroring-out.patch |   6 +-
 ...-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch |   4 +-
 .../0007-Delete-qlonglong-and-qulonglong.patch     |   2 +-
 ...08-Replace-pthread_yield-with-sched_yield.patch |   4 +-
 recipes-qt/qt5/qtbase/0009-Always-build-uic.patch  |   2 +-
 recipes-qt/qt5/qtbase_git.bb                       |   4 +-
 recipes-qt/qt5/qtcanvas3d_git.bb                   |   2 +-
 recipes-qt/qt5/qtcharts_git.bb                     |   2 +-
 recipes-qt/qt5/qtconnectivity_git.bb               |   2 +-
 recipes-qt/qt5/qtdatavis3d_git.bb                  |   2 +-
 recipes-qt/qt5/qtdeclarative_git.bb                |   2 +-
 recipes-qt/qt5/qtenginio_git.bb                    |   1 -
 recipes-qt/qt5/qtgamepad_git.bb                    |   2 +-
 recipes-qt/qt5/qtgraphicaleffects_git.bb           |   2 +-
 recipes-qt/qt5/qtimageformats_git.bb               |   2 +-
 .../0001-Make-mapbox-gl-build-configurable.patch   |   8 +-
 recipes-qt/qt5/qtlocation_git.bb                   |   6 +-
 recipes-qt/qt5/qtmultimedia_git.bb                 |   4 +-
 recipes-qt/qt5/qtnetworkauth_git.bb                |   2 +-
 recipes-qt/qt5/qtquick1_git.bb                     |   5 +-
 ...fix-invalid-use-of-incomplete-type-class-.patch |   4 +-
 recipes-qt/qt5/qtquickcontrols2_git.bb             |   2 +-
 recipes-qt/qt5/qtquickcontrols_git.bb              |   4 +-
 recipes-qt/qt5/qtremoteobjects_git.bb              |   4 +-
 recipes-qt/qt5/qtscript_git.bb                     |   2 +-
 ...Use-external-host-bin-path-for-cmake-file.patch |   4 +-
 recipes-qt/qt5/qtscxml_git.bb                      |   4 +-
 recipes-qt/qt5/qtsensors_git.bb                    |   2 +-
 recipes-qt/qt5/qtserialbus_git.bb                  |   2 +-
 recipes-qt/qt5/qtserialport_git.bb                 |   2 +-
 recipes-qt/qt5/qtsvg_git.bb                        |   2 +-
 recipes-qt/qt5/qtsystems_git.bb                    |   2 +-
 .../0001-add-noqtwebkit-configuration.patch        |  12 +-
 ...ols-cmake-allow-overriding-the-location-f.patch |   2 +-
 recipes-qt/qt5/qttools_git.bb                      |   4 +-
 recipes-qt/qt5/qttranslations_git.bb               |   9 +-
 .../0001-include-sys-time.h-for-timeval.patch      |   5 +-
 recipes-qt/qt5/qtvirtualkeyboard_git.bb            |   4 +-
 .../0001-fix-build-without-xkbcommon-evdev.patch   |   2 +-
 recipes-qt/qt5/qtwayland_git.bb                    |   4 +-
 recipes-qt/qt5/qtwebchannel_git.bb                 |  11 +-
 ...ange-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch |   2 +-
 ...s.prf-allow-build-for-linux-oe-g-platform.patch |   6 +-
 ...quickwebengineview_p_p.h-add-include-QCol.patch |   4 +-
 ...romium-Force-host-toolchain-configuration.patch |   2 +-
 ...-dependency-to-QCoreApplication-translate.patch |   2 +-
 ...sl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch |   2 +-
 .../0004-Force-host-toolchain-configuration.patch  |   8 +-
 ...sl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch |   2 +-
 .../0005-Always-compile-QWebEnginePage-print.patch | 241 ---------------------
 ...-chromium-musl-include-fcntl.h-for-loff_t.patch |   2 +-
 ...sl-use-off64_t-instead-of-the-internal-__.patch |   2 +-
 ...ium-musl-linux-glibc-make-the-distinction.patch |   2 +-
 ...sl-allocator-Do-not-include-glibc_weak_sy.patch |   2 +-
 ...sl-Use-correct-member-name-__si_fields-fr.patch |   2 +-
 recipes-qt/qt5/qtwebengine_git.bb                  |  11 +-
 recipes-qt/qt5/qtwebkit-examples_git.bb            |   2 +-
 .../0001-qtwebkit-fix-QA-issue-bad-RPATH.patch     |   2 +-
 ...ude-backtrace-API-for-non-glibc-libraries.patch |   2 +-
 .../0003-Fix-compilation-with-ICU-59.patch         |  89 --------
 recipes-qt/qt5/qtwebkit_git.bb                     |   5 +-
 recipes-qt/qt5/qtwebsockets_git.bb                 |  12 +-
 .../0001-Add-missing-include-for-qWarning.patch    |  22 --
 recipes-qt/qt5/qtwebview_git.bb                    |   6 +-
 recipes-qt/qt5/qtx11extras_git.bb                  |   2 +-
 recipes-qt/qt5/qtxmlpatterns_git.bb                |   2 +-
 76 files changed, 128 insertions(+), 495 deletions(-)
 delete mode 100644 recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch
 delete mode 100644 recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch
 delete mode 100644 recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch
recipes-qt/qt5/nativesdk-qtbase_git.bb +3 -3
index d229c21..87bd501 100644
@@ -26,7 +26,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared
-# 5.9.meta-qt5-shared.1
+# 5.9.meta-qt5-shared.2
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
     file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -40,7 +40,7 @@ SRC_URI += "\
 
 # common for qtbase-native and nativesdk-qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native
-# 5.9.meta-qt5-native.1
+# 5.9.meta-qt5-native.2
 SRC_URI += " \
     file://0009-Always-build-uic.patch \
 "
@@ -197,4 +197,4 @@ fakeroot do_generate_qt_environment_file() {
 
 addtask generate_qt_environment_file after do_install before do_package
 
-SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b"
+SRCREV = "73573fce295caef35da706a8c8c796ec18e6baf1"
recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch +1 -1
index 8cf1f50..5aba2bf 100644
@@ -1,4 +1,4 @@
-From dd0f3fefeeefb31ec8cf2417bd3f447f7b9c25c6 Mon Sep 17 00:00:00 2001
+From 7cb46d20ad89f37828ff9f96363a112eadf11dbd Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <[email protected]>
 Date: Wed, 10 Feb 2016 09:02:09 +0200
 Subject: [PATCH] Allow a tools-only build
recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch +1 -1
index eeb402f..1f2f682 100644
@@ -1,4 +1,4 @@
-From ec40913bc563e3cb0abc1965ce457d3a2fe663b3 Mon Sep 17 00:00:00 2001
+From 99fb23c0258ed0dacb03dc2eb57792c42b33316f Mon Sep 17 00:00:00 2001
 From: Kim Kulling <[email protected]>
 Date: Mon, 7 Nov 2016 17:19:49 +0100
 Subject: [PATCH] Fix BlenderDNA for clang cross compiler.
recipes-qt/qt5/qt3d_git.bb +2 -2
index 4226bac..c354db4 100644
@@ -12,7 +12,7 @@ DEPENDS += "qtbase"
 DEPENDS_class-target += "qtdeclarative qt3d-native"
 
 # Patches from https://github.com/meta-qt5/qt3d/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += " \
     file://0001-Allow-a-tools-only-build.patch \
     file://0002-Fix-BlenderDNA-for-clang-cross-compiler.patch \
@@ -37,6 +37,6 @@ do_configure_prepend() {
          ${S}/src/quick3d/imports/input/importsinput.pro
 }
 
-SRCREV = "f39d0a0c32cc489849a0cd5c2880f6e824223485"
+SRCREV = "9d8c9ada161ad97634992c444196add0abb4f9d1"
 
 BBCLASSEXTEND += "native nativesdk"
recipes-qt/qt5/qt5-git.inc +2 -2
index 927912f..ffa70e5 100644
@@ -1,5 +1,5 @@
 # Copyright (C) 2012-2016 O.S. Systems Software LTDA.
-# Copyright (C) 2013-2016 Martin Jansa <[email protected]>
+# Copyright (C) 2013-2017 Martin Jansa <[email protected]>
 
 QT_MODULE ?= "${BPN}"
 QT_MODULE_BRANCH ?= "5.9"
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"
 
 S = "${WORKDIR}/git"
 
-PV = "5.9.0+git${SRCPV}"
+PV = "5.9.2+git${SRCPV}"
recipes-qt/qt5/qtbase-native_git.bb +3 -3
index 336df95..54a0b78 100644
@@ -21,7 +21,7 @@ require qt5-git.inc
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared
-# 5.9.meta-qt5-shared.1
+# 5.9.meta-qt5-shared.2
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
     file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -35,7 +35,7 @@ SRC_URI += "\
 
 # common for qtbase-native and nativesdk-qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native
-# 5.9.meta-qt5-native.1
+# 5.9.meta-qt5-native.2
 SRC_URI += " \
     file://0009-Always-build-uic.patch \
 "
@@ -114,4 +114,4 @@ do_install() {
     install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS}
 }
 
-SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b"
+SRCREV = "73573fce295caef35da706a8c8c796ec18e6baf1"
recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +3 -3
index 28c2660..a8fe433 100644
@@ -1,4 +1,4 @@
-From e13425e6f1e784b0b016cf68a54dfbae32995b86 Mon Sep 17 00:00:00 2001
+From 85da054ff867fbf1a4c10e3f1cad782123ffdfe4 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Mon, 15 Apr 2013 04:29:32 +0200
 Subject: [PATCH] Add linux-oe-g++ platform
@@ -30,10 +30,10 @@ Signed-off-by: Martin Jansa <[email protected]>
  create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
 
 diff --git a/configure b/configure
-index 73679de621..5a0eebce50 100755
+index 08b49a8d12..5876721743 100755
 --- a/configure
 +++ b/configure
-@@ -709,7 +709,7 @@ fi
+@@ -712,7 +712,7 @@ fi
  # is where the resulting variable is written to
  setBootstrapVariable()
  {
recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch +1 -1
index 5ee6e04..b67a7ef 100644
@@ -1,4 +1,4 @@
-From 5ed152f8caa7ef00fb20d19a06ab5f7887e9aba6 Mon Sep 17 00:00:00 2001
+From b6d5179ad7c907bc3343bcf3586cef6226d0c8ed Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Sat, 6 Apr 2013 13:15:07 +0200
 Subject: [PATCH] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS
recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +1 -1
index 7ff1ff7..ae06ea6 100644
@@ -1,4 +1,4 @@
-From 77fab782e8a199f9ede83bc97cbce21a544961c2 Mon Sep 17 00:00:00 2001
+From 8cf43041691140faf5f56b42bebfa00d8ebc8da6 Mon Sep 17 00:00:00 2001
 From: Holger Freyther <[email protected]>
 Date: Wed, 26 Sep 2012 17:22:30 +0200
 Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the
recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch +2 -2
index 5ab6a7b..8ef4f61 100644
@@ -1,4 +1,4 @@
-From 4848804312f0045b53c85db113ac9e42fe1b7360 Mon Sep 17 00:00:00 2001
+From f02c4f742e90023e87d148bda48401b11815d8ba Mon Sep 17 00:00:00 2001
 From: Denys Dmytriyenko <[email protected]>
 Date: Tue, 25 Aug 2015 10:05:15 -0400
 Subject: [PATCH] configure: bump path length from 256 to 512 characters
@@ -15,7 +15,7 @@ Signed-off-by: Denys Dmytriyenko <[email protected]>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/configure.pri b/configure.pri
-index be1b166080..52f03bf3f2 100644
+index 76bb27e4ae..9ac81027c9 100644
 --- a/configure.pri
 +++ b/configure.pri
 @@ -796,10 +796,10 @@ defineTest(qtConfOutput_preparePaths) {
recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch +3 -3
index 8538901..610299d 100644
@@ -1,4 +1,4 @@
-From 6ecb404346525a92f4c8926aa285662f3f5010b3 Mon Sep 17 00:00:00 2001
+From 3114a9cd19b15f6b5ca99c4ce961ae5b80bfb3ab Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <[email protected]>
 Date: Mon, 24 Oct 2016 09:45:18 +0300
 Subject: [PATCH] Disable all unknown features instead of erroring out
@@ -10,10 +10,10 @@ Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
-index 966c43108c..32f0dd0041 100644
+index afeb4f3d1d..aec5253c25 100644
 --- a/mkspecs/features/qt_configure.prf
 +++ b/mkspecs/features/qt_configure.prf
-@@ -1180,7 +1180,8 @@ defineReplace(qtConfEvaluateSingleExpression) {
+@@ -1235,7 +1235,8 @@ defineReplace(qtConfEvaluateSingleExpression) {
                      error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.")
                  return($$result)
              }
recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch +2 -2
index 253815b..eaa5da8 100644
@@ -1,4 +1,4 @@
-From 3730ac03a1473a0e1fdfe1537b73818ab99961e9 Mon Sep 17 00:00:00 2001
+From 515acdcfe158982f31b31e410bbedb3db94bea1c Mon Sep 17 00:00:00 2001
 From: Pascal Bach <[email protected]>
 Date: Wed, 11 May 2016 15:20:41 +0200
 Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS
@@ -30,7 +30,7 @@ Signed-off-by: Pascal Bach <[email protected]>
  2 files changed, 10 insertions(+)
 
 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 4f342d67d7..202b723882 100644
+index 55c74aad66..f9ec328c83 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 @@ -9,6 +9,11 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch +1 -1
index 68e4b20..4d3e4b6 100644
@@ -1,4 +1,4 @@
-From 2fa6b447302abbaf1fd710e94b92692a300baaaf Mon Sep 17 00:00:00 2001
+From 6875848e2250ef439115ff2063713ce7bfb9597d Mon Sep 17 00:00:00 2001
 From: Huang Qiyu <[email protected]>
 Date: Wed, 7 Jun 2017 21:00:49 +0900
 Subject: [PATCH] Delete qlonglong and qulonglong
recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch +2 -2
index 678de52..14074fb 100644
@@ -1,4 +1,4 @@
-From 41d7028d2239a98a76cc91939edb2cb728019d08 Mon Sep 17 00:00:00 2001
+From 66da19d96d9a6ea9142df8fcbc0c3b7d960ee6b9 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Thu, 27 Jul 2017 08:02:51 -0700
 Subject: [PATCH] Replace pthread_yield with sched_yield
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <[email protected]>
  2 files changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
-index b6106e8c9e..6d6ea0b739 100644
+index f9ddd59aaa..2f92db983d 100644
 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
 +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
 @@ -34,7 +34,7 @@
recipes-qt/qt5/qtbase/0009-Always-build-uic.patch +1 -1
index 118a4f2..2a1d534 100644
@@ -1,4 +1,4 @@
-From 294e4c718407e66631ce36c37258217c9adb3f83 Mon Sep 17 00:00:00 2001
+From bf173918731c626b6c8b84eb826c921e5c6d44f5 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Sat, 16 Nov 2013 00:32:30 +0100
 Subject: [PATCH] Always build uic
recipes-qt/qt5/qtbase_git.bb +2 -2
index 1c18d0d..aaa59f3 100644
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = " \
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared
-# 5.9.meta-qt5-shared.1
+# 5.9.meta-qt5-shared.2
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
     file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -222,4 +222,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
 
 RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
 
-SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b"
+SRCREV = "73573fce295caef35da706a8c8c796ec18e6baf1"
recipes-qt/qt5/qtcanvas3d_git.bb +1 -1
index b2a0724..25cd72b 100644
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS = "qtdeclarative"
 
-SRCREV = "116737dc8fa244282dda95a8f13624b66fdb5521"
+SRCREV = "25447e889dc43c0831100bee1625a6f667d364cf"
recipes-qt/qt5/qtcharts_git.bb +1 -1
index 6b895aa..d3447ef 100644
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtdeclarative qtmultimedia"
 
-SRCREV = "de7f741c428febfe3c81a28f955996d2314953fc"
+SRCREV = "1f47b1a7ae58702dccc57a9ccbaa905441f4fecb"
recipes-qt/qt5/qtconnectivity_git.bb +1 -1
index 0d13dc4..9e91a1d 100644
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}"
 
 EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
 
-SRCREV = "8dcbf68e4579e03ea6d2808ac0c670169b59d0df"
+SRCREV = "94cc2b914a027fbcb7a1eb6cb34af45d0c07d2a4"
recipes-qt/qt5/qtdatavis3d_git.bb +1 -1
index 0cbd04e..471cfee 100644
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
 
-SRCREV = "84490ff75be5acdaeb3fd93900e4ebf7ba8f539b"
+SRCREV = "3f8ae713dfdbaeb34bdc52d905fe5ca16765cf7f"
recipes-qt/qt5/qtdeclarative_git.bb +1 -1
index ecd64ee..12e5f4e 100644
@@ -29,6 +29,6 @@ do_install_append_class-nativesdk() {
 
 EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
 
-SRCREV = "96f6ba5f562073f508cd8569ac354592fdd48f4a"
+SRCREV = "7c45b035b97ce705d536932965673dca7cfa489e"
 
 BBCLASSEXTEND =+ "native nativesdk"
recipes-qt/qt5/qtenginio_git.bb +0 -1
index 8b4fb71..1fa8e82 100644
@@ -14,4 +14,3 @@ DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
 
 QT_MODULE_BRANCH = "dev"
 SRCREV = "0555cf73c8b5abd41d8a4ff02457315c9e7c667d"
-
recipes-qt/qt5/qtgamepad_git.bb +1 -1
index 94f04a4..a771d9d 100644
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
 
 EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
 
-SRCREV = "ef8850fee38e2552d535379a8477c9abebdf8bb4"
+SRCREV = "1fc40deed6993265c436783cc367285bf9a2266a"
recipes-qt/qt5/qtgraphicaleffects_git.bb +1 -1
index edb150e..ee5b2a6 100644
@@ -23,4 +23,4 @@ RDEPENDS_${PN}-dev = ""
 # http://errors.yoctoproject.org/Errors/Build/44912/
 LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
 
-SRCREV = "db93af5b2bb49af74fbad6c9cd80bd7010434e78"
+SRCREV = "b6ff12df5496f3d296bb438ae343d5f771e93fec"
recipes-qt/qt5/qtimageformats_git.bb +1 -1
index 4dd64df..1e022f4 100644
@@ -26,4 +26,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
 
 EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
 
-SRCREV = "71ccf0dff82835ce7b5aed74c37829afdef44cde"
+SRCREV = "144a3535db9f95e60972d3c3b6eaceb65a604577"
recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch +4 -4
index 49fcff6..7db1676 100644
@@ -1,4 +1,4 @@
-From f7c76b91e726a0e63e5226eb6e89b13e0c3509b7 Mon Sep 17 00:00:00 2001
+From dbc899b088817cf6529d7e5cb8be7a6a95556127 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <[email protected]>
 Date: Wed, 7 Jun 2017 13:29:29 +0300
 Subject: [PATCH] Make mapbox-gl build configurable
@@ -13,15 +13,15 @@ Change-Id: I5f26200f2735b363c3c322f9035b331b9159c47b
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro
-index 0810d39..03fc119 100644
+index 459897a8..d97e05d0 100644
 --- a/src/plugins/geoservices/geoservices.pro
 +++ b/src/plugins/geoservices/geoservices.pro
 @@ -6,7 +6,7 @@ qtConfig(concurrent) {
      SUBDIRS += osm
  }
  
--qtConfig(c++14):!win32|mingw:!qnx {
-+mapboxgl:qtConfig(c++14):!win32|mingw:!qnx {
+-qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx {
++mapboxgl:qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx {
      !exists(../../3rdparty/mapbox-gl-native/CMakeLists.txt) {
          warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.")
      } else {
recipes-qt/qt5/qtlocation_git.bb +3 -3
index c50a917..19f895e 100644
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \
 DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols"
 
 # Patches from https://github.com/meta-qt5/qtlocation/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += "file://0001-Make-mapbox-gl-build-configurable.patch"
 
 PACKAGECONFIG ??= ""
@@ -34,7 +34,7 @@ SRC_URI += " \
     ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
 "
 
-SRCREV_qtlocation = "888d351cb0c7fe6d05ab1efe8d4dbb4b6f06cd5f"
-SRCREV_qtlocation-mapboxgl = "d45c177e8a23eefcc94930af9fa085e61136bb94"
+SRCREV_qtlocation = "c832af789766fcebd8cfb15e53ce14f36278ca6d"
+SRCREV_qtlocation-mapboxgl = "9ecbe3642fb4a53b558598239b59bf1d0224c25b"
 
 SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
recipes-qt/qt5/qtmultimedia_git.bb +2 -2
index 998f32f..729b3ff 100644
@@ -26,7 +26,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
 EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', '-no-gstreamer', d)}"
 
 # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += "\
     file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \
 "
@@ -35,4 +35,4 @@ SRC_URI += "\
 # http://errors.yoctoproject.org/Errors/Build/44914/
 LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
 
-SRCREV = "559c305ded730e23505e8b29536a98dc59e2acfa"
+SRCREV = "343e281f0e7cc7fd9e1558e4d92f5019fa565181"
recipes-qt/qt5/qtnetworkauth_git.bb +1 -1
index eb5e4f6..0655b42 100644
@@ -9,4 +9,4 @@ require qt5-git.inc
 
 DEPENDS += "qtbase"
 
-SRCREV = "86c5036848ad004208803d9d497cfcd08c9623d6"
+SRCREV = "3d93f6436596e349e43c3798b675af66db71df8a"
recipes-qt/qt5/qtquick1_git.bb +4 -1
index 1f680e6..eaa3661 100644
@@ -24,4 +24,7 @@ do_configure_prepend() {
 }
 
 QT_MODULE_BRANCH = "dev"
-SRCREV = "695460401d9a89d2f156016d51601b2e59b64105"
+# one commit behind:
+# 8a7b80eb Use QRandomGenerator instead of q?rand
+# because QRandomGenerator is only since Qt 5.10
+SRCREV = "9bf0edd9bd46ecb900bcdc3349d14869b87ab7de"
recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch +2 -2
index 85fcc15..2e64480 100644
@@ -1,4 +1,4 @@
-From fca6212d5ebc5851f28e820e4ff0ebe04a9d44d7 Mon Sep 17 00:00:00 2001
+From 3248edbde8859f62f453215876fbcb89dd788513 Mon Sep 17 00:00:00 2001
 From: Denys Dmytriyenko <[email protected]>
 Date: Thu, 31 Mar 2016 19:57:01 -0400
 Subject: [PATCH] texteditor: fix invalid use of incomplete type 'class QDebug'
@@ -11,7 +11,7 @@ Signed-off-by: Denys Dmytriyenko <[email protected]>
  1 file changed, 1 insertion(+)
 
 diff --git a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp
-index bdecf5b..811a761 100644
+index 69da88f0..9039191e 100644
 --- a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp
 +++ b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp
 @@ -54,6 +54,7 @@
recipes-qt/qt5/qtquickcontrols2_git.bb +1 -1
index a84cfb3..e123f0d 100644
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtdeclarative"
 
-SRCREV = "ef6b8d3081f0bf93d6d59e67c8e3f82c63c511c3"
+SRCREV = "63f2f55462f2f040cfe175ada8aa1e01168597fc"
recipes-qt/qt5/qtquickcontrols_git.bb +2 -2
index 0ea314b..50d6ba6 100644
@@ -23,9 +23,9 @@ FILES_${PN}-qmlplugins += " \
 "
 
 # Patches from https://github.com/meta-qt5/qtquickcontrols/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += " \
     file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \
 "
 
-SRCREV = "dacb91916b202208681471ba764504c7c7d086f0"
+SRCREV = "a77494140324c3ede1f7c16086593c070d81e2b3"
recipes-qt/qt5/qtremoteobjects_git.bb +2 -2
index a7e3447..1e90323 100644
@@ -12,7 +12,7 @@ require qt5-git.inc
 DEPENDS += "qtbase qtdeclarative qtremoteobjects-native"
 
 # Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += " \
     file://0001-Allow-a-tools-only-build.patch \
 "
@@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
 
 EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
 
-SRCREV = "ae0b101884b05355e3a7bc06dbca722ad3d08d0f"
+SRCREV = "6e0341bc878ff82d3c1039dcce09f92269546189"
 
 BBCLASSEXTEND += "native nativesdk"
recipes-qt/qt5/qtscript_git.bb +1 -1
index e7acafe..9061c3c 100644
@@ -29,4 +29,4 @@ DEPENDS += "qtbase"
 # http://errors.yoctoproject.org/Errors/Build/44915/
 LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
 
-SRCREV = "e00ca9b6bec2adf78fd14e02376ecf1b55a93b0c"
+SRCREV = "86ee61734e0331459f9cfeb1ad56f773b7e994be"
recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch +2 -2
index 0b90a66..dc988fa 100644
@@ -1,4 +1,4 @@
-From 210049f0e53f7fb8e5c44325b13947add9618f89 Mon Sep 17 00:00:00 2001
+From 89c9f60679b21629412503a17358426bf211a81b Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <[email protected]>
 Date: Tue, 10 Jan 2017 15:28:26 +0200
 Subject: [PATCH] Use external host bin path for cmake file
@@ -14,7 +14,7 @@ Change-Id: Idb814be705e9cbaad7f1e68b5d7cdb79c4b65008
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/scxml/Qt5ScxmlConfigExtras.cmake.in b/src/scxml/Qt5ScxmlConfigExtras.cmake.in
-index edb320a..c2f8be8 100644
+index edb320a..ce7f2df 100644
 --- a/src/scxml/Qt5ScxmlConfigExtras.cmake.in
 +++ b/src/scxml/Qt5ScxmlConfigExtras.cmake.in
 @@ -40,7 +40,7 @@ if (NOT TARGET Qt5::qscxmlc)
recipes-qt/qt5/qtscxml_git.bb +2 -2
index e9ca8c1..36ca665 100644
@@ -10,10 +10,10 @@ require qt5-git.inc
 
 DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
 
-SRCREV = "eff82ac957e051f16f64c287f2dfaec9049bdfc1"
+SRCREV = "a1dff1a11ad303a1f82f181e6386194de90ec08f"
 
 # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch"
 
 do_install_append_class-nativesdk() {
recipes-qt/qt5/qtsensors_git.bb +1 -1
index 17d0639..8c3d925 100644
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtdeclarative"
 
-SRCREV = "0c3c4d01ea34ed98a0d2928662f07b673f00535d"
+SRCREV = "1673dbed00ba68209b6de95981f1e3b4a2a24682"
recipes-qt/qt5/qtserialbus_git.bb +1 -1
index 93a826b..d3a83a7 100644
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtserialport"
 
-SRCREV = "20811e3b004af817e3f02982c755e8b1560b8c3d"
+SRCREV = "1d37c357c843a2622d2af7e1684576e19a8c7c30"
recipes-qt/qt5/qtserialport_git.bb +1 -1
index 957000c..056e237 100644
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
-SRCREV = "687f5a9bd44a45a29d24925f29470c43d6729dee"
+SRCREV = "93b539140c06da07d330c9ecad67ab5ed3f9b0c8"
recipes-qt/qt5/qtsvg_git.bb +1 -1
index fb8d44e..40854e0 100644
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
-SRCREV = "4fd787e90c70afbaa168abb3efdb8757ba77f3a4"
+SRCREV = "0fcd0160662941a9ba800b36671e88d82790bd95"
recipes-qt/qt5/qtsystems_git.bb +1 -1
index 7c155a2..911a709 100644
@@ -30,4 +30,4 @@ do_install_append() {
 
 QT_MODULE_BRANCH = "dev"
 
-SRCREV = "434af789f0d56ca7a521ca2d9ec8cf3b1057fd37"
+SRCREV = "f364358a817ba57fa5aa9c67e731241249e704f8"
recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch +6 -6
index ed25390..7549ce9 100644
@@ -1,4 +1,4 @@
-From e0387540876944a20461d60d2208191c734e00b1 Mon Sep 17 00:00:00 2001
+From 0098107f710e363d41b4913758302b43adccf2bd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
 Date: Wed, 4 Jun 2014 11:28:16 +0200
 Subject: [PATCH] add noqtwebkit configuration
@@ -16,16 +16,16 @@ Signed-off-by: Martin Jansa <[email protected]>
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro
-index 540c9689..2312b521 100644
+index 82f55092..ef07ee03 100644
 --- a/src/assistant/assistant/assistant.pro
 +++ b/src/assistant/assistant/assistant.pro
 @@ -1,4 +1,4 @@
--false:qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) {
-+false:qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) {
-     # FIXME: currently broken
+-qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) {
++qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) {
      BROWSER = qtwebkit
  } else {
-@@ -76,7 +76,7 @@ SOURCES += aboutdialog.cpp \
+     BROWSER = qtextbrowser
+@@ -75,7 +75,7 @@ SOURCES += aboutdialog.cpp \
      openpagesmanager.cpp \
      openpagesswitcher.cpp
  
recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch +1 -1
index b2e017e..80f2ae7 100644
@@ -1,4 +1,4 @@
-From 779278a109450ae84d5deb2e1e1c0dd9b737f1a2 Mon Sep 17 00:00:00 2001
+From 105277d4878ee1627bfb3be3d10833020e6923fc Mon Sep 17 00:00:00 2001
 From: Cody P Schafer <[email protected]>
 Date: Thu, 9 Jul 2015 11:28:19 -0400
 Subject: [PATCH] linguist-tools cmake: allow overriding the location for
recipes-qt/qt5/qttools_git.bb +2 -2
index 871b061..32d65d6 100644
@@ -15,7 +15,7 @@ inherit ptest
 DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
 
 # Patches from https://github.com/meta-qt5/qttools/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += " \
     file://run-ptest \
     file://0001-add-noqtwebkit-configuration.patch \
@@ -30,7 +30,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
 
 EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
 
-SRCREV = "88e02bb0a9b97d68a4b270e4ddfb6d0847c702a9"
+SRCREV = "fdc5749b5603653c5d0c59db267f44fd1609457e"
 
 BBCLASSEXTEND = "native nativesdk"
 
recipes-qt/qt5/qttranslations_git.bb +3 -6
index 822517f..0238ce9 100644
@@ -1,12 +1,9 @@
 require qt5.inc
 require qt5-git.inc
 
-LICENSE = "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 )"
+LICENSE = "GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
-    file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
+    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
 "
 
 DEPENDS += "qtbase qttools-native"
@@ -114,4 +111,4 @@ FILES_${PN}-qt = " \
     ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \
 "
 
-SRCREV = "3e727a890f7856978469ee38ef0619b1b59a8ca7"
+SRCREV = "325a90e07e9dce4e5c915549e6c31a86423dfdd3"
recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch +1 -4
index 8518ae9..c74854f 100644
@@ -1,4 +1,4 @@
-From 78106c5b939cc7d84710fe4c8e2a356ac1f110ef Mon Sep 17 00:00:00 2001
+From 2e76f24615766593ad6eb182627fa9d0bdba3c2d Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 12 Jul 2017 23:59:52 -0700
 Subject: [PATCH] include sys/time.h for timeval
@@ -23,6 +23,3 @@ index 1b9673f..924be7b 100644
  #ifdef _WIN32
  #include <winsock.h> // timeval
  #else
--- 
-2.13.2
-
recipes-qt/qt5/qtvirtualkeyboard_git.bb +2 -2
index ec1dc42..122d068 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
 "
 
 # Patches from https://github.com/meta-qt5/qtvirtualkeyboard/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += "file://0001-include-sys-time.h-for-timeval.patch"
 
 # 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"
 
 DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns"
 
-SRCREV = "bdf61afe76e94ef03da1332c4540646f18f5852f"
+SRCREV = "dd8c39ea9312ec1441b3fdd830f9d42fe3258b58"
recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch +1 -1
index a86868e..11acd5f 100644
@@ -1,4 +1,4 @@
-From 434be8d326adb02b7b0960481f045dc1a443cfce Mon Sep 17 00:00:00 2001
+From c4fae91b3d2b2b0f64e3fafac456a6a917c69e88 Mon Sep 17 00:00:00 2001
 From: Raphael Freudiger <[email protected]>
 Date: Tue, 10 Jan 2017 15:49:55 +0100
 Subject: [PATCH] fix build without xkbcommon-evdev
recipes-qt/qt5/qtwayland_git.bb +2 -2
index cece86e..9847f39 100644
@@ -37,10 +37,10 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature
 
 EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
 
-SRCREV = "f1cf62fa8e9ffa2548c9968906848596f50dbc0b"
+SRCREV = "7f70da6a644bc5b690066f0ab4814e1358f57e81"
 
 # Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 # From https://bugreports.qt.io/browse/QTBUG-57767
 SRC_URI += " \
     file://0001-fix-build-without-xkbcommon-evdev.patch \
recipes-qt/qt5/qtwebchannel_git.bb +3 -8
index f1167a9..7e12a33 100644
@@ -3,18 +3,13 @@ require qt5-git.inc
 
 LICENSE = "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 )"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-    file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
+    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
     file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
     file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
-    file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
-    file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
+    file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
 "
 
 DEPENDS += "qtdeclarative qtwebsockets"
 
-SRCREV = "6383f0fc5eec4935697a6d2d2f87b511bbeb678e"
+SRCREV = "b5229df6a08a902b11a2fc9529af6385f4d985d5"
recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch +1 -1
index 44c3f0b..0e9ea72 100644
@@ -1,4 +1,4 @@
-From 1634633d27cea7369111c9ea6d08be8515c15ccd Mon Sep 17 00:00:00 2001
+From d559da6ab0834aeb7307008015b6232e586fea00 Mon Sep 17 00:00:00 2001
 From: Cleiton Bueno <[email protected]>
 Date: Thu, 24 Dec 2015 12:46:58 -0200
 Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX
recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch +3 -3
index a91a298..275ef9e 100644
@@ -1,4 +1,4 @@
-From 491576d7e67d00b93106592140e5d7f0f34ea641 Mon Sep 17 00:00:00 2001
+From 96746f09947cc36f6c9fc8631bc6a6e7f59efe24 Mon Sep 17 00:00:00 2001
 From: Frieder Schrempf <[email protected]>
 Date: Mon, 1 Dec 2014 14:34:40 +0000
 Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform
@@ -12,10 +12,10 @@ Signed-off-by: Martin Jansa <[email protected]>
  1 file changed, 6 insertions(+)
 
 diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
-index eb421f8b..4513742d 100644
+index 56894e58..ef418a4c 100644
 --- a/mkspecs/features/functions.prf
 +++ b/mkspecs/features/functions.prf
-@@ -33,6 +33,12 @@ defineTest(isPlatformSupported) {
+@@ -21,6 +21,12 @@ defineTest(isPlatformSupported) {
        return(false)
      }
      gcc:!clang:!isGCCVersionSupported(): return(false)
recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch +2 -2
index d5567c3..6ada3f9 100644
@@ -1,4 +1,4 @@
-From 6b48d76b5af38a49f8e438e45c387f01b263e483 Mon Sep 17 00:00:00 2001
+From 06e9e7844ffa2b6985e5fa7a1c475c8a54ca252a Mon Sep 17 00:00:00 2001
 From: Cleiton Bueno <[email protected]>
 Date: Fri, 25 Dec 2015 18:16:05 -0200
 Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor
@@ -9,7 +9,7 @@ Signed-off-by: Cleiton Bueno <[email protected]>
  1 file changed, 2 insertions(+)
 
 diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
-index 2ecd70d7..703d1a92 100644
+index 19ecf5e1..f6f638ee 100644
 --- a/src/webengine/api/qquickwebengineview_p_p.h
 +++ b/src/webengine/api/qquickwebengineview_p_p.h
 @@ -59,6 +59,8 @@
recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch +1 -1
index 5f9eb3a..4a1a975 100644
@@ -1,4 +1,4 @@
-From b1a6f73d49a340e99145a4c4cf70dc796ed632ff Mon Sep 17 00:00:00 2001
+From a0b1a742813d0846472fab4aada2388bf2d42d80 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <[email protected]>
 Date: Wed, 15 Mar 2017 13:53:28 +0200
 Subject: [PATCH] chromium: Force host toolchain configuration
recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch +1 -1
index 2fa1764..8c0484b 100644
@@ -1,4 +1,4 @@
-From 95a6e3fd9e8498cb1f59120d402ec8ecfcd3ec59 Mon Sep 17 00:00:00 2001
+From bfd5e19fea1315d10b3217acaf92dfc32018ad03 Mon Sep 17 00:00:00 2001
 From: Cleiton Bueno <[email protected]>
 Date: Thu, 24 Dec 2015 15:59:51 -0200
 Subject: [PATCH] Include dependency to QCoreApplication::translate()
recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch +1 -1
index 8785842..d3c7a31 100644
@@ -1,4 +1,4 @@
-From 8910e65fd777120261f16c4a35ace2b0dc6181b3 Mon Sep 17 00:00:00 2001
+From 6d4d1b4cd380c51a6709c97524fbce0e0f09ce39 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 14:01:12 -0700
 Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not
recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch +4 -4
index 142595a..258afd5 100644
@@ -1,4 +1,4 @@
-From e81f0a5139f8f1ea131438def3fe1aabe997aeff Mon Sep 17 00:00:00 2001
+From 5106be504b7edb7bc75309d581dfd33a89ed04fc Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <[email protected]>
 Date: Wed, 15 Mar 2017 13:53:28 +0200
 Subject: [PATCH] Force host toolchain configuration
@@ -13,10 +13,10 @@ Signed-off-by: Samuli Piippo <[email protected]>
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
-index fd27643e..f9acb6ff 100644
+index f1b3d47b..521c507b 100644
 --- a/src/buildtools/configure_host.pro
 +++ b/src/buildtools/configure_host.pro
-@@ -28,9 +28,9 @@ GN_CONTENTS = \
+@@ -29,9 +29,9 @@ GN_CONTENTS = \
  "import(\"//build/config/sysroot.gni\")" \
  "import(\"//build/toolchain/gcc_toolchain.gni\")" \
  "gcc_toolchain(\"host\") {" \
@@ -29,7 +29,7 @@ index fd27643e..f9acb6ff 100644
  "  ar = \"$$which(ar)\" " \
  "  nm = \"$$which(nm)\" " \
  "  toolchain_args = { " \
-@@ -41,9 +41,9 @@ GN_CONTENTS = \
+@@ -42,9 +42,9 @@ GN_CONTENTS = \
  "  } " \
  "}" \
  "gcc_toolchain(\"v8_snapshot\") {" \
recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch +1 -1
index 05b813b..71e36bb 100644
@@ -1,4 +1,4 @@
-From 86f467724070e854c8c6b13269951c97c0832dae Mon Sep 17 00:00:00 2001
+From 6d92d4b6f7adf913da77b4aae837a5880e64aa21 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 14:09:06 -0700
 Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -241

241 lines not on this page · raw message

recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch +1 -1
index 2d7bd02..00c875b 100644
@@ -1,4 +1,4 @@
-From 0a409a773f2b2936a2f1868d983e7bd1c92110bd Mon Sep 17 00:00:00 2001
+From 8780db69819ba37c8e2364ba361b03badf3c3ee4 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 14:37:49 -0700
 Subject: [PATCH] chromium: musl: include fcntl.h for loff_t
recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch +1 -1
index f58de8f..085cb01 100644
@@ -1,4 +1,4 @@
-From 375b70a99760c156b45e60def9bafd04902fb5a4 Mon Sep 17 00:00:00 2001
+From b360b036bb1ad31a74c056ce5d19e0271d75ff57 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 14:38:37 -0700
 Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t
recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch +1 -1
index c3b1cbb..e23cabe 100644
@@ -1,4 +1,4 @@
-From 314cfb7b41be8fc4f962956e0acd34f110114c6e Mon Sep 17 00:00:00 2001
+From 455a6603a33a87dfb7ab85a09587f534d9f5d984 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 14:54:38 -0700
 Subject: [PATCH] chromium: musl: linux != glibc, make the distinction
recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch +1 -1
index 550fd79..53e8a81 100644
@@ -1,4 +1,4 @@
-From bc3745992889e3dc3b42c890b6a458038c6994e0 Mon Sep 17 00:00:00 2001
+From aa3bfc656b3c84aba04c8294ad17c630141f4b09 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 15:09:02 -0700
 Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols
recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch +1 -1
index 82a2ccc..385e729 100644
@@ -1,4 +1,4 @@
-From de4e672044de11c5927aeb42a554f5eced0abf6c Mon Sep 17 00:00:00 2001
+From 85b21493f19bd2046f84836e03f0a9c32862bce8 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 15:12:39 -0700
 Subject: [PATCH] chromium: musl: Use correct member name __si_fields from
recipes-qt/qt5/qtwebengine_git.bb +5 -6
index 9879749..2815cb9 100644
@@ -16,7 +16,7 @@ DEPENDS += " \
     ninja-native \
     yasm-native \
     qtwebchannel \
-    qtbase qtdeclarative qtxmlpatterns qtquickcontrols \
+    qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtquickcontrols2 \
     qtlocation \
     libdrm fontconfig pixman openssl pango cairo icu pciutils \
     libcap \
@@ -130,18 +130,17 @@ RDEPENDS_${PN}-examples += " \
 QT_MODULE_BRANCH_CHROMIUM = "56-based"
 
 # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += " \
     ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
     file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \
     file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \
     file://0003-Include-dependency-to-QCoreApplication-translate.patch \
     file://0004-Force-host-toolchain-configuration.patch \
-    file://0005-Always-compile-QWebEnginePage-print.patch \
 "
 
 # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based 
-# 56-based.meta-qt5.1
+# 56-based.meta-qt5.2
 SRC_URI += " \
     file://0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \
     file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \
@@ -163,8 +162,8 @@ SRC_URI_append_libc-musl = "\
     file://0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \
 "
 
-SRCREV_qtwebengine = "73f7be5b2a95eab3dce11caede538eeb7beb71f2"
-SRCREV_chromium = "aa2fdd6be3d465280d2a0c3aacdc738bb4ffec05"
+SRCREV_qtwebengine = "99f84ffd2c0c78014a24534a863aa1c755abd51c"
+SRCREV_chromium = "21508b5b5421f10ba8627c3c66c5281efb39b2f9"
 SRCREV = "${SRCREV_qtwebengine}"
 
 SRCREV_FORMAT = "qtwebengine_chromium"
recipes-qt/qt5/qtwebkit-examples_git.bb +1 -1
index 286aeca..3e3e4a0 100644
@@ -17,4 +17,4 @@ DEPENDS += "qtwebkit qtxmlpatterns"
 RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
 RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"
 
-SRCREV = "822426abc77a74752b0ee0da4d0a1c106c4dac22"
+SRCREV = "a24c780b60d7d8bc00c4a48042cf7f32db777d55"
recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch +1 -1
index d393dc4..764b030 100644
@@ -1,4 +1,4 @@
-From f8bcac01fd5d95d0df8342809c53917aff1bf798 Mon Sep 17 00:00:00 2001
+From c4e691a8dd2037d9b359e0de9d4790da9078f74e Mon Sep 17 00:00:00 2001
 From: Trevor Woerner <[email protected]>
 Date: Fri, 7 Feb 2014 04:07:17 +0100
 Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH)
recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch +1 -1
index 147a7ba..cec6376 100644
@@ -1,4 +1,4 @@
-From 5d4f3219be0b66d63765e077644a51e18b1f4502 Mon Sep 17 00:00:00 2001
+From fc2773961eaa536e6a617ded7c1a972d979fa2e4 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 5 Jun 2015 19:55:05 -0700
 Subject: [PATCH] Exclude backtrace() API for non-glibc libraries
recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch deleted +0 -89

89 lines not on this page · raw message

recipes-qt/qt5/qtwebkit_git.bb +2 -3
index 0792c4a..8b3c3f5 100644
@@ -19,11 +19,10 @@ ARM_INSTRUCTION_SET_armv4 = "arm"
 ARM_INSTRUCTION_SET_armv5 = "arm"
 
 # Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += "\
     file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \
     file://0002-Exclude-backtrace-API-for-non-glibc-libraries.patch \
-    file://0003-Fix-compilation-with-ICU-59.patch \
 "
 
 PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel \
@@ -88,4 +87,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db
 RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
 export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
 
-SRCREV = "f27089657a207ef8c5c9d27d661d3d12c3af8df2"
+SRCREV = "97c4a80a1282c8c3eaa343011286b76fd4838c5f"
recipes-qt/qt5/qtwebsockets_git.bb +6 -6
index 41ec27f..448ce5c 100644
@@ -1,14 +1,14 @@
 require qt5.inc
 require qt5-git.inc
 
-LICENSE = "GFDL-1.3 & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
+LICENSE = "GFDL-1.3 & (GPL-3 | LGPL-3.0)"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
-    file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \
+    file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
+    file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
 "
 
 DEPENDS += "qtbase qtdeclarative"
 
-SRCREV = "1421c3e4ae4213ca18f2f51d5ddb38e223450222"
+SRCREV = "fb71c823a7ae823345518ca33ccfe273fcf76494"
recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch deleted +0 -22
deleted file mode 100644
index 82087b9..0000000
@@ -1,22 +0,0 @@
-From b946b6ea4a2a30bd12ecd036e40c9ef671681ba8 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <[email protected]>
-Date: Fri, 2 Jun 2017 13:12:18 +0300
-Subject: [PATCH] Add missing include for qWarning
-
-Change-Id: I7c7699e7a2b7ce59e4f659d460ec835f59bba439
----
- src/webview/qquickwebview.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/webview/qquickwebview.cpp b/src/webview/qquickwebview.cpp
-index d760564..fbbbfd6 100644
---- a/src/webview/qquickwebview.cpp
-+++ b/src/webview/qquickwebview.cpp
-@@ -39,6 +39,7 @@
- #include <QtWebView/private/qwebviewloadrequest_p.h>
- #include <QtQml/qqmlengine.h>
- #include <QtCore/qmutex.h>
-+#include <QtCore/QDebug>
- 
- namespace {
- 
recipes-qt/qt5/qtwebview_git.bb +1 -5
index 8b79aa1..0bbb09e 100644
@@ -9,10 +9,6 @@ LIC_FILES_CHKSUM = " \
 require qt5.inc
 require qt5-git.inc
 
-# Patches from https://github.com/meta-qt5/qtwebview/commits/b5.9
-# 5.9.meta-qt5.1
-SRC_URI += "file://0001-Add-missing-include-for-qWarning.patch"
-
 DEPENDS += "qtbase qtwebengine"
 
 COMPATIBLE_MACHINE = "(-)"
@@ -23,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
 COMPATIBLE_MACHINE_armv7ve = "(.*)"
 COMPATIBLE_MACHINE_aarch64 = "(.*)"
 
-SRCREV = "6e55abf3b6a5f373cd4b649c2318a45c49b40589"
+SRCREV = "e4016a67bbffefed71a407494e249e978d212b3d"
recipes-qt/qt5/qtx11extras_git.bb +1 -1
index bf03e9b..ed1440c 100644
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
-SRCREV = "9e83ff8713c1a3f69ce514bf3e31335194668da7"
+SRCREV = "f65d50eb063ad3c9a1d6f008f66e881d2e15f1d8"
recipes-qt/qt5/qtxmlpatterns_git.bb +1 -1
index 30e5262..7c18079 100644
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
-SRCREV = "c1c3af0ae456247c9bcd30161d51a94c9b38dc52"
+SRCREV = "fcfa824402bb4edaf644fad786dac3560c743ebe"
 
 BBCLASSEXTEND =+ "native nativesdk"
 
Signature · 1 line
2.14.1
#10 lore raw

PATCH v2 6/7 qtwebengine: fix build with glibc-2.26

In reply to Martin Jansa
---
 ...qtbug-61521.cpp-use-free-instead-of-cfree.patch | 25 ++++++++++++++++++++++
 recipes-qt/qt5/qtwebengine_git.bb                  |  3 ++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch
recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch new file +25 -0
new file mode 100644
index 0000000..7375ff7
@@ -0,0 +1,25 @@
+From b4eb5c926cf822ee5d5cf398d1bcdb0fdca6e47a Mon Sep 17 00:00:00 2001
+From: Martin Jansa <[email protected]>
+Date: Sun, 20 Aug 2017 20:37:38 +0200
+Subject: [PATCH] qtbug-61521.cpp: use free instead of cfree
+
+* as cfree man says:
+  This  function  should  never  be used.  Use free(3) instead.
+  Starting with version 2.26, it has been removed from glibc.
+---
+ src/core/api/qtbug-61521.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp
+index 86d5998e..1dcc4cfa 100644
+--- a/src/core/api/qtbug-61521.cpp
++++ b/src/core/api/qtbug-61521.cpp
+@@ -100,7 +100,7 @@ SHIM_HIDDEN void* ShimCalloc(size_t n, size_t size) {
+ }
+ 
+ SHIM_HIDDEN void ShimCFree(void* ptr) {
+-    cfree(ptr);
++    free(ptr);
+ }
+ 
+ SHIM_HIDDEN void* ShimMemalign(size_t align, size_t s) {
recipes-qt/qt5/qtwebengine_git.bb +2 -1
index 2815cb9..cdb4512 100644
@@ -130,13 +130,14 @@ RDEPENDS_${PN}-examples += " \
 QT_MODULE_BRANCH_CHROMIUM = "56-based"
 
 # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9
-# 5.9.meta-qt5.2
+# 5.9.meta-qt5.3
 SRC_URI += " \
     ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
     file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \
     file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \
     file://0003-Include-dependency-to-QCoreApplication-translate.patch \
     file://0004-Force-host-toolchain-configuration.patch \
+    file://0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch \
 "
 
 # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based 
Signature · 1 line
2.14.1
#11 lore raw

PATCH v2 7/7 qtwebengine: update 0004-Force-host-toolchain-configuration.patch

In reply to Martin Jansa

* refresh the patch from:
http://code.qt.io/cgit/yocto/meta-qt5.git/diff/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch?id=5bac910f95453d0df6fe540778dd16a9707dcabf

* might fix passing arm specific flags into host builds like:
gcc: error: unrecognized command line option '-mflooat-abi=hard'
strip: unable to recognise the format of the input file

---
 .../0004-Force-host-toolchain-configuration.patch  | 35 +++++++++++++++++++---
 ...qtbug-61521.cpp-use-free-instead-of-cfree.patch |  2 +-
 2 files changed, 32 insertions(+), 5 deletions(-)
recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch +31 -4
index 258afd5..bda0ba1 100644
@@ -1,4 +1,4 @@
-From 5106be504b7edb7bc75309d581dfd33a89ed04fc Mon Sep 17 00:00:00 2001
+From 9bdd03ad0bbb221ad7bffe0e570605c21c28b1b5 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <[email protected]>
 Date: Wed, 15 Mar 2017 13:53:28 +0200
 Subject: [PATCH] Force host toolchain configuration
@@ -6,16 +6,30 @@ Subject: [PATCH] Force host toolchain configuration
 Force gcc/g++ to be used for parts using host toolchain, since
 the option(host_build) does not work in yocto builds.
 
+Don't use QT_ARCH for the host architecture, since that's always
+the target architecture in bitbake builds, instead ask specifically
+for the qmakes's host architecture.
+
 Upstream-Status: Inappropriate [OE specific]
 Signed-off-by: Samuli Piippo <[email protected]>
 ---
- src/buildtools/configure_host.pro | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
+ src/buildtools/configure_host.pro | 14 +++++++-------
+ src/core/config/linux.pri         |  2 +-
+ 2 files changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
-index f1b3d47b..521c507b 100644
+index f1b3d47b..12123729 100644
 --- a/src/buildtools/configure_host.pro
 +++ b/src/buildtools/configure_host.pro
+@@ -4,7 +4,7 @@ TEMPLATE = aux
+ # Pick up the host toolchain
+ option(host_build)
+ 
+-GN_HOST_CPU = $$gnArch($$QT_ARCH)
++GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch)
+ !isEmpty(QT_TARGET_ARCH): GN_TARGET_CPU = $$gnArch($$QT_TARGET_ARCH)
+ else: GN_TARGET_CPU = $$GN_HOST_CPU
+ GN_OS = $$gnOS()
 @@ -29,9 +29,9 @@ GN_CONTENTS = \
  "import(\"//build/config/sysroot.gni\")" \
  "import(\"//build/toolchain/gcc_toolchain.gni\")" \
@@ -42,3 +56,16 @@ index f1b3d47b..521c507b 100644
  "  ar = \"$$which(ar)\" " \
  "  nm = \"$$which(nm)\" " \
  "  toolchain_args = { " \
+diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
+index 714c864d..f66ca551 100644
+--- a/src/core/config/linux.pri
++++ b/src/core/config/linux.pri
+@@ -98,7 +98,7 @@ contains(QT_ARCH, "mips"):!host_build {
+ 
+ host_build {
+     gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
+-    GN_HOST_CPU = $$gnArch($$QT_ARCH)
++    GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch)
+     gn_args += host_cpu=\"$$GN_HOST_CPU\"
+     # Don't bother trying to use system libraries in this case
+     gn_args += use_glib=false
recipes-qt/qt5/qtwebengine/0005-qtbug-61521.cpp-use-free-instead-of-cfree.patch +1 -1
index 7375ff7..d8d89b8 100644
@@ -1,4 +1,4 @@
-From b4eb5c926cf822ee5d5cf398d1bcdb0fdca6e47a Mon Sep 17 00:00:00 2001
+From 331de4be615b8552e498ac2f3deff4b49b4b0fc0 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Sun, 20 Aug 2017 20:37:38 +0200
 Subject: [PATCH] qtbug-61521.cpp: use free instead of cfree
Signature · 1 line
2.14.1
#5 lore raw

Re: [meta-qt5][PATCHv2 5/7] qt: upgrade to latest revision in 5.9 branch

In reply to Martin Jansa

I am having issues compiling qtbase 5.9 with clang it fails like

| In file included from /mnt/a/oe/build/tmp/work/core2-64-bec-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/git/src/corelib/global/qlibraryinfo.cpp:41:
| In file included from ../../include/QtCore/qdir.h:1:
| In file included from
../../include/QtCore/../../../git/src/corelib/io/qdir.h:43:
| In file included from ../../include/QtCore/qstring.h:1:
| In file included from
../../include/QtCore/../../../git/src/corelib/tools/qstring.h:48:
| In file included from ../../include/QtCore/qchar.h:1:
| In file included from
../../include/QtCore/../../../git/src/corelib/tools/qchar.h:43:
| In file included from ../../include/QtCore/qglobal.h:1:
| In file included from
../../include/QtCore/../../../git/src/corelib/global/qglobal.h:109:
| In file included from /mnt/a/oe/build/tmp/work/core2-64-bec-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/recipe-sysroot/usr/lib//x86_64-bec-linux/7.2.0/../../../include/c++/7.2.0/algorithm:62:
| In file included from /mnt/a/oe/build/tmp/work/core2-64-bec-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/recipe-sysroot/usr/lib//x86_64-bec-linux/7.2.0/../../../include/c++/7.2.0/bits/stl_algo.h:59:
| /mnt/a/oe/build/tmp/work/core2-64-bec-linux/qtbase/5.9.0+gitAUTOINC+f6b36eaafe-r0/recipe-sysroot/usr/lib//x86_64-bec-linux/7.2.0/../../../include/c++/7.2.0/cstdlib:75:15:
fatal error: 'stdlib.h' file not found
| #include_next <stdlib.h>
| ^~~~~~~~~~

this error means that somewhere -isystem is used instead of -I, any quick ideas where this could have been added ? 5.8 does not have this issue.

Quoted 1,605 lines · Martin Jansa

* 3 patches were included upstream

---
 recipes-qt/qt5/nativesdk-qtbase_git.bb             |   6 +-
 .../qt5/qt3d/0001-Allow-a-tools-only-build.patch   |   2 +-
 ...2-Fix-BlenderDNA-for-clang-cross-compiler.patch |   2 +-
 recipes-qt/qt5/qt3d_git.bb                         |   4 +-
 recipes-qt/qt5/qt5-git.inc                         |   4 +-
 recipes-qt/qt5/qtbase-native_git.bb                |   6 +-
 .../qt5/qtbase/0001-Add-linux-oe-g-platform.patch  |   6 +-
 ...make-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch |   2 +-
 ...o-allow-to-set-qt.conf-from-the-outside-u.patch |   2 +-
 ...ump-path-length-from-256-to-512-character.patch |   4 +-
 ...-unknown-features-instead-of-erroring-out.patch |   6 +-
 ...-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch |   4 +-
 .../0007-Delete-qlonglong-and-qulonglong.patch     |   2 +-
 ...08-Replace-pthread_yield-with-sched_yield.patch |   4 +-
 recipes-qt/qt5/qtbase/0009-Always-build-uic.patch  |   2 +-
 recipes-qt/qt5/qtbase_git.bb                       |   4 +-
 recipes-qt/qt5/qtcanvas3d_git.bb                   |   2 +-
 recipes-qt/qt5/qtcharts_git.bb                     |   2 +-
 recipes-qt/qt5/qtconnectivity_git.bb               |   2 +-
 recipes-qt/qt5/qtdatavis3d_git.bb                  |   2 +-
 recipes-qt/qt5/qtdeclarative_git.bb                |   2 +-
 recipes-qt/qt5/qtenginio_git.bb                    |   1 -
 recipes-qt/qt5/qtgamepad_git.bb                    |   2 +-
 recipes-qt/qt5/qtgraphicaleffects_git.bb           |   2 +-
 recipes-qt/qt5/qtimageformats_git.bb               |   2 +-
 .../0001-Make-mapbox-gl-build-configurable.patch   |   8 +-
 recipes-qt/qt5/qtlocation_git.bb                   |   6 +-
 recipes-qt/qt5/qtmultimedia_git.bb                 |   4 +-
 recipes-qt/qt5/qtnetworkauth_git.bb                |   2 +-
 recipes-qt/qt5/qtquick1_git.bb                     |   5 +-
 ...fix-invalid-use-of-incomplete-type-class-.patch |   4 +-
 recipes-qt/qt5/qtquickcontrols2_git.bb             |   2 +-
 recipes-qt/qt5/qtquickcontrols_git.bb              |   4 +-
 recipes-qt/qt5/qtremoteobjects_git.bb              |   4 +-
 recipes-qt/qt5/qtscript_git.bb                     |   2 +-
 ...Use-external-host-bin-path-for-cmake-file.patch |   4 +-
 recipes-qt/qt5/qtscxml_git.bb                      |   4 +-
 recipes-qt/qt5/qtsensors_git.bb                    |   2 +-
 recipes-qt/qt5/qtserialbus_git.bb                  |   2 +-
 recipes-qt/qt5/qtserialport_git.bb                 |   2 +-
 recipes-qt/qt5/qtsvg_git.bb                        |   2 +-
 recipes-qt/qt5/qtsystems_git.bb                    |   2 +-
 .../0001-add-noqtwebkit-configuration.patch        |  12 +-
 ...ols-cmake-allow-overriding-the-location-f.patch |   2 +-
 recipes-qt/qt5/qttools_git.bb                      |   4 +-
 recipes-qt/qt5/qttranslations_git.bb               |   9 +-
 .../0001-include-sys-time.h-for-timeval.patch      |   5 +-
 recipes-qt/qt5/qtvirtualkeyboard_git.bb            |   4 +-
 .../0001-fix-build-without-xkbcommon-evdev.patch   |   2 +-
 recipes-qt/qt5/qtwayland_git.bb                    |   4 +-
 recipes-qt/qt5/qtwebchannel_git.bb                 |  11 +-
 ...ange-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch |   2 +-
 ...s.prf-allow-build-for-linux-oe-g-platform.patch |   6 +-
 ...quickwebengineview_p_p.h-add-include-QCol.patch |   4 +-
 ...romium-Force-host-toolchain-configuration.patch |   2 +-
 ...-dependency-to-QCoreApplication-translate.patch |   2 +-
 ...sl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch |   2 +-
 .../0004-Force-host-toolchain-configuration.patch  |   8 +-
 ...sl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch |   2 +-
 .../0005-Always-compile-QWebEnginePage-print.patch | 241 ---------------------
 ...-chromium-musl-include-fcntl.h-for-loff_t.patch |   2 +-
 ...sl-use-off64_t-instead-of-the-internal-__.patch |   2 +-
 ...ium-musl-linux-glibc-make-the-distinction.patch |   2 +-
 ...sl-allocator-Do-not-include-glibc_weak_sy.patch |   2 +-
 ...sl-Use-correct-member-name-__si_fields-fr.patch |   2 +-
 recipes-qt/qt5/qtwebengine_git.bb                  |  11 +-
 recipes-qt/qt5/qtwebkit-examples_git.bb            |   2 +-
 .../0001-qtwebkit-fix-QA-issue-bad-RPATH.patch     |   2 +-
 ...ude-backtrace-API-for-non-glibc-libraries.patch |   2 +-
 .../0003-Fix-compilation-with-ICU-59.patch         |  89 --------
 recipes-qt/qt5/qtwebkit_git.bb                     |   5 +-
 recipes-qt/qt5/qtwebsockets_git.bb                 |  12 +-
 .../0001-Add-missing-include-for-qWarning.patch    |  22 --
 recipes-qt/qt5/qtwebview_git.bb                    |   6 +-
 recipes-qt/qt5/qtx11extras_git.bb                  |   2 +-
 recipes-qt/qt5/qtxmlpatterns_git.bb                |   2 +-
 76 files changed, 128 insertions(+), 495 deletions(-)
 delete mode 100644 recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch
 delete mode 100644 recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch
 delete mode 100644 recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch
recipes-qt/qt5/nativesdk-qtbase_git.bb +3 -3
index d229c21..87bd501 100644
@@ -26,7 +26,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared
-# 5.9.meta-qt5-shared.1
+# 5.9.meta-qt5-shared.2
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
     file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -40,7 +40,7 @@ SRC_URI += "\
 
 # common for qtbase-native and nativesdk-qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native
-# 5.9.meta-qt5-native.1
+# 5.9.meta-qt5-native.2
 SRC_URI += " \
     file://0009-Always-build-uic.patch \
 "
@@ -197,4 +197,4 @@ fakeroot do_generate_qt_environment_file() {
 
 addtask generate_qt_environment_file after do_install before do_package
 
-SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b"
+SRCREV = "73573fce295caef35da706a8c8c796ec18e6baf1"
recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch +1 -1
index 8cf1f50..5aba2bf 100644
@@ -1,4 +1,4 @@
-From dd0f3fefeeefb31ec8cf2417bd3f447f7b9c25c6 Mon Sep 17 00:00:00 2001
+From 7cb46d20ad89f37828ff9f96363a112eadf11dbd Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <[email protected]>
 Date: Wed, 10 Feb 2016 09:02:09 +0200
 Subject: [PATCH] Allow a tools-only build
recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch +1 -1
index eeb402f..1f2f682 100644
@@ -1,4 +1,4 @@
-From ec40913bc563e3cb0abc1965ce457d3a2fe663b3 Mon Sep 17 00:00:00 2001
+From 99fb23c0258ed0dacb03dc2eb57792c42b33316f Mon Sep 17 00:00:00 2001
 From: Kim Kulling <[email protected]>
 Date: Mon, 7 Nov 2016 17:19:49 +0100
 Subject: [PATCH] Fix BlenderDNA for clang cross compiler.
recipes-qt/qt5/qt3d_git.bb +2 -2
index 4226bac..c354db4 100644
@@ -12,7 +12,7 @@ DEPENDS += "qtbase"
 DEPENDS_class-target += "qtdeclarative qt3d-native"
 
 # Patches from https://github.com/meta-qt5/qt3d/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += " \
     file://0001-Allow-a-tools-only-build.patch \
     file://0002-Fix-BlenderDNA-for-clang-cross-compiler.patch \
@@ -37,6 +37,6 @@ do_configure_prepend() {
          ${S}/src/quick3d/imports/input/importsinput.pro
 }
 
-SRCREV = "f39d0a0c32cc489849a0cd5c2880f6e824223485"
+SRCREV = "9d8c9ada161ad97634992c444196add0abb4f9d1"
 
 BBCLASSEXTEND += "native nativesdk"
recipes-qt/qt5/qt5-git.inc +2 -2
index 927912f..ffa70e5 100644
@@ -1,5 +1,5 @@
 # Copyright (C) 2012-2016 O.S. Systems Software LTDA.
-# Copyright (C) 2013-2016 Martin Jansa <[email protected]>
+# Copyright (C) 2013-2017 Martin Jansa <[email protected]>
 
 QT_MODULE ?= "${BPN}"
 QT_MODULE_BRANCH ?= "5.9"
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"
 
 S = "${WORKDIR}/git"
 
-PV = "5.9.0+git${SRCPV}"
+PV = "5.9.2+git${SRCPV}"
recipes-qt/qt5/qtbase-native_git.bb +3 -3
index 336df95..54a0b78 100644
@@ -21,7 +21,7 @@ require qt5-git.inc
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared
-# 5.9.meta-qt5-shared.1
+# 5.9.meta-qt5-shared.2
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
     file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -35,7 +35,7 @@ SRC_URI += "\
 
 # common for qtbase-native and nativesdk-qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native
-# 5.9.meta-qt5-native.1
+# 5.9.meta-qt5-native.2
 SRC_URI += " \
     file://0009-Always-build-uic.patch \
 "
@@ -114,4 +114,4 @@ do_install() {
     install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS}
 }
 
-SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b"
+SRCREV = "73573fce295caef35da706a8c8c796ec18e6baf1"
recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +3 -3
index 28c2660..a8fe433 100644
@@ -1,4 +1,4 @@
-From e13425e6f1e784b0b016cf68a54dfbae32995b86 Mon Sep 17 00:00:00 2001
+From 85da054ff867fbf1a4c10e3f1cad782123ffdfe4 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Mon, 15 Apr 2013 04:29:32 +0200
 Subject: [PATCH] Add linux-oe-g++ platform
@@ -30,10 +30,10 @@ Signed-off-by: Martin Jansa <[email protected]>
  create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
 
 diff --git a/configure b/configure
-index 73679de621..5a0eebce50 100755
+index 08b49a8d12..5876721743 100755
 --- a/configure
 +++ b/configure
-@@ -709,7 +709,7 @@ fi
+@@ -712,7 +712,7 @@ fi
  # is where the resulting variable is written to
  setBootstrapVariable()
  {
recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch +1 -1
index 5ee6e04..b67a7ef 100644
@@ -1,4 +1,4 @@
-From 5ed152f8caa7ef00fb20d19a06ab5f7887e9aba6 Mon Sep 17 00:00:00 2001
+From b6d5179ad7c907bc3343bcf3586cef6226d0c8ed Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Sat, 6 Apr 2013 13:15:07 +0200
 Subject: [PATCH] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS
recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +1 -1
index 7ff1ff7..ae06ea6 100644
@@ -1,4 +1,4 @@
-From 77fab782e8a199f9ede83bc97cbce21a544961c2 Mon Sep 17 00:00:00 2001
+From 8cf43041691140faf5f56b42bebfa00d8ebc8da6 Mon Sep 17 00:00:00 2001
 From: Holger Freyther <[email protected]>
 Date: Wed, 26 Sep 2012 17:22:30 +0200
 Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the
recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch +2 -2
index 5ab6a7b..8ef4f61 100644
@@ -1,4 +1,4 @@
-From 4848804312f0045b53c85db113ac9e42fe1b7360 Mon Sep 17 00:00:00 2001
+From f02c4f742e90023e87d148bda48401b11815d8ba Mon Sep 17 00:00:00 2001
 From: Denys Dmytriyenko <[email protected]>
 Date: Tue, 25 Aug 2015 10:05:15 -0400
 Subject: [PATCH] configure: bump path length from 256 to 512 characters
@@ -15,7 +15,7 @@ Signed-off-by: Denys Dmytriyenko <[email protected]>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/configure.pri b/configure.pri
-index be1b166080..52f03bf3f2 100644
+index 76bb27e4ae..9ac81027c9 100644
 --- a/configure.pri
 +++ b/configure.pri
 @@ -796,10 +796,10 @@ defineTest(qtConfOutput_preparePaths) {
recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch +3 -3
index 8538901..610299d 100644
@@ -1,4 +1,4 @@
-From 6ecb404346525a92f4c8926aa285662f3f5010b3 Mon Sep 17 00:00:00 2001
+From 3114a9cd19b15f6b5ca99c4ce961ae5b80bfb3ab Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <[email protected]>
 Date: Mon, 24 Oct 2016 09:45:18 +0300
 Subject: [PATCH] Disable all unknown features instead of erroring out
@@ -10,10 +10,10 @@ Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
-index 966c43108c..32f0dd0041 100644
+index afeb4f3d1d..aec5253c25 100644
 --- a/mkspecs/features/qt_configure.prf
 +++ b/mkspecs/features/qt_configure.prf
-@@ -1180,7 +1180,8 @@ defineReplace(qtConfEvaluateSingleExpression) {
+@@ -1235,7 +1235,8 @@ defineReplace(qtConfEvaluateSingleExpression) {
                      error("Expression '$$1' is accessing field '$$var' of non-local feature $${feature}.")
                  return($$result)
              }
recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch +2 -2
index 253815b..eaa5da8 100644
@@ -1,4 +1,4 @@
-From 3730ac03a1473a0e1fdfe1537b73818ab99961e9 Mon Sep 17 00:00:00 2001
+From 515acdcfe158982f31b31e410bbedb3db94bea1c Mon Sep 17 00:00:00 2001
 From: Pascal Bach <[email protected]>
 Date: Wed, 11 May 2016 15:20:41 +0200
 Subject: [PATCH] Pretend Qt5 wasn't found if OE_QMAKE_PATH_EXTERNAL_HOST_BINS
@@ -30,7 +30,7 @@ Signed-off-by: Pascal Bach <[email protected]>
  2 files changed, 10 insertions(+)
 
 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 4f342d67d7..202b723882 100644
+index 55c74aad66..f9ec328c83 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 @@ -9,6 +9,11 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch +1 -1
index 68e4b20..4d3e4b6 100644
@@ -1,4 +1,4 @@
-From 2fa6b447302abbaf1fd710e94b92692a300baaaf Mon Sep 17 00:00:00 2001
+From 6875848e2250ef439115ff2063713ce7bfb9597d Mon Sep 17 00:00:00 2001
 From: Huang Qiyu <[email protected]>
 Date: Wed, 7 Jun 2017 21:00:49 +0900
 Subject: [PATCH] Delete qlonglong and qulonglong
recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch +2 -2
index 678de52..14074fb 100644
@@ -1,4 +1,4 @@
-From 41d7028d2239a98a76cc91939edb2cb728019d08 Mon Sep 17 00:00:00 2001
+From 66da19d96d9a6ea9142df8fcbc0c3b7d960ee6b9 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Thu, 27 Jul 2017 08:02:51 -0700
 Subject: [PATCH] Replace pthread_yield with sched_yield
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <[email protected]>
  2 files changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
-index b6106e8c9e..6d6ea0b739 100644
+index f9ddd59aaa..2f92db983d 100644
 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
 +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
 @@ -34,7 +34,7 @@
recipes-qt/qt5/qtbase/0009-Always-build-uic.patch +1 -1
index 118a4f2..2a1d534 100644
@@ -1,4 +1,4 @@
-From 294e4c718407e66631ce36c37258217c9adb3f83 Mon Sep 17 00:00:00 2001
+From bf173918731c626b6c8b84eb826c921e5c6d44f5 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Sat, 16 Nov 2013 00:32:30 +0100
 Subject: [PATCH] Always build uic
recipes-qt/qt5/qtbase_git.bb +2 -2
index 1c18d0d..aaa59f3 100644
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = " \
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared
-# 5.9.meta-qt5-shared.1
+# 5.9.meta-qt5-shared.2
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
     file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -222,4 +222,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
 
 RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
 
-SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b"
+SRCREV = "73573fce295caef35da706a8c8c796ec18e6baf1"
recipes-qt/qt5/qtcanvas3d_git.bb +1 -1
index b2a0724..25cd72b 100644
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS = "qtdeclarative"
 
-SRCREV = "116737dc8fa244282dda95a8f13624b66fdb5521"
+SRCREV = "25447e889dc43c0831100bee1625a6f667d364cf"
recipes-qt/qt5/qtcharts_git.bb +1 -1
index 6b895aa..d3447ef 100644
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtdeclarative qtmultimedia"
 
-SRCREV = "de7f741c428febfe3c81a28f955996d2314953fc"
+SRCREV = "1f47b1a7ae58702dccc57a9ccbaa905441f4fecb"
recipes-qt/qt5/qtconnectivity_git.bb +1 -1
index 0d13dc4..9e91a1d 100644
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}"
 
 EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
 
-SRCREV = "8dcbf68e4579e03ea6d2808ac0c670169b59d0df"
+SRCREV = "94cc2b914a027fbcb7a1eb6cb34af45d0c07d2a4"
recipes-qt/qt5/qtdatavis3d_git.bb +1 -1
index 0cbd04e..471cfee 100644
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
 
-SRCREV = "84490ff75be5acdaeb3fd93900e4ebf7ba8f539b"
+SRCREV = "3f8ae713dfdbaeb34bdc52d905fe5ca16765cf7f"
recipes-qt/qt5/qtdeclarative_git.bb +1 -1
index ecd64ee..12e5f4e 100644
@@ -29,6 +29,6 @@ do_install_append_class-nativesdk() {
 
 EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
 
-SRCREV = "96f6ba5f562073f508cd8569ac354592fdd48f4a"
+SRCREV = "7c45b035b97ce705d536932965673dca7cfa489e"
 
 BBCLASSEXTEND =+ "native nativesdk"
recipes-qt/qt5/qtenginio_git.bb +0 -1
index 8b4fb71..1fa8e82 100644
@@ -14,4 +14,3 @@ DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
 
 QT_MODULE_BRANCH = "dev"
 SRCREV = "0555cf73c8b5abd41d8a4ff02457315c9e7c667d"
-
recipes-qt/qt5/qtgamepad_git.bb +1 -1
index 94f04a4..a771d9d 100644
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
 
 EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
 
-SRCREV = "ef8850fee38e2552d535379a8477c9abebdf8bb4"
+SRCREV = "1fc40deed6993265c436783cc367285bf9a2266a"
recipes-qt/qt5/qtgraphicaleffects_git.bb +1 -1
index edb150e..ee5b2a6 100644
@@ -23,4 +23,4 @@ RDEPENDS_${PN}-dev = ""
 # http://errors.yoctoproject.org/Errors/Build/44912/
 LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
 
-SRCREV = "db93af5b2bb49af74fbad6c9cd80bd7010434e78"
+SRCREV = "b6ff12df5496f3d296bb438ae343d5f771e93fec"
recipes-qt/qt5/qtimageformats_git.bb +1 -1
index 4dd64df..1e022f4 100644
@@ -26,4 +26,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
 
 EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
 
-SRCREV = "71ccf0dff82835ce7b5aed74c37829afdef44cde"
+SRCREV = "144a3535db9f95e60972d3c3b6eaceb65a604577"
recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch +4 -4
index 49fcff6..7db1676 100644
@@ -1,4 +1,4 @@
-From f7c76b91e726a0e63e5226eb6e89b13e0c3509b7 Mon Sep 17 00:00:00 2001
+From dbc899b088817cf6529d7e5cb8be7a6a95556127 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <[email protected]>
 Date: Wed, 7 Jun 2017 13:29:29 +0300
 Subject: [PATCH] Make mapbox-gl build configurable
@@ -13,15 +13,15 @@ Change-Id: I5f26200f2735b363c3c322f9035b331b9159c47b
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro
-index 0810d39..03fc119 100644
+index 459897a8..d97e05d0 100644
 --- a/src/plugins/geoservices/geoservices.pro
 +++ b/src/plugins/geoservices/geoservices.pro
 @@ -6,7 +6,7 @@ qtConfig(concurrent) {
      SUBDIRS += osm
  }
 
--qtConfig(c++14):!win32|mingw:!qnx {
-+mapboxgl:qtConfig(c++14):!win32|mingw:!qnx {
+-qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx {
++mapboxgl:qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx {
      !exists(../../3rdparty/mapbox-gl-native/CMakeLists.txt) {
          warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.")
      } else {
recipes-qt/qt5/qtlocation_git.bb +3 -3
index c50a917..19f895e 100644
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \
 DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols"
 
 # Patches from https://github.com/meta-qt5/qtlocation/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += "file://0001-Make-mapbox-gl-build-configurable.patch"
 
 PACKAGECONFIG ??= ""
@@ -34,7 +34,7 @@ SRC_URI += " \
     ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
 "
 
-SRCREV_qtlocation = "888d351cb0c7fe6d05ab1efe8d4dbb4b6f06cd5f"
-SRCREV_qtlocation-mapboxgl = "d45c177e8a23eefcc94930af9fa085e61136bb94"
+SRCREV_qtlocation = "c832af789766fcebd8cfb15e53ce14f36278ca6d"
+SRCREV_qtlocation-mapboxgl = "9ecbe3642fb4a53b558598239b59bf1d0224c25b"
 
 SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
recipes-qt/qt5/qtmultimedia_git.bb +2 -2
index 998f32f..729b3ff 100644
@@ -26,7 +26,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
 EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG', 'gstreamer gstreamer010', '', '-no-gstreamer', d)}"
 
 # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += "\
     file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \
 "
@@ -35,4 +35,4 @@ SRC_URI += "\
 # http://errors.yoctoproject.org/Errors/Build/44914/
 LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
 
-SRCREV = "559c305ded730e23505e8b29536a98dc59e2acfa"
+SRCREV = "343e281f0e7cc7fd9e1558e4d92f5019fa565181"
recipes-qt/qt5/qtnetworkauth_git.bb +1 -1
index eb5e4f6..0655b42 100644
@@ -9,4 +9,4 @@ require qt5-git.inc
 
 DEPENDS += "qtbase"
 
-SRCREV = "86c5036848ad004208803d9d497cfcd08c9623d6"
+SRCREV = "3d93f6436596e349e43c3798b675af66db71df8a"
recipes-qt/qt5/qtquick1_git.bb +4 -1
index 1f680e6..eaa3661 100644
@@ -24,4 +24,7 @@ do_configure_prepend() {
 }
 
 QT_MODULE_BRANCH = "dev"
-SRCREV = "695460401d9a89d2f156016d51601b2e59b64105"
+# one commit behind:
+# 8a7b80eb Use QRandomGenerator instead of q?rand
+# because QRandomGenerator is only since Qt 5.10
+SRCREV = "9bf0edd9bd46ecb900bcdc3349d14869b87ab7de"
recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch +2 -2
index 85fcc15..2e64480 100644
@@ -1,4 +1,4 @@
-From fca6212d5ebc5851f28e820e4ff0ebe04a9d44d7 Mon Sep 17 00:00:00 2001
+From 3248edbde8859f62f453215876fbcb89dd788513 Mon Sep 17 00:00:00 2001
 From: Denys Dmytriyenko <[email protected]>
 Date: Thu, 31 Mar 2016 19:57:01 -0400
 Subject: [PATCH] texteditor: fix invalid use of incomplete type 'class QDebug'
@@ -11,7 +11,7 @@ Signed-off-by: Denys Dmytriyenko <[email protected]>
  1 file changed, 1 insertion(+)
 
 diff --git a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp
-index bdecf5b..811a761 100644
+index 69da88f0..9039191e 100644
 --- a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp
 +++ b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp
 @@ -54,6 +54,7 @@
recipes-qt/qt5/qtquickcontrols2_git.bb +1 -1
index a84cfb3..e123f0d 100644
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtdeclarative"
 
-SRCREV = "ef6b8d3081f0bf93d6d59e67c8e3f82c63c511c3"
+SRCREV = "63f2f55462f2f040cfe175ada8aa1e01168597fc"
recipes-qt/qt5/qtquickcontrols_git.bb +2 -2
index 0ea314b..50d6ba6 100644
@@ -23,9 +23,9 @@ FILES_${PN}-qmlplugins += " \
 "
 
 # Patches from https://github.com/meta-qt5/qtquickcontrols/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += " \
     file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \
 "
 
-SRCREV = "dacb91916b202208681471ba764504c7c7d086f0"
+SRCREV = "a77494140324c3ede1f7c16086593c070d81e2b3"
recipes-qt/qt5/qtremoteobjects_git.bb +2 -2
index a7e3447..1e90323 100644
@@ -12,7 +12,7 @@ require qt5-git.inc
 DEPENDS += "qtbase qtdeclarative qtremoteobjects-native"
 
 # Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += " \
     file://0001-Allow-a-tools-only-build.patch \
 "
@@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
 
 EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
 
-SRCREV = "ae0b101884b05355e3a7bc06dbca722ad3d08d0f"
+SRCREV = "6e0341bc878ff82d3c1039dcce09f92269546189"
 
 BBCLASSEXTEND += "native nativesdk"
recipes-qt/qt5/qtscript_git.bb +1 -1
index e7acafe..9061c3c 100644
@@ -29,4 +29,4 @@ DEPENDS += "qtbase"
 # http://errors.yoctoproject.org/Errors/Build/44915/
 LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
 
-SRCREV = "e00ca9b6bec2adf78fd14e02376ecf1b55a93b0c"
+SRCREV = "86ee61734e0331459f9cfeb1ad56f773b7e994be"
recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch +2 -2
index 0b90a66..dc988fa 100644
@@ -1,4 +1,4 @@
-From 210049f0e53f7fb8e5c44325b13947add9618f89 Mon Sep 17 00:00:00 2001
+From 89c9f60679b21629412503a17358426bf211a81b Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <[email protected]>
 Date: Tue, 10 Jan 2017 15:28:26 +0200
 Subject: [PATCH] Use external host bin path for cmake file
@@ -14,7 +14,7 @@ Change-Id: Idb814be705e9cbaad7f1e68b5d7cdb79c4b65008
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/scxml/Qt5ScxmlConfigExtras.cmake.in b/src/scxml/Qt5ScxmlConfigExtras.cmake.in
-index edb320a..c2f8be8 100644
+index edb320a..ce7f2df 100644
 --- a/src/scxml/Qt5ScxmlConfigExtras.cmake.in
 +++ b/src/scxml/Qt5ScxmlConfigExtras.cmake.in
 @@ -40,7 +40,7 @@ if (NOT TARGET Qt5::qscxmlc)
recipes-qt/qt5/qtscxml_git.bb +2 -2
index e9ca8c1..36ca665 100644
@@ -10,10 +10,10 @@ require qt5-git.inc
 
 DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
 
-SRCREV = "eff82ac957e051f16f64c287f2dfaec9049bdfc1"
+SRCREV = "a1dff1a11ad303a1f82f181e6386194de90ec08f"
 
 # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch"
 
 do_install_append_class-nativesdk() {
recipes-qt/qt5/qtsensors_git.bb +1 -1
index 17d0639..8c3d925 100644
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtdeclarative"
 
-SRCREV = "0c3c4d01ea34ed98a0d2928662f07b673f00535d"
+SRCREV = "1673dbed00ba68209b6de95981f1e3b4a2a24682"
recipes-qt/qt5/qtserialbus_git.bb +1 -1
index 93a826b..d3a83a7 100644
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtserialport"
 
-SRCREV = "20811e3b004af817e3f02982c755e8b1560b8c3d"
+SRCREV = "1d37c357c843a2622d2af7e1684576e19a8c7c30"
recipes-qt/qt5/qtserialport_git.bb +1 -1
index 957000c..056e237 100644
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
-SRCREV = "687f5a9bd44a45a29d24925f29470c43d6729dee"
+SRCREV = "93b539140c06da07d330c9ecad67ab5ed3f9b0c8"
recipes-qt/qt5/qtsvg_git.bb +1 -1
index fb8d44e..40854e0 100644
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
-SRCREV = "4fd787e90c70afbaa168abb3efdb8757ba77f3a4"
+SRCREV = "0fcd0160662941a9ba800b36671e88d82790bd95"
recipes-qt/qt5/qtsystems_git.bb +1 -1
index 7c155a2..911a709 100644
@@ -30,4 +30,4 @@ do_install_append() {
 
 QT_MODULE_BRANCH = "dev"
 
-SRCREV = "434af789f0d56ca7a521ca2d9ec8cf3b1057fd37"
+SRCREV = "f364358a817ba57fa5aa9c67e731241249e704f8"
recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch +6 -6
index ed25390..7549ce9 100644
@@ -1,4 +1,4 @@
-From e0387540876944a20461d60d2208191c734e00b1 Mon Sep 17 00:00:00 2001
+From 0098107f710e363d41b4913758302b43adccf2bd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
 Date: Wed, 4 Jun 2014 11:28:16 +0200
 Subject: [PATCH] add noqtwebkit configuration
@@ -16,16 +16,16 @@ Signed-off-by: Martin Jansa <[email protected]>
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro
-index 540c9689..2312b521 100644
+index 82f55092..ef07ee03 100644
 --- a/src/assistant/assistant/assistant.pro
 +++ b/src/assistant/assistant/assistant.pro
 @@ -1,4 +1,4 @@
--false:qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) {
-+false:qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) {
-     # FIXME: currently broken
+-qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) {
++qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static):!contains(CONFIG, noqtwebkit) {
      BROWSER = qtwebkit
  } else {
-@@ -76,7 +76,7 @@ SOURCES += aboutdialog.cpp \
+     BROWSER = qtextbrowser
+@@ -75,7 +75,7 @@ SOURCES += aboutdialog.cpp \
      openpagesmanager.cpp \
      openpagesswitcher.cpp
 
recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch +1 -1
index b2e017e..80f2ae7 100644
@@ -1,4 +1,4 @@
-From 779278a109450ae84d5deb2e1e1c0dd9b737f1a2 Mon Sep 17 00:00:00 2001
+From 105277d4878ee1627bfb3be3d10833020e6923fc Mon Sep 17 00:00:00 2001
 From: Cody P Schafer <[email protected]>
 Date: Thu, 9 Jul 2015 11:28:19 -0400
 Subject: [PATCH] linguist-tools cmake: allow overriding the location for
recipes-qt/qt5/qttools_git.bb +2 -2
index 871b061..32d65d6 100644
@@ -15,7 +15,7 @@ inherit ptest
 DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
 
 # Patches from https://github.com/meta-qt5/qttools/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += " \
     file://run-ptest \
     file://0001-add-noqtwebkit-configuration.patch \
@@ -30,7 +30,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
 
 EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
 
-SRCREV = "88e02bb0a9b97d68a4b270e4ddfb6d0847c702a9"
+SRCREV = "fdc5749b5603653c5d0c59db267f44fd1609457e"
 
 BBCLASSEXTEND = "native nativesdk"
 
recipes-qt/qt5/qttranslations_git.bb +3 -6
index 822517f..0238ce9 100644
@@ -1,12 +1,9 @@
 require qt5.inc
 require qt5-git.inc
 
-LICENSE = "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 )"
+LICENSE = "GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
-    file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
+    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
 "
 
 DEPENDS += "qtbase qttools-native"
@@ -114,4 +111,4 @@ FILES_${PN}-qt = " \
     ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \
 "
 
-SRCREV = "3e727a890f7856978469ee38ef0619b1b59a8ca7"
+SRCREV = "325a90e07e9dce4e5c915549e6c31a86423dfdd3"
recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch +1 -4
index 8518ae9..c74854f 100644
@@ -1,4 +1,4 @@
-From 78106c5b939cc7d84710fe4c8e2a356ac1f110ef Mon Sep 17 00:00:00 2001
+From 2e76f24615766593ad6eb182627fa9d0bdba3c2d Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 12 Jul 2017 23:59:52 -0700
 Subject: [PATCH] include sys/time.h for timeval
@@ -23,6 +23,3 @@ index 1b9673f..924be7b 100644
  #ifdef _WIN32
  #include <winsock.h> // timeval
  #else
---
-2.13.2
-
recipes-qt/qt5/qtvirtualkeyboard_git.bb +2 -2
index ec1dc42..122d068 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
 "
 
 # Patches from https://github.com/meta-qt5/qtvirtualkeyboard/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += "file://0001-include-sys-time.h-for-timeval.patch"
 
 # 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"
 
 DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns"
 
-SRCREV = "bdf61afe76e94ef03da1332c4540646f18f5852f"
+SRCREV = "dd8c39ea9312ec1441b3fdd830f9d42fe3258b58"
recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch +1 -1
index a86868e..11acd5f 100644
@@ -1,4 +1,4 @@
-From 434be8d326adb02b7b0960481f045dc1a443cfce Mon Sep 17 00:00:00 2001
+From c4fae91b3d2b2b0f64e3fafac456a6a917c69e88 Mon Sep 17 00:00:00 2001
 From: Raphael Freudiger <[email protected]>
 Date: Tue, 10 Jan 2017 15:49:55 +0100
 Subject: [PATCH] fix build without xkbcommon-evdev
recipes-qt/qt5/qtwayland_git.bb +2 -2
index cece86e..9847f39 100644
@@ -37,10 +37,10 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature
 
 EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
 
-SRCREV = "f1cf62fa8e9ffa2548c9968906848596f50dbc0b"
+SRCREV = "7f70da6a644bc5b690066f0ab4814e1358f57e81"
 
 # Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 # From https://bugreports.qt.io/browse/QTBUG-57767
 SRC_URI += " \
     file://0001-fix-build-without-xkbcommon-evdev.patch \
recipes-qt/qt5/qtwebchannel_git.bb +3 -8
index f1167a9..7e12a33 100644
@@ -3,18 +3,13 @@ require qt5-git.inc
 
 LICENSE = "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 )"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-    file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
+    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
     file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
     file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
-    file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
-    file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
+    file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
 "
 
 DEPENDS += "qtdeclarative qtwebsockets"
 
-SRCREV = "6383f0fc5eec4935697a6d2d2f87b511bbeb678e"
+SRCREV = "b5229df6a08a902b11a2fc9529af6385f4d985d5"
recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch +1 -1
index 44c3f0b..0e9ea72 100644
@@ -1,4 +1,4 @@
-From 1634633d27cea7369111c9ea6d08be8515c15ccd Mon Sep 17 00:00:00 2001
+From d559da6ab0834aeb7307008015b6232e586fea00 Mon Sep 17 00:00:00 2001
 From: Cleiton Bueno <[email protected]>
 Date: Thu, 24 Dec 2015 12:46:58 -0200
 Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX
recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch +3 -3
index a91a298..275ef9e 100644
@@ -1,4 +1,4 @@
-From 491576d7e67d00b93106592140e5d7f0f34ea641 Mon Sep 17 00:00:00 2001
+From 96746f09947cc36f6c9fc8631bc6a6e7f59efe24 Mon Sep 17 00:00:00 2001
 From: Frieder Schrempf <[email protected]>
 Date: Mon, 1 Dec 2014 14:34:40 +0000
 Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform
@@ -12,10 +12,10 @@ Signed-off-by: Martin Jansa <[email protected]>
  1 file changed, 6 insertions(+)
 
 diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
-index eb421f8b..4513742d 100644
+index 56894e58..ef418a4c 100644
 --- a/mkspecs/features/functions.prf
 +++ b/mkspecs/features/functions.prf
-@@ -33,6 +33,12 @@ defineTest(isPlatformSupported) {
+@@ -21,6 +21,12 @@ defineTest(isPlatformSupported) {
        return(false)
      }
      gcc:!clang:!isGCCVersionSupported(): return(false)
recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch +2 -2
index d5567c3..6ada3f9 100644
@@ -1,4 +1,4 @@
-From 6b48d76b5af38a49f8e438e45c387f01b263e483 Mon Sep 17 00:00:00 2001
+From 06e9e7844ffa2b6985e5fa7a1c475c8a54ca252a Mon Sep 17 00:00:00 2001
 From: Cleiton Bueno <[email protected]>
 Date: Fri, 25 Dec 2015 18:16:05 -0200
 Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor
@@ -9,7 +9,7 @@ Signed-off-by: Cleiton Bueno <[email protected]>
  1 file changed, 2 insertions(+)
 
 diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
-index 2ecd70d7..703d1a92 100644
+index 19ecf5e1..f6f638ee 100644
 --- a/src/webengine/api/qquickwebengineview_p_p.h
 +++ b/src/webengine/api/qquickwebengineview_p_p.h
 @@ -59,6 +59,8 @@
recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch +1 -1
index 5f9eb3a..4a1a975 100644
@@ -1,4 +1,4 @@
-From b1a6f73d49a340e99145a4c4cf70dc796ed632ff Mon Sep 17 00:00:00 2001
+From a0b1a742813d0846472fab4aada2388bf2d42d80 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <[email protected]>
 Date: Wed, 15 Mar 2017 13:53:28 +0200
 Subject: [PATCH] chromium: Force host toolchain configuration
recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch +1 -1
index 2fa1764..8c0484b 100644
@@ -1,4 +1,4 @@
-From 95a6e3fd9e8498cb1f59120d402ec8ecfcd3ec59 Mon Sep 17 00:00:00 2001
+From bfd5e19fea1315d10b3217acaf92dfc32018ad03 Mon Sep 17 00:00:00 2001
 From: Cleiton Bueno <[email protected]>
 Date: Thu, 24 Dec 2015 15:59:51 -0200
 Subject: [PATCH] Include dependency to QCoreApplication::translate()
recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch +1 -1
index 8785842..d3c7a31 100644
@@ -1,4 +1,4 @@
-From 8910e65fd777120261f16c4a35ace2b0dc6181b3 Mon Sep 17 00:00:00 2001
+From 6d4d1b4cd380c51a6709c97524fbce0e0f09ce39 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 14:01:12 -0700
 Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if not
recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch +4 -4
index 142595a..258afd5 100644
@@ -1,4 +1,4 @@
-From e81f0a5139f8f1ea131438def3fe1aabe997aeff Mon Sep 17 00:00:00 2001
+From 5106be504b7edb7bc75309d581dfd33a89ed04fc Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <[email protected]>
 Date: Wed, 15 Mar 2017 13:53:28 +0200
 Subject: [PATCH] Force host toolchain configuration
@@ -13,10 +13,10 @@ Signed-off-by: Samuli Piippo <[email protected]>
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
-index fd27643e..f9acb6ff 100644
+index f1b3d47b..521c507b 100644
 --- a/src/buildtools/configure_host.pro
 +++ b/src/buildtools/configure_host.pro
-@@ -28,9 +28,9 @@ GN_CONTENTS = \
+@@ -29,9 +29,9 @@ GN_CONTENTS = \
  "import(\"//build/config/sysroot.gni\")" \
  "import(\"//build/toolchain/gcc_toolchain.gni\")" \
  "gcc_toolchain(\"host\") {" \
@@ -29,7 +29,7 @@ index fd27643e..f9acb6ff 100644
  "  ar = \"$$which(ar)\" " \
  "  nm = \"$$which(nm)\" " \
  "  toolchain_args = { " \
-@@ -41,9 +41,9 @@ GN_CONTENTS = \
+@@ -42,9 +42,9 @@ GN_CONTENTS = \
  "  } " \
  "}" \
  "gcc_toolchain(\"v8_snapshot\") {" \
recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch +1 -1
index 05b813b..71e36bb 100644
@@ -1,4 +1,4 @@
-From 86f467724070e854c8c6b13269951c97c0832dae Mon Sep 17 00:00:00 2001
+From 6d92d4b6f7adf913da77b4aae837a5880e64aa21 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 14:09:06 -0700
 Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -241
deleted file mode 100644
index c63086d..0000000
@@ -1,241 +0,0 @@
-From a8c0deca850ca519b3f146c71492a8f42a33dd84 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=BCri=20Valdmann?= <[email protected]>
-Date: Tue, 20 Jun 2017 15:36:43 +0200
-Subject: [PATCH] Always compile QWebEnginePage::print
-
-- Remove two out of five layers of ifdefs around and inside this method.
-- Now always compiled but will yield an error if printing is disabled.
-- Remove printing-related ifdefs from demobrowser.
-
-Task-number: QTBUG-61510
-Change-Id: I79781189d3d3fb62db0a2216b2b989e3fa1d1f86
-Reviewed-by: Allan Sandfeld Jensen <[email protected]>
-Reviewed-by: Rolf Eike Beer <[email protected]>
----
- examples/webenginewidgets/demobrowser/browsermainwindow.cpp | 12 ------------
- examples/webenginewidgets/demobrowser/browsermainwindow.h   |  6 ------
- examples/webenginewidgets/demobrowser/printtopdfdialog.cpp  |  7 -------
- src/webenginewidgets/api/qwebenginepage.cpp                 | 10 ++--------
- src/webenginewidgets/api/qwebenginepage.h                   |  8 --------
- 5 files changed, 2 insertions(+), 41 deletions(-)
-
-diff --git a/examples/webenginewidgets/demobrowser/browsermainwindow.cpp b/examples/webenginewidgets/demobrowser/browsermainwindow.cpp
-index 327d7a9d..14d49f7f 100644
---- a/examples/webenginewidgets/demobrowser/browsermainwindow.cpp
-+++ b/examples/webenginewidgets/demobrowser/browsermainwindow.cpp
-@@ -109,9 +109,7 @@ BrowserMainWindow::BrowserMainWindow(QWidget *parent, Qt::WindowFlags flags)
-     , m_historyForward(0)
-     , m_stop(0)
-     , m_reload(0)
--#ifndef QT_NO_PRINTER
-     , m_currentPrinter(nullptr)
--#endif
- {
-     setToolButtonStyle(Qt::ToolButtonFollowStyle);
-     setAttribute(Qt::WA_DeleteOnClose, true);
-@@ -312,9 +310,7 @@ void BrowserMainWindow::setupMenu()
- #if defined(QWEBENGINEPAGE_PRINT)
-     fileMenu->addAction(tr("P&rint Preview..."), this, SLOT(slotFilePrintPreview()));
- #endif
--#ifndef QT_NO_PRINTER
-     fileMenu->addAction(tr("&Print..."), this, SLOT(slotFilePrint()), QKeySequence::Print);
--#endif
-     fileMenu->addAction(tr("&Print to PDF..."), this, SLOT(slotFilePrintToPDF()));
-     fileMenu->addSeparator();
-
-@@ -702,23 +698,19 @@ void BrowserMainWindow::slotFileOpen()
-
- void BrowserMainWindow::slotFilePrintPreview()
- {
--#ifndef QT_NO_PRINTPREVIEWDIALOG
-     if (!currentTab())
-         return;
-     QPrintPreviewDialog *dialog = new QPrintPreviewDialog(this);
-     connect(dialog, SIGNAL(paintRequested(QPrinter*)),
-             currentTab(), SLOT(print(QPrinter*)));
-     dialog->exec();
--#endif
- }
-
- void BrowserMainWindow::slotFilePrint()
- {
--#ifndef QT_NO_PRINTER
-     if (!currentTab())
-         return;
-     printRequested(currentTab()->page());
--#endif
- }
-
- void BrowserMainWindow::slotHandlePdfPrinted(const QByteArray& result)
-@@ -751,7 +743,6 @@ void BrowserMainWindow::slotFilePrintToPDF()
-     currentTab()->page()->printToPdf(invoke(this, &BrowserMainWindow::slotHandlePdfPrinted), dialog->pageLayout());
- }
-
--#ifndef QT_NO_PRINTER
- void BrowserMainWindow::slotHandlePagePrinted(bool result)
- {
-     Q_UNUSED(result);
-@@ -763,7 +754,6 @@ void BrowserMainWindow::slotHandlePagePrinted(bool result)
-
- void BrowserMainWindow::printRequested(QWebEnginePage *page)
- {
--#ifndef QT_NO_PRINTDIALOG
-     if (m_currentPrinter)
-         return;
-     m_currentPrinter = new QPrinter();
-@@ -774,9 +764,7 @@ void BrowserMainWindow::printRequested(QWebEnginePage *page)
-         return;
-     }
-     page->print(m_currentPrinter, invoke(this, &BrowserMainWindow::slotHandlePagePrinted));
--#endif
- }
--#endif
-
- void BrowserMainWindow::slotPrivateBrowsing()
- {
-diff --git a/examples/webenginewidgets/demobrowser/browsermainwindow.h b/examples/webenginewidgets/demobrowser/browsermainwindow.h
-index 91e1c1d2..5bbbb292 100644
---- a/examples/webenginewidgets/demobrowser/browsermainwindow.h
-+++ b/examples/webenginewidgets/demobrowser/browsermainwindow.h
-@@ -56,9 +56,7 @@
- #include <QtCore/QUrl>
-
- QT_BEGIN_NAMESPACE
--#ifndef QT_NO_PRINTER
- class QPrinter;
--#endif
- class QWebEnginePage;
- QT_END_NAMESPACE
-
-@@ -142,10 +140,8 @@ private slots:
-     void slotSwapFocus();
-     void slotHandlePdfPrinted(const QByteArray&);
-
--#ifndef QT_NO_PRINTER
-     void slotHandlePagePrinted(bool result);
-     void printRequested(QWebEnginePage *page);
--#endif
-     void geometryChangeRequested(const QRect &geometry);
-     void updateToolbarActionText(bool visible);
-     void updateBookmarksToolbarActionText(bool visible);
-@@ -180,9 +176,7 @@ private:
-     QAction *m_restoreLastSession;
-     QAction *m_addBookmark;
-
--#ifndef QT_NO_PRINTER
-     QPrinter *m_currentPrinter;
--#endif
-
-     QIcon m_reloadIcon;
-     QIcon m_stopIcon;
-diff --git a/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp b/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp
-index 0f3b1765..50a8bb91 100644
---- a/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp
-+++ b/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp
-@@ -52,10 +52,8 @@
- #include "ui_printtopdfdialog.h"
-
- #include <QtCore/QDir>
--#ifndef QT_NO_PRINTER
- #include <QtPrintSupport/QPageSetupDialog>
- #include <QtPrintSupport/QPrinter>
--#endif // QT_NO_PRINTER
- #include <QtWidgets/QFileDialog>
-
- PrintToPdfDialog::PrintToPdfDialog(const QString &filePath, QWidget *parent) :
-@@ -66,11 +64,8 @@ PrintToPdfDialog::PrintToPdfDialog(const QString &filePath, QWidget *parent) :
-     ui->setupUi(this);
-     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-     connect(ui->chooseFilePathButton, &QToolButton::clicked, this, &PrintToPdfDialog::onChooseFilePathButtonClicked);
--#ifndef QT_NO_PRINTER
-     connect(ui->choosePageLayoutButton, &QToolButton::clicked, this, &PrintToPdfDialog::onChoosePageLayoutButtonClicked);
--#else
-     ui->choosePageLayoutButton->hide();
--#endif // QT_NO_PRINTER
-     updatePageLayoutLabel();
-     setFilePath(filePath);
- }
-@@ -82,7 +77,6 @@ PrintToPdfDialog::~PrintToPdfDialog()
-
- void PrintToPdfDialog::onChoosePageLayoutButtonClicked()
- {
--#ifndef QT_NO_PRINTER
-     QPrinter printer;
-     printer.setPageLayout(currentPageLayout);
-
-@@ -92,7 +86,6 @@ void PrintToPdfDialog::onChoosePageLayoutButtonClicked()
-     currentPageLayout.setPageSize(printer.pageLayout().pageSize());
-     currentPageLayout.setOrientation(printer.pageLayout().orientation());
-     updatePageLayoutLabel();
--#endif // QT_NO_PRINTER
- }
-
- void PrintToPdfDialog::onChooseFilePathButtonClicked()
-diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
-index 82720ae3..20d3268c 100644
---- a/src/webenginewidgets/api/qwebenginepage.cpp
-+++ b/src/webenginewidgets/api/qwebenginepage.cpp
-@@ -80,11 +80,9 @@
- #include <QMenu>
- #include <QMessageBox>
- #include <QMimeData>
--#if defined(QT_PRINTSUPPORT_LIB)
--#ifndef QT_NO_PRINTER
-+#ifdef ENABLE_PRINTING
- #include <QPrinter>
--#endif //QT_NO_PRINTER
--#endif //QT_PRINTSUPPORT_LIB
-+#endif
- #include <QStandardPaths>
- #include <QStyle>
- #include <QTimer>
-@@ -2052,8 +2050,6 @@ void QWebEnginePage::printToPdf(const QWebEngineCallback<const QByteArray&> &res
- #endif // if defined(ENABLE_PDF)
- }
-
--#if defined(QT_PRINTSUPPORT_LIB)
--#ifndef QT_NO_PRINTER
- /*!
-     \fn void QWebEnginePage::print(QPrinter *printer, FunctorOrLambda resultCallback)
-     Renders the current content of the page into a temporary PDF document, then prints it using \a printer.
-@@ -2090,8 +2086,6 @@ void QWebEnginePage::print(QPrinter *printer, const QWebEngineCallback<bool> &re
-     d->m_callbacks.invokeDirectly(resultCallback, false);
- #endif // if defined(ENABLE_PDF)
- }
--#endif // if defined(QT_NO_PRINTER)
--#endif // if defined(QT_PRINTSUPPORT_LIB)
-
- /*!
-     \since 5.7
-diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
-index c7d5a19e..5619639c 100644
---- a/src/webenginewidgets/api/qwebenginepage.h
-+++ b/src/webenginewidgets/api/qwebenginepage.h
-@@ -55,11 +55,7 @@
-
- QT_BEGIN_NAMESPACE
- class QMenu;
--#if defined(QT_PRINTSUPPORT_LIB)
--#ifndef QT_NO_PRINTER
- class QPrinter;
--#endif // QT_NO_PRINTER
--#endif // QT_PRINTSUPPORT_LIB
-
- class QWebChannel;
- class QWebEngineContextMenuData;
-@@ -294,15 +290,11 @@ public:
-     void printToPdf(const QWebEngineCallback<const QByteArray&> &resultCallback, const QPageLayout &layout = QPageLayout(QPageSize(QPageSize::A4), QPageLayout::Portrait, QMarginsF()));
- #endif
-
--#if defined(QT_PRINTSUPPORT_LIB)
--#ifndef QT_NO_PRINTER
- #ifdef Q_QDOC
-     void print(QPrinter *printer, FunctorOrLambda resultCallback);
- #else
-     void print(QPrinter *printer, const QWebEngineCallback<bool> &resultCallback);
- #endif // QDOC
--#endif // QT_NO_PRINTER
--#endif // QT_PRINTSUPPORT_LIB
-
-     const QWebEngineContextMenuData &contextMenuData() const;
-
recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch +1 -1
index 2d7bd02..00c875b 100644
@@ -1,4 +1,4 @@
-From 0a409a773f2b2936a2f1868d983e7bd1c92110bd Mon Sep 17 00:00:00 2001
+From 8780db69819ba37c8e2364ba361b03badf3c3ee4 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 14:37:49 -0700
 Subject: [PATCH] chromium: musl: include fcntl.h for loff_t
recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch +1 -1
index f58de8f..085cb01 100644
@@ -1,4 +1,4 @@
-From 375b70a99760c156b45e60def9bafd04902fb5a4 Mon Sep 17 00:00:00 2001
+From b360b036bb1ad31a74c056ce5d19e0271d75ff57 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 14:38:37 -0700
 Subject: [PATCH] chromium: musl: use off64_t instead of the internal __off64_t
recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch +1 -1
index c3b1cbb..e23cabe 100644
@@ -1,4 +1,4 @@
-From 314cfb7b41be8fc4f962956e0acd34f110114c6e Mon Sep 17 00:00:00 2001
+From 455a6603a33a87dfb7ab85a09587f534d9f5d984 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 14:54:38 -0700
 Subject: [PATCH] chromium: musl: linux != glibc, make the distinction
recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch +1 -1
index 550fd79..53e8a81 100644
@@ -1,4 +1,4 @@
-From bc3745992889e3dc3b42c890b6a458038c6994e0 Mon Sep 17 00:00:00 2001
+From aa3bfc656b3c84aba04c8294ad17c630141f4b09 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 15:09:02 -0700
 Subject: [PATCH] chromium: musl: allocator: Do not include glibc_weak_symbols
recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch +1 -1
index 82a2ccc..385e729 100644
@@ -1,4 +1,4 @@
-From de4e672044de11c5927aeb42a554f5eced0abf6c Mon Sep 17 00:00:00 2001
+From 85b21493f19bd2046f84836e03f0a9c32862bce8 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 15:12:39 -0700
 Subject: [PATCH] chromium: musl: Use correct member name __si_fields from
recipes-qt/qt5/qtwebengine_git.bb +5 -6
index 9879749..2815cb9 100644
@@ -16,7 +16,7 @@ DEPENDS += " \
     ninja-native \
     yasm-native \
     qtwebchannel \
-    qtbase qtdeclarative qtxmlpatterns qtquickcontrols \
+    qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtquickcontrols2 \
     qtlocation \
     libdrm fontconfig pixman openssl pango cairo icu pciutils \
     libcap \
@@ -130,18 +130,17 @@ RDEPENDS_${PN}-examples += " \
 QT_MODULE_BRANCH_CHROMIUM = "56-based"
 
 # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += " \
     ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
     file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch \
     file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch \
     file://0003-Include-dependency-to-QCoreApplication-translate.patch \
     file://0004-Force-host-toolchain-configuration.patch \
-    file://0005-Always-compile-QWebEnginePage-print.patch \
 "
 
 # Patches from https://github.com/meta-qt5/qtwebengine-chromium/commits/56-based
-# 56-based.meta-qt5.1
+# 56-based.meta-qt5.2
 SRC_URI += " \
     file://0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch;patchdir=src/3rdparty \
     file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty \
@@ -163,8 +162,8 @@ SRC_URI_append_libc-musl = "\
     file://0015-chromium-musl-tcmalloc-Use-off64_t-insread-of-__off6.patch;patchdir=src/3rdparty \
 "
 
-SRCREV_qtwebengine = "73f7be5b2a95eab3dce11caede538eeb7beb71f2"
-SRCREV_chromium = "aa2fdd6be3d465280d2a0c3aacdc738bb4ffec05"
+SRCREV_qtwebengine = "99f84ffd2c0c78014a24534a863aa1c755abd51c"
+SRCREV_chromium = "21508b5b5421f10ba8627c3c66c5281efb39b2f9"
 SRCREV = "${SRCREV_qtwebengine}"
 
 SRCREV_FORMAT = "qtwebengine_chromium"
recipes-qt/qt5/qtwebkit-examples_git.bb +1 -1
index 286aeca..3e3e4a0 100644
@@ -17,4 +17,4 @@ DEPENDS += "qtwebkit qtxmlpatterns"
 RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
 RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}"
 
-SRCREV = "822426abc77a74752b0ee0da4d0a1c106c4dac22"
+SRCREV = "a24c780b60d7d8bc00c4a48042cf7f32db777d55"
recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch +1 -1
index d393dc4..764b030 100644
@@ -1,4 +1,4 @@
-From f8bcac01fd5d95d0df8342809c53917aff1bf798 Mon Sep 17 00:00:00 2001
+From c4e691a8dd2037d9b359e0de9d4790da9078f74e Mon Sep 17 00:00:00 2001
 From: Trevor Woerner <[email protected]>
 Date: Fri, 7 Feb 2014 04:07:17 +0100
 Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH)
recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch +1 -1
index 147a7ba..cec6376 100644
@@ -1,4 +1,4 @@
-From 5d4f3219be0b66d63765e077644a51e18b1f4502 Mon Sep 17 00:00:00 2001
+From fc2773961eaa536e6a617ded7c1a972d979fa2e4 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 5 Jun 2015 19:55:05 -0700
 Subject: [PATCH] Exclude backtrace() API for non-glibc libraries
recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch deleted +0 -89
deleted file mode 100644
index debbda1..0000000
@@ -1,89 +0,0 @@
-From 240bd33ba3e78fcc0e5e3299d9e0e53299ea07f8 Mon Sep 17 00:00:00 2001
-From: Konstantin Tokarev <[email protected]>
-Date: Thu, 4 May 2017 15:12:37 +0300
-Subject: [PATCH] Fix compilation with ICU 59
-
-Upstream fix: https://bugs.webkit.org/show_bug.cgi?id=171612
-
-Task-number: QTBUG-60532
-Change-Id: I6014feea213aa70ebe40b09d9d1a03fd1ed3c843
-Reviewed-by: Allan Sandfeld Jensen <[email protected]>
----
- Source/JavaScriptCore/API/JSStringRef.cpp        | 6 +++---
- Source/JavaScriptCore/runtime/DateConversion.cpp | 3 ++-
- Source/WTF/wtf/TypeTraits.h                      | 3 +++
- Source/WebKit2/Shared/API/c/WKString.cpp         | 2 +-
- 4 files changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp
-index 812f3d413..77a3fd0f4 100644
---- a/Source/JavaScriptCore/API/JSStringRef.cpp
-+++ b/Source/JavaScriptCore/API/JSStringRef.cpp
-@@ -37,7 +37,7 @@ using namespace WTF::Unicode;
- JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars)
- {
-     initializeThreading();
--    return OpaqueJSString::create(chars, numChars).leakRef();
-+    return OpaqueJSString::create(reinterpret_cast<const UChar*>(chars), numChars).leakRef();
- }
-
- JSStringRef JSStringCreateWithUTF8CString(const char* string)
-@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string)
- JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars)
- {
-     initializeThreading();
--    return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef();
-+    return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast<const UChar*>(chars), numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef();
- }
-
- JSStringRef JSStringRetain(JSStringRef string)
-@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string)
-
- const JSChar* JSStringGetCharactersPtr(JSStringRef string)
- {
--    return string->characters();
-+    return reinterpret_cast<const JSChar*>(string->characters());
- }
-
- size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)
-diff --git a/Source/JavaScriptCore/runtime/DateConversion.cpp b/Source/JavaScriptCore/runtime/DateConversion.cpp
-index 0b57f012d..05e27338b 100644
---- a/Source/JavaScriptCore/runtime/DateConversion.cpp
-+++ b/Source/JavaScriptCore/runtime/DateConversion.cpp
-@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, DateTimeFormat format, bool as
- #if OS(WINDOWS)
-             TIME_ZONE_INFORMATION timeZoneInformation;
-             GetTimeZoneInformation(&timeZoneInformation);
--            const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
-+            const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
-+            String timeZoneName(reinterpret_cast<const UChar*>(winTimeZoneName));
- #else
-             struct tm gtm = t;
-             char timeZoneName[70];
-diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h
-index 9df2c95cf..f5d6121fd 100644
---- a/Source/WTF/wtf/TypeTraits.h
-+++ b/Source/WTF/wtf/TypeTraits.h
-@@ -72,6 +72,9 @@ namespace WTF {
-     template<> struct IsInteger<unsigned long>      { static const bool value = true; };
-     template<> struct IsInteger<long long>          { static const bool value = true; };
-     template<> struct IsInteger<unsigned long long> { static const bool value = true; };
-+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(_HAS_CHAR16_T_LANGUAGE_SUPPORT) && _HAS_CHAR16_T_LANGUAGE_SUPPORT)
-+    template<> struct IsInteger<char16_t>           { static const bool value = true; };
-+#endif
- #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
-     template<> struct IsInteger<wchar_t>            { static const bool value = true; };
- #endif
-diff --git a/Source/WebKit2/Shared/API/c/WKString.cpp b/Source/WebKit2/Shared/API/c/WKString.cpp
-index cbac67dd8..23400a64e 100644
---- a/Source/WebKit2/Shared/API/c/WKString.cpp
-+++ b/Source/WebKit2/Shared/API/c/WKString.cpp
-@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef)
- size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength)
- {
-     COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar);
--    return (toImpl(stringRef)->getCharacters(static_cast<UChar*>(buffer), bufferLength));
-+    return (toImpl(stringRef)->getCharacters(reinterpret_cast<UChar*>(buffer), bufferLength));
- }
-
- size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef)
recipes-qt/qt5/qtwebkit_git.bb +2 -3
index 0792c4a..8b3c3f5 100644
@@ -19,11 +19,10 @@ ARM_INSTRUCTION_SET_armv4 = "arm"
 ARM_INSTRUCTION_SET_armv5 = "arm"
 
 # Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += "\
     file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \
     file://0002-Exclude-backtrace-API-for-non-glibc-libraries.patch \
-    file://0003-Fix-compilation-with-ICU-59.patch \
 "
 
 PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors qtwebchannel \
@@ -88,4 +87,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db
 RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }"
 export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"
 
-SRCREV = "f27089657a207ef8c5c9d27d661d3d12c3af8df2"
+SRCREV = "97c4a80a1282c8c3eaa343011286b76fd4838c5f"
recipes-qt/qt5/qtwebsockets_git.bb +6 -6
index 41ec27f..448ce5c 100644
@@ -1,14 +1,14 @@
 require qt5.inc
 require qt5-git.inc
 
-LICENSE = "GFDL-1.3 & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
+LICENSE = "GFDL-1.3 & (GPL-3 | LGPL-3.0)"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
-    file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \
+    file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
+    file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
 "
 
 DEPENDS += "qtbase qtdeclarative"
 
-SRCREV = "1421c3e4ae4213ca18f2f51d5ddb38e223450222"
+SRCREV = "fb71c823a7ae823345518ca33ccfe273fcf76494"
recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch deleted +0 -22
deleted file mode 100644
index 82087b9..0000000
@@ -1,22 +0,0 @@
-From b946b6ea4a2a30bd12ecd036e40c9ef671681ba8 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <[email protected]>
-Date: Fri, 2 Jun 2017 13:12:18 +0300
-Subject: [PATCH] Add missing include for qWarning
-
-Change-Id: I7c7699e7a2b7ce59e4f659d460ec835f59bba439
----
- src/webview/qquickwebview.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/webview/qquickwebview.cpp b/src/webview/qquickwebview.cpp
-index d760564..fbbbfd6 100644
---- a/src/webview/qquickwebview.cpp
-+++ b/src/webview/qquickwebview.cpp
-@@ -39,6 +39,7 @@
- #include <QtWebView/private/qwebviewloadrequest_p.h>
- #include <QtQml/qqmlengine.h>
- #include <QtCore/qmutex.h>
-+#include <QtCore/QDebug>
-
- namespace {
-
recipes-qt/qt5/qtwebview_git.bb +1 -5
index 8b79aa1..0bbb09e 100644
@@ -9,10 +9,6 @@ LIC_FILES_CHKSUM = " \
 require qt5.inc
 require qt5-git.inc
 
-# Patches from https://github.com/meta-qt5/qtwebview/commits/b5.9
-# 5.9.meta-qt5.1
-SRC_URI += "file://0001-Add-missing-include-for-qWarning.patch"
-
 DEPENDS += "qtbase qtwebengine"
 
 COMPATIBLE_MACHINE = "(-)"
@@ -23,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
 COMPATIBLE_MACHINE_armv7ve = "(.*)"
 COMPATIBLE_MACHINE_aarch64 = "(.*)"
 
-SRCREV = "6e55abf3b6a5f373cd4b649c2318a45c49b40589"
+SRCREV = "e4016a67bbffefed71a407494e249e978d212b3d"
recipes-qt/qt5/qtx11extras_git.bb +1 -1
index bf03e9b..ed1440c 100644
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
-SRCREV = "9e83ff8713c1a3f69ce514bf3e31335194668da7"
+SRCREV = "f65d50eb063ad3c9a1d6f008f66e881d2e15f1d8"
recipes-qt/qt5/qtxmlpatterns_git.bb +1 -2
index 30e5262..7c18079 100644
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
-SRCREV = "c1c3af0ae456247c9bcd30161d51a94c9b38dc52"
+SRCREV = "fcfa824402bb4edaf644fad786dac3560c743ebe"
 
 BBCLASSEXTEND =+ "native nativesdk"
 
--

2.14.1

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#6 lore raw

Re: [meta-qt5][PATCHv2 5/7] qt: upgrade to latest revision in 5.9 branch

It looks like you're building 5.9.0 not 5.9.2 from the patch where you're replying, can you try if you can reproduce it with 5.9.2 as well? Maybe it was already fixed upstream.

Quoted 1,924 lines · Khem Raj

I am having issues compiling qtbase 5.9 with clang it fails like

| In file included from /mnt/a/oe/build/tmp/work/core2-64-bec-linux/qtbase/5.9. 0+gitAUTOINC+f6b36eaafe-r0/git/src/corelib/global/qlibraryinfo.cpp:41:
| In file included from ../../include/QtCore/qdir.h:1:
| In file included from ../../include/QtCore/../../../git/src/corelib/io/qdir.h:43:
| In file included from ../../include/QtCore/qstring.h:1:
| In file included from ../../include/QtCore/../../../git/src/corelib/tools/qstring.h:48:
| In file included from ../../include/QtCore/qchar.h:1:
| In file included from ../../include/QtCore/../../../git/src/corelib/tools/qchar.h:43:
| In file included from ../../include/QtCore/qglobal.h:1:
| In file included from ../../include/QtCore/../../../git/src/corelib/global/qglobal.h:109:
| In file included from /mnt/a/oe/build/tmp/work/core2-64-bec-linux/qtbase/5.9. 0+gitAUTOINC+f6b36eaafe-r0/recipe-sysroot/usr/lib//x86_ 64-bec-linux/7.2.0/../../../include/c++/7.2.0/algorithm:62:
| In file included from /mnt/a/oe/build/tmp/work/core2-64-bec-linux/qtbase/5.9. 0+gitAUTOINC+f6b36eaafe-r0/recipe-sysroot/usr/lib//x86_ 64-bec-linux/7.2.0/../../../include/c++/7.2.0/bits/stl_algo.h:59:
| /mnt/a/oe/build/tmp/work/core2-64-bec-linux/qtbase/5.9. 0+gitAUTOINC+f6b36eaafe-r0/recipe-sysroot/usr/lib//x86_ 64-bec-linux/7.2.0/../../../include/c++/7.2.0/cstdlib:75:15:
fatal error: 'stdlib.h' file not found
| #include_next <stdlib.h>
| ^~~~~~~~~~

this error means that somewhere -isystem is used instead of -I, any quick ideas where this could have been added ? 5.8 does not have this issue.

Quoted 56 lines · Martin Jansa

* 3 patches were included upstream

---
 recipes-qt/qt5/nativesdk-qtbase_git.bb             |   6 +-
 .../qt5/qt3d/0001-Allow-a-tools-only-build.patch   |   2 +-
 ...2-Fix-BlenderDNA-for-clang-cross-compiler.patch |   2 +-
 recipes-qt/qt5/qt3d_git.bb                         |   4 +-
 recipes-qt/qt5/qt5-git.inc                         |   4 +-
 recipes-qt/qt5/qtbase-native_git.bb                |   6 +-
 .../qt5/qtbase/0001-Add-linux-oe-g-platform.patch  |   6 +-
 ...make-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch |   2 +-
 ...o-allow-to-set-qt.conf-from-the-outside-u.patch |   2 +-
 ...ump-path-length-from-256-to-512-character.patch |   4 +-
 ...-unknown-features-instead-of-erroring-out.patch |   6 +-
 ...-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch |   4 +-
 .../0007-Delete-qlonglong-and-qulonglong.patch     |   2 +-
 ...08-Replace-pthread_yield-with-sched_yield.patch |   4 +-
 recipes-qt/qt5/qtbase/0009-Always-build-uic.patch  |   2 +-
 recipes-qt/qt5/qtbase_git.bb                       |   4 +-
 recipes-qt/qt5/qtcanvas3d_git.bb                   |   2 +-
 recipes-qt/qt5/qtcharts_git.bb                     |   2 +-
 recipes-qt/qt5/qtconnectivity_git.bb               |   2 +-
 recipes-qt/qt5/qtdatavis3d_git.bb                  |   2 +-
 recipes-qt/qt5/qtdeclarative_git.bb                |   2 +-
 recipes-qt/qt5/qtenginio_git.bb                    |   1 -
 recipes-qt/qt5/qtgamepad_git.bb                    |   2 +-
 recipes-qt/qt5/qtgraphicaleffects_git.bb           |   2 +-
 recipes-qt/qt5/qtimageformats_git.bb               |   2 +-
 .../0001-Make-mapbox-gl-build-configurable.patch   |   8 +-
 recipes-qt/qt5/qtlocation_git.bb                   |   6 +-
 recipes-qt/qt5/qtmultimedia_git.bb                 |   4 +-
 recipes-qt/qt5/qtnetworkauth_git.bb                |   2 +-
 recipes-qt/qt5/qtquick1_git.bb                     |   5 +-
 ...fix-invalid-use-of-incomplete-type-class-.patch |   4 +-
 recipes-qt/qt5/qtquickcontrols2_git.bb             |   2 +-
 recipes-qt/qt5/qtquickcontrols_git.bb              |   4 +-
 recipes-qt/qt5/qtremoteobjects_git.bb              |   4 +-
 recipes-qt/qt5/qtscript_git.bb                     |   2 +-
 ...Use-external-host-bin-path-for-cmake-file.patch |   4 +-
 recipes-qt/qt5/qtscxml_git.bb                      |   4 +-
 recipes-qt/qt5/qtsensors_git.bb                    |   2 +-
 recipes-qt/qt5/qtserialbus_git.bb                  |   2 +-
 recipes-qt/qt5/qtserialport_git.bb                 |   2 +-
 recipes-qt/qt5/qtsvg_git.bb                        |   2 +-
 recipes-qt/qt5/qtsystems_git.bb                    |   2 +-
 .../0001-add-noqtwebkit-configuration.patch        |  12 +-
 ...ols-cmake-allow-overriding-the-location-f.patch |   2 +-
 recipes-qt/qt5/qttools_git.bb                      |   4 +-
 recipes-qt/qt5/qttranslations_git.bb               |   9 +-
 .../0001-include-sys-time.h-for-timeval.patch      |   5 +-
 recipes-qt/qt5/qtvirtualkeyboard_git.bb            |   4 +-
 .../0001-fix-build-without-xkbcommon-evdev.patch   |   2 +-
 recipes-qt/qt5/qtwayland_git.bb                    |   4 +-
 recipes-qt/qt5/qtwebchannel_git.bb                 |  11 +-
 ...ange-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch |   2 +-
Quoted 8 lines
 ...s.prf-allow-build-for-linux-oe-g-platform.patch |   6 +-
 ...quickwebengineview_p_p.h-add-include-QCol.patch |   4 +-
 ...romium-Force-host-toolchain-configuration.patch |   2 +-
 ...-dependency-to-QCoreApplication-translate.patch |   2 +-
 ...sl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch |   2 +-
 .../0004-Force-host-toolchain-configuration.patch  |   8 +-
 ...sl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch |   2 +-
 .../0005-Always-compile-QWebEnginePage-print.patch | 241

---------------------

Quoted 10 lines
 ...-chromium-musl-include-fcntl.h-for-loff_t.patch |   2 +-
 ...sl-use-off64_t-instead-of-the-internal-__.patch |   2 +-
 ...ium-musl-linux-glibc-make-the-distinction.patch |   2 +-
 ...sl-allocator-Do-not-include-glibc_weak_sy.patch |   2 +-
 ...sl-Use-correct-member-name-__si_fields-fr.patch |   2 +-
 recipes-qt/qt5/qtwebengine_git.bb                  |  11 +-
 recipes-qt/qt5/qtwebkit-examples_git.bb            |   2 +-
 .../0001-qtwebkit-fix-QA-issue-bad-RPATH.patch     |   2 +-
 ...ude-backtrace-API-for-non-glibc-libraries.patch |   2 +-
 .../0003-Fix-compilation-with-ICU-59.patch         |  89 --------
Quoted 8 lines
 recipes-qt/qt5/qtwebkit_git.bb                     |   5 +-
 recipes-qt/qt5/qtwebsockets_git.bb                 |  12 +-
 .../0001-Add-missing-include-for-qWarning.patch    |  22 --
 recipes-qt/qt5/qtwebview_git.bb                    |   6 +-
 recipes-qt/qt5/qtx11extras_git.bb                  |   2 +-
 recipes-qt/qt5/qtxmlpatterns_git.bb                |   2 +-
 76 files changed, 128 insertions(+), 495 deletions(-)
 delete mode 100644 recipes-qt/qt5/qtwebengine/0005-Always-compile-

QWebEnginePage-print.patch

Quoted 1 line
 delete mode 100644 recipes-qt/qt5/qtwebkit/0003-

Fix-compilation-with-ICU-59.patch

Quoted 1 line
 delete mode 100644 recipes-qt/qt5/qtwebview/0001-

Add-missing-include-for-qWarning.patch

recipes-qt/qt5/

Quoted 2 lines
recipes-qt/qt5/ renamed from recipes-qt/qt5/nativesdk-qtbase_git.bb +0 -0

nativesdk-qtbase_git.bb

Review

Quoted 28 lines

index d229c21..87bd501 100644

recipes-qt/qt5/nativesdk-qtbase_git.bb +3 -3
@@ -26,7 +26,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared
-# 5.9.meta-qt5-shared.1
+# 5.9.meta-qt5-shared.2
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
     file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -40,7 +40,7 @@ SRC_URI += "\
 
 # common for qtbase-native and nativesdk-qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native
-# 5.9.meta-qt5-native.1
+# 5.9.meta-qt5-native.2
 SRC_URI += " \
     file://0009-Always-build-uic.patch \
 "
@@ -197,4 +197,4 @@ fakeroot do_generate_qt_environment_file() {
 
 addtask generate_qt_environment_file after do_install before do_package
 
-SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b"
+SRCREV = "73573fce295caef35da706a8c8c796ec18e6baf1"
(quoted diff) +0 -0

b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch

Review

Quoted 10 lines

index 8cf1f50..5aba2bf 100644

recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch +1 -1
@@ -1,4 +1,4 @@
-From dd0f3fefeeefb31ec8cf2417bd3f447f7b9c25c6 Mon Sep 17 00:00:00 2001
+From 7cb46d20ad89f37828ff9f96363a112eadf11dbd Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <[email protected]>
 Date: Wed, 10 Feb 2016 09:02:09 +0200
 Subject: [PATCH] Allow a tools-only build
(quoted diff) +0 -0

b/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch

Quoted 2 lines

index eeb402f..1f2f682 100644
--- a/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-

cross-compiler.patch

Quoted 1 line

+++ b/recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-

cross-compiler.patch

recipes-qt/qt5/

Quoted 45 lines
recipes-qt/qt5/qt3d/0002-Fix-BlenderDNA-for-clang-cross-compiler.patch +1 -1
@@ -1,4 +1,4 @@
-From ec40913bc563e3cb0abc1965ce457d3a2fe663b3 Mon Sep 17 00:00:00 2001
+From 99fb23c0258ed0dacb03dc2eb57792c42b33316f Mon Sep 17 00:00:00 2001
 From: Kim Kulling <[email protected]>
 Date: Mon, 7 Nov 2016 17:19:49 +0100
 Subject: [PATCH] Fix BlenderDNA for clang cross compiler.
recipes-qt/qt5/qt3d_git.bb +2 -2
index 4226bac..c354db4 100644
@@ -12,7 +12,7 @@ DEPENDS += "qtbase"
 DEPENDS_class-target += "qtdeclarative qt3d-native"
 
 # Patches from https://github.com/meta-qt5/qt3d/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += " \
     file://0001-Allow-a-tools-only-build.patch \
     file://0002-Fix-BlenderDNA-for-clang-cross-compiler.patch \
@@ -37,6 +37,6 @@ do_configure_prepend() {
          ${S}/src/quick3d/imports/input/importsinput.pro
 }
 
-SRCREV = "f39d0a0c32cc489849a0cd5c2880f6e824223485"
+SRCREV = "9d8c9ada161ad97634992c444196add0abb4f9d1"
 
 BBCLASSEXTEND += "native nativesdk"
recipes-qt/qt5/qt5-git.inc +2 -2
index 927912f..ffa70e5 100644
@@ -1,5 +1,5 @@
 # Copyright (C) 2012-2016 O.S. Systems Software LTDA.
-# Copyright (C) 2013-2016 Martin Jansa <[email protected]>
+# Copyright (C) 2013-2017 Martin Jansa <[email protected]>
 
 QT_MODULE ?= "${BPN}"
 QT_MODULE_BRANCH ?= "5.9"
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"
 
 S = "${WORKDIR}/git"
 
-PV = "5.9.0+git${SRCPV}"
+PV = "5.9.2+git${SRCPV}"
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtbase-native_git.bb +0 -0

qtbase-native_git.bb

Review

Quoted 28 lines

index 336df95..54a0b78 100644

recipes-qt/qt5/qtbase-native_git.bb +3 -3
@@ -21,7 +21,7 @@ require qt5-git.inc
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared
-# 5.9.meta-qt5-shared.1
+# 5.9.meta-qt5-shared.2
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
     file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \
@@ -35,7 +35,7 @@ SRC_URI += "\
 
 # common for qtbase-native and nativesdk-qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-native
-# 5.9.meta-qt5-native.1
+# 5.9.meta-qt5-native.2
 SRC_URI += " \
     file://0009-Always-build-uic.patch \
 "
@@ -114,4 +114,4 @@ do_install() {
     install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS}
 }
 
-SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b"
+SRCREV = "73573fce295caef35da706a8c8c796ec18e6baf1"
(quoted diff) +0 -0

b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch

Review

Quoted 23 lines

index 28c2660..a8fe433 100644

recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +3 -3
@@ -1,4 +1,4 @@
-From e13425e6f1e784b0b016cf68a54dfbae32995b86 Mon Sep 17 00:00:00 2001
+From 85da054ff867fbf1a4c10e3f1cad782123ffdfe4 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Mon, 15 Apr 2013 04:29:32 +0200
 Subject: [PATCH] Add linux-oe-g++ platform
@@ -30,10 +30,10 @@ Signed-off-by: Martin Jansa <[email protected]>
  create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
 
 diff --git a/configure b/configure
-index 73679de621..5a0eebce50 100755
+index 08b49a8d12..5876721743 100755
 --- a/configure
 +++ b/configure
-@@ -709,7 +709,7 @@ fi
+@@ -712,7 +712,7 @@ fi
  # is where the resulting variable is written to
  setBootstrapVariable()
  {
(quoted diff) +0 -0

b/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_ EXTERNAL_HOST_BINS.patch

Quoted 2 lines

index 5ee6e04..b67a7ef 100644
--- a/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_

EXTERNAL_HOST_BINS.patch

Quoted 1 line

+++ b/recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_

EXTERNAL_HOST_BINS.patch

Review

Quoted 7 lines
recipes-qt/qt5/qtbase/0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch +1 -1
@@ -1,4 +1,4 @@
-From 5ed152f8caa7ef00fb20d19a06ab5f7887e9aba6 Mon Sep 17 00:00:00 2001
+From b6d5179ad7c907bc3343bcf3586cef6226d0c8ed Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Sat, 6 Apr 2013 13:15:07 +0200
 Subject: [PATCH] cmake: Use OE_QMAKE_PATH_EXTERNAL_HOST_BINS
(quoted diff) +0 -0

b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt. conf-from-the-outside-u.patch

Quoted 2 lines

index 7ff1ff7..ae06ea6 100644
--- a/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.

conf-from-the-outside-u.patch

Quoted 1 line

+++ b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.

conf-from-the-outside-u.patch

recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch line 4

Quoted 6 lines
recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +1 -1
@@ -1,4 +1,4 @@
-From 77fab782e8a199f9ede83bc97cbce21a544961c2 Mon Sep 17 00:00:00 2001
+From 8cf43041691140faf5f56b42bebfa00d8ebc8da6 Mon Sep 17 00:00:00 2001
 From: Holger Freyther <[email protected]>
 Date: Wed, 26 Sep 2012 17:22:30 +0200
 Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside

using the

Review

Quoted 1 line
(quoted diff) +0 -0

from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0004- configure-bump-path-length-from-256-to-512-character.patch

Quoted 2 lines

index 5ab6a7b..8ef4f61 100644
--- a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-

from-256-to-512-character.patch

Quoted 1 line

+++ b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-

from-256-to-512-character.patch

Review

Quoted 16 lines
recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch +2 -2
@@ -1,4 +1,4 @@
-From 4848804312f0045b53c85db113ac9e42fe1b7360 Mon Sep 17 00:00:00 2001
+From f02c4f742e90023e87d148bda48401b11815d8ba Mon Sep 17 00:00:00 2001
 From: Denys Dmytriyenko <[email protected]>
 Date: Tue, 25 Aug 2015 10:05:15 -0400
 Subject: [PATCH] configure: bump path length from 256 to 512 characters
@@ -15,7 +15,7 @@ Signed-off-by: Denys Dmytriyenko <[email protected]>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/configure.pri b/configure.pri
-index be1b166080..52f03bf3f2 100644
+index 76bb27e4ae..9ac81027c9 100644
 --- a/configure.pri
 +++ b/configure.pri
 @@ -796,10 +796,10 @@ defineTest(qtConfOutput_preparePaths) {
(quoted diff) +0 -0

b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features- instead-of-erroring-out.patch

Quoted 2 lines

index 8538901..610299d 100644
--- a/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-

instead-of-erroring-out.patch

Quoted 1 line

+++ b/recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-

instead-of-erroring-out.patch

recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447 · line 12

Quoted 10 lines
recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch +1 -1
@@ -1,4 +1,4 @@
-From 6ecb404346525a92f4c8926aa285662f3f5010b3 Mon Sep 17 00:00:00 2001
+From 3114a9cd19b15f6b5ca99c4ce961ae5b80bfb3ab Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <[email protected]>
 Date: Mon, 24 Oct 2016 09:45:18 +0300
 Subject: [PATCH] Disable all unknown features instead of erroring out
@@ -10,10 +10,10 @@ Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_

configure.prf

recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch Change-Id: Ib884fe33cac74439f9592b145937f6b75ced8447

Quoted 7 lines
recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch +2 -2
-index 966c43108c..32f0dd0041 100644
+index afeb4f3d1d..aec5253c25 100644
 --- a/mkspecs/features/qt_configure.prf
 +++ b/mkspecs/features/qt_configure.prf
-@@ -1180,7 +1180,8 @@ defineReplace(qtConfEvaluateSingleExpression) {
+@@ -1235,7 +1235,8 @@ defineReplace(qtConfEvaluateSingleExpression) {
                      error("Expression '$$1' is accessing field '$$var'

of non-local feature $${feature}.")

Review

Quoted 3 lines
recipes-qt/qt5/qtbase/0005-Disable-all-unknown-features-instead-of-erroring-out.patch +0 -0
                  return($$result)
              }
(quoted diff) +0 -0

b/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if- OE_QMAKE_PATH_EXTERNAL_H.patch

Quoted 2 lines

index 253815b..eaa5da8 100644
--- a/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-

OE_QMAKE_PATH_EXTERNAL_H.patch

Quoted 1 line

+++ b/recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-

OE_QMAKE_PATH_EXTERNAL_H.patch

recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch line 4

Quoted 6 lines
recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch +1 -1
@@ -1,4 +1,4 @@
-From 3730ac03a1473a0e1fdfe1537b73818ab99961e9 Mon Sep 17 00:00:00 2001
+From 515acdcfe158982f31b31e410bbedb3db94bea1c Mon Sep 17 00:00:00 2001
 From: Pascal Bach <[email protected]>
 Date: Wed, 11 May 2016 15:20:41 +0200
 Subject: [PATCH] Pretend Qt5 wasn't found if

OE_QMAKE_PATH_EXTERNAL_HOST_BINS

recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch Signed-off-by: Pascal Bach <[email protected]> · line 32

Quoted 4 lines
recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch +0 -0
@@ -30,7 +30,7 @@ Signed-off-by: Pascal Bach <[email protected]>
  2 files changed, 10 insertions(+)
 
 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in

b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in

Review

Quoted 6 lines
recipes-qt/qt5/qtbase/0006-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch +1 -1
-index 4f342d67d7..202b723882 100644
+index 55c74aad66..f9ec328c83 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 @@ -9,6 +9,11 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
(quoted diff) +0 -0

b/recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch

Review

Quoted 10 lines

index 68e4b20..4d3e4b6 100644

recipes-qt/qt5/qtbase/0007-Delete-qlonglong-and-qulonglong.patch +1 -1
@@ -1,4 +1,4 @@
-From 2fa6b447302abbaf1fd710e94b92692a300baaaf Mon Sep 17 00:00:00 2001
+From 6875848e2250ef439115ff2063713ce7bfb9597d Mon Sep 17 00:00:00 2001
 From: Huang Qiyu <[email protected]>
 Date: Wed, 7 Jun 2017 21:00:49 +0900
 Subject: [PATCH] Delete qlonglong and qulonglong
(quoted diff) +0 -0

b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch

Quoted 2 lines

index 678de52..14074fb 100644
--- a/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-

sched_yield.patch

Quoted 1 line

+++ b/recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-

sched_yield.patch

recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch Signed-off-by: Khem Raj <[email protected]> · line 16

Quoted 10 lines
recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch +1 -1
@@ -1,4 +1,4 @@
-From 41d7028d2239a98a76cc91939edb2cb728019d08 Mon Sep 17 00:00:00 2001
+From 66da19d96d9a6ea9142df8fcbc0c3b7d960ee6b9 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Thu, 27 Jul 2017 08:02:51 -0700
 Subject: [PATCH] Replace pthread_yield with sched_yield
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <[email protected]>
  2 files changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp

b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp

Review

Quoted 6 lines
recipes-qt/qt5/qtbase/0008-Replace-pthread_yield-with-sched_yield.patch +1 -1
-index b6106e8c9e..6d6ea0b739 100644
+index f9ddd59aaa..2f92db983d 100644
 --- a/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
 +++ b/tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
 @@ -34,7 +34,7 @@
(quoted diff) +0 -0

b/recipes-qt/qt5/qtbase/0009-Always-build-uic.patch

Quoted 23 lines

index 118a4f2..2a1d534 100644

recipes-qt/qt5/qtbase/0009-Always-build-uic.patch +1 -1
@@ -1,4 +1,4 @@
-From 294e4c718407e66631ce36c37258217c9adb3f83 Mon Sep 17 00:00:00 2001
+From bf173918731c626b6c8b84eb826c921e5c6d44f5 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <[email protected]>
 Date: Sat, 16 Nov 2013 00:32:30 +0100
 Subject: [PATCH] Always build uic
recipes-qt/qt5/qtbase_git.bb +1 -1
index 1c18d0d..aaa59f3 100644
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = " \
 
 # common for qtbase-native, qtbase-nativesdk and qtbase
 # Patches from https://github.com/meta-qt5/qtbase/commits/b5.9-shared
-# 5.9.meta-qt5-shared.1
+# 5.9.meta-qt5-shared.2
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
     file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \

recipes-qt/qt5/qtbase_git.bb INSANE_SKIP_${PN}-mkspecs += "file-rdeps" · line 223

Quoted 2 lines
recipes-qt/qt5/qtbase_git.bb +0 -0
@@ -222,4 +222,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
 
 RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES',

'x11', 'libx11-locale', '', d)}"

recipes-qt/qt5/

Quoted 4 lines
recipes-qt/qt5/qtbase_git.bb +1 -1
-SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b"
+SRCREV = "73573fce295caef35da706a8c8c796ec18e6baf1"
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtcanvas3d_git.bb +0 -0

qtcanvas3d_git.bb

recipes-qt/qt5/

Quoted 10 lines

index b2a0724..25cd72b 100644

recipes-qt/qt5/qtcanvas3d_git.bb +1 -1
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS = "qtdeclarative"
 
-SRCREV = "116737dc8fa244282dda95a8f13624b66fdb5521"
+SRCREV = "25447e889dc43c0831100bee1625a6f667d364cf"
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtcharts_git.bb +0 -0

qtcharts_git.bb

recipes-qt/qt5/

Quoted 10 lines

index 6b895aa..d3447ef 100644

recipes-qt/qt5/qtcharts_git.bb +1 -1
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtdeclarative qtmultimedia"
 
-SRCREV = "de7f741c428febfe3c81a28f955996d2314953fc"
+SRCREV = "1f47b1a7ae58702dccc57a9ccbaa905441f4fecb"
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtconnectivity_git.bb +0 -0

qtconnectivity_git.bb

recipes-qt/qt5/qtconnectivity_git.bb PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-

Quoted 4 lines

index 0d13dc4..9e91a1d 100644

recipes-qt/qt5/qtconnectivity_git.bb +0 -0
@@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-

bluez,${BLUEZ}"

recipes-qt/qt5/

Quoted 6 lines
recipes-qt/qt5/qtconnectivity_git.bb +1 -1
 EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
 
-SRCREV = "8dcbf68e4579e03ea6d2808ac0c670169b59d0df"
+SRCREV = "94cc2b914a027fbcb7a1eb6cb34af45d0c07d2a4"
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtdatavis3d_git.bb +0 -0

qtdatavis3d_git.bb

recipes-qt/qt5/

Quoted 10 lines

index 0cbd04e..471cfee 100644

recipes-qt/qt5/qtdatavis3d_git.bb +1 -1
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
 
-SRCREV = "84490ff75be5acdaeb3fd93900e4ebf7ba8f539b"
+SRCREV = "3f8ae713dfdbaeb34bdc52d905fe5ca16765cf7f"
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtdeclarative_git.bb +0 -0

qtdeclarative_git.bb

recipes-qt/qt5/qtdeclarative_git.bb do_install_append_class-nativesdk() { · line 30

Quoted 6 lines

index ecd64ee..12e5f4e 100644

recipes-qt/qt5/qtdeclarative_git.bb +0 -0
@@ -29,6 +29,6 @@ do_install_append_class-nativesdk() {
 
 EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG',

'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"

recipes-qt/qt5/qtenginio_

Quoted 6 lines
recipes-qt/qt5/qtdeclarative_git.bb +1 -1
-SRCREV = "96f6ba5f562073f508cd8569ac354592fdd48f4a"
+SRCREV = "7c45b035b97ce705d536932965673dca7cfa489e"
 
 BBCLASSEXTEND =+ "native nativesdk"
recipes-qt/qt5/qtenginio_ renamed from recipes-qt/qt5/qtenginio_git.bb +0 -0

git.bb

recipes-qt/qt5/qtgamepad_

Quoted 9 lines

index 8b4fb71..1fa8e82 100644

recipes-qt/qt5/qtenginio_git.bb +0 -1
@@ -14,4 +14,3 @@ DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
 
 QT_MODULE_BRANCH = "dev"
 SRCREV = "0555cf73c8b5abd41d8a4ff02457315c9e7c667d"
-
recipes-qt/qt5/qtgamepad_ renamed from recipes-qt/qt5/qtgamepad_git.bb +0 -0

git.bb

recipes-qt/qt5/qtgamepad_git.bb PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-

Quoted 4 lines

index 94f04a4..a771d9d 100644

recipes-qt/qt5/qtgamepad_git.bb +0 -0
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-

sdl2,libsdl2"

recipes-qt/qt5/

Quoted 6 lines
recipes-qt/qt5/qtgamepad_git.bb +1 -1
 EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
 
-SRCREV = "ef8850fee38e2552d535379a8477c9abebdf8bb4"
+SRCREV = "1fc40deed6993265c436783cc367285bf9a2266a"
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtgraphicaleffects_git.bb +0 -0

qtgraphicaleffects_git.bb

recipes-qt/qt5/qtgraphicaleffects_git.bb RDEPENDS_${PN}-dev = "" · line 24

Quoted 6 lines

index edb150e..ee5b2a6 100644

recipes-qt/qt5/qtgraphicaleffects_git.bb +0 -0
@@ -23,4 +23,4 @@ RDEPENDS_${PN}-dev = ""
 # http://errors.yoctoproject.org/Errors/Build/44912/
 LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES',

'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"

recipes-qt/qt5/

Quoted 4 lines
recipes-qt/qt5/qtgraphicaleffects_git.bb +1 -1
-SRCREV = "db93af5b2bb49af74fbad6c9cd80bd7010434e78"
+SRCREV = "b6ff12df5496f3d296bb438ae343d5f771e93fec"
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtimageformats_git.bb +0 -0

qtimageformats_git.bb

recipes-qt/qt5/qtimageformats_git.bb PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,

Quoted 4 lines

index 4dd64df..1e022f4 100644

recipes-qt/qt5/qtimageformats_git.bb +0 -0
@@ -26,4 +26,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,

libwebp"

Review

Quoted 6 lines
recipes-qt/qt5/qtimageformats_git.bb +1 -1
 EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
 
-SRCREV = "71ccf0dff82835ce7b5aed74c37829afdef44cde"
+SRCREV = "144a3535db9f95e60972d3c3b6eaceb65a604577"
(quoted diff) +0 -0

b/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch

Quoted 2 lines

index 49fcff6..7db1676 100644
--- a/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-

configurable.patch

Quoted 1 line

+++ b/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-

configurable.patch

recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch Change-Id: I5f26200f2735b363c3c322f9035b331b9159c47b · line 15

Quoted 10 lines
recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch +1 -1
@@ -1,4 +1,4 @@
-From f7c76b91e726a0e63e5226eb6e89b13e0c3509b7 Mon Sep 17 00:00:00 2001
+From dbc899b088817cf6529d7e5cb8be7a6a95556127 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <[email protected]>
 Date: Wed, 7 Jun 2017 13:29:29 +0300
 Subject: [PATCH] Make mapbox-gl build configurable
@@ -13,15 +13,15 @@ Change-Id: I5f26200f2735b363c3c322f9035b331b9159c47b
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/plugins/geoservices/geoservices.pro

b/src/plugins/geoservices/geoservices.pro

Quoted 4 lines
recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch +1 -1
-index 0810d39..03fc119 100644
+index 459897a8..d97e05d0 100644
 --- a/src/plugins/geoservices/geoservices.pro
 +++ b/src/plugins/geoservices/geoservices.pro

recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch Change-Id: I5f26200f2735b363c3c322f9035b331b9159c47b

Quoted 10 lines
recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch +2 -2
 @@ -6,7 +6,7 @@ qtConfig(concurrent) {
      SUBDIRS += osm
  }
 
--qtConfig(c++14):!win32|mingw:!qnx {
-+mapboxgl:qtConfig(c++14):!win32|mingw:!qnx {
+-qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx {
++mapboxgl:qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx {
      !exists(../../3rdparty/mapbox-gl-native/CMakeLists.txt) {
          warning("Submodule mapbox-gl-native does not exist. Run 'git

submodule update --init' on qtlocation.")

recipes-qt/qt5/

Quoted 2 lines
(quoted diff) +0 -0
      } else {
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtlocation_git.bb +0 -0

qtlocation_git.bb

Quoted 13 lines

index c50a917..19f895e 100644

recipes-qt/qt5/qtlocation_git.bb +1 -1
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \
 DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols"
 
 # Patches from https://github.com/meta-qt5/qtlocation/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += "file://0001-Make-mapbox-gl-build-configurable.patch"
 
 PACKAGECONFIG ??= ""

recipes-qt/qt5/qtlocation_git.bb SRC_URI += " \ · line 34

Quoted 1 line
recipes-qt/qt5/qtlocation_git.bb +0 -0
@@ -34,7 +34,7 @@ SRC_URI += " \
     ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;

branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL}; destsuffix=git/src/3rdparty/mapbox-gl-native \

recipes-qt/qt5/

Quoted 9 lines
recipes-qt/qt5/qtlocation_git.bb +2 -2
 "
 
-SRCREV_qtlocation = "888d351cb0c7fe6d05ab1efe8d4dbb4b6f06cd5f"
-SRCREV_qtlocation-mapboxgl = "d45c177e8a23eefcc94930af9fa085e61136bb94"
+SRCREV_qtlocation = "c832af789766fcebd8cfb15e53ce14f36278ca6d"
+SRCREV_qtlocation-mapboxgl = "9ecbe3642fb4a53b558598239b59bf1d0224c25b"
 
 SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtmultimedia_git.bb +0 -0

qtmultimedia_git.bb

recipes-qt/qt5/qtmultimedia_git.bb EXTRA_QMAKEVARS_CONFIGURE +=

Quoted 4 lines

index 998f32f..729b3ff 100644

recipes-qt/qt5/qtmultimedia_git.bb +0 -0
@@ -26,7 +26,7 @@ EXTRA_QMAKEVARS_CONFIGURE +=

"${PACKAGECONFIG_CONFARGS}"

recipes-qt/qt5/qtmultimedia_git.bb EXTRA_QMAKEVARS_CONFIGURE += · line 26

Quoted 1 line
recipes-qt/qt5/qtmultimedia_git.bb +0 -0
 EXTRA_QMAKEVARS_CONFIGURE += "${@bb.utils.contains_any('PACKAGECONFIG',

'gstreamer gstreamer010', '', '-no-gstreamer', d)}"

recipes-qt/qt5/qtmultimedia_git.bb SRC_URI += "\ · line 36

Quoted 10 lines
recipes-qt/qt5/qtmultimedia_git.bb +1 -1
 # Patches from https://github.com/meta-qt5/qtmultimedia/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += "\
     file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \
 "
@@ -35,4 +35,4 @@ SRC_URI += "\
 # http://errors.yoctoproject.org/Errors/Build/44914/
 LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES',

'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"

recipes-qt/qt5/

Quoted 4 lines
recipes-qt/qt5/qtmultimedia_git.bb +1 -1
-SRCREV = "559c305ded730e23505e8b29536a98dc59e2acfa"
+SRCREV = "343e281f0e7cc7fd9e1558e4d92f5019fa565181"
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtnetworkauth_git.bb +0 -0

qtnetworkauth_git.bb

recipes-qt/qt5/

Quoted 10 lines

index eb5e4f6..0655b42 100644

recipes-qt/qt5/qtnetworkauth_git.bb +1 -1
@@ -9,4 +9,4 @@ require qt5-git.inc
 
 DEPENDS += "qtbase"
 
-SRCREV = "86c5036848ad004208803d9d497cfcd08c9623d6"
+SRCREV = "3d93f6436596e349e43c3798b675af66db71df8a"
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtquick1_git.bb +0 -0

qtquick1_git.bb

Review

Quoted 13 lines

index 1f680e6..eaa3661 100644

recipes-qt/qt5/qtquick1_git.bb +4 -1
@@ -24,4 +24,7 @@ do_configure_prepend() {
 }
 
 QT_MODULE_BRANCH = "dev"
-SRCREV = "695460401d9a89d2f156016d51601b2e59b64105"
+# one commit behind:
+# 8a7b80eb Use QRandomGenerator instead of q?rand
+# because QRandomGenerator is only since Qt 5.10
+SRCREV = "9bf0edd9bd46ecb900bcdc3349d14869b87ab7de"
(quoted diff) +0 -0

texteditor-fix-invalid-use-of-incomplete-type-class-.patch b/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of- incomplete-type-class-.patch

Quoted 2 lines

index 85fcc15..2e64480 100644
--- a/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-

incomplete-type-class-.patch

Quoted 1 line

+++ b/recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-

incomplete-type-class-.patch

recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch line 4

Quoted 6 lines
recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch +1 -1
@@ -1,4 +1,4 @@
-From fca6212d5ebc5851f28e820e4ff0ebe04a9d44d7 Mon Sep 17 00:00:00 2001
+From 3248edbde8859f62f453215876fbcb89dd788513 Mon Sep 17 00:00:00 2001
 From: Denys Dmytriyenko <[email protected]>
 Date: Thu, 31 Mar 2016 19:57:01 -0400
 Subject: [PATCH] texteditor: fix invalid use of incomplete type 'class

QDebug'

recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch Signed-off-by: Denys Dmytriyenko <[email protected]> · line 13

Quoted 4 lines
recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch +0 -0
@@ -11,7 +11,7 @@ Signed-off-by: Denys Dmytriyenko <[email protected]>
  1 file changed, 1 insertion(+)
 
 diff --git a/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp

b/examples/quickcontrols/controls/texteditor/src/documenthandler.cpp

recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch Signed-off-by: Denys Dmytriyenko <[email protected]>

Quoted 3 lines
recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch +1 -1
-index bdecf5b..811a761 100644
+index 69da88f0..9039191e 100644
 --- a/examples/quickcontrols/controls/texteditor/src/

documenthandler.cpp

Review Signed-off-by: Denys Dmytriyenko <[email protected]> · line 16

Quoted 1 line
(quoted diff) +0 -0
 +++ b/examples/quickcontrols/controls/texteditor/src/

documenthandler.cpp

recipes-qt/qt5/

Quoted 2 lines
recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch +0 -0
 @@ -54,6 +54,7 @@
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtquickcontrols2_git.bb +0 -0

qtquickcontrols2_git.bb

recipes-qt/qt5/

Quoted 10 lines

index a84cfb3..e123f0d 100644

recipes-qt/qt5/qtquickcontrols2_git.bb +1 -1
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtdeclarative"
 
-SRCREV = "ef6b8d3081f0bf93d6d59e67c8e3f82c63c511c3"
+SRCREV = "63f2f55462f2f040cfe175ada8aa1e01168597fc"
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtquickcontrols_git.bb +0 -0

qtquickcontrols_git.bb

recipes-qt/qt5/qtquickcontrols_git.bb FILES_${PN}-qmlplugins += " \ · line 28

Quoted 11 lines

index 0ea314b..50d6ba6 100644

recipes-qt/qt5/qtquickcontrols_git.bb +1 -1
@@ -23,9 +23,9 @@ FILES_${PN}-qmlplugins += " \
 "
 
 # Patches from https://github.com/meta-qt5/qtquickcontrols/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += " \
     file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch

\

recipes-qt/qt5/

Quoted 5 lines
recipes-qt/qt5/qtquickcontrols_git.bb +1 -1
 "
 
-SRCREV = "dacb91916b202208681471ba764504c7c7d086f0"
+SRCREV = "a77494140324c3ede1f7c16086593c070d81e2b3"
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtremoteobjects_git.bb +0 -0

qtremoteobjects_git.bb

recipes-qt/qt5/

Quoted 21 lines

index a7e3447..1e90323 100644

recipes-qt/qt5/qtremoteobjects_git.bb +2 -2
@@ -12,7 +12,7 @@ require qt5-git.inc
 DEPENDS += "qtbase qtdeclarative qtremoteobjects-native"
 
 # Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += " \
     file://0001-Allow-a-tools-only-build.patch \
 "
@@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
 
 EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
 
-SRCREV = "ae0b101884b05355e3a7bc06dbca722ad3d08d0f"
+SRCREV = "6e0341bc878ff82d3c1039dcce09f92269546189"
 
 BBCLASSEXTEND += "native nativesdk"
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtscript_git.bb +0 -0

qtscript_git.bb

recipes-qt/qt5/qtscript_git.bb DEPENDS += "qtbase" · line 30

Quoted 6 lines

index e7acafe..9061c3c 100644

recipes-qt/qt5/qtscript_git.bb +0 -0
@@ -29,4 +29,4 @@ DEPENDS += "qtbase"
 # http://errors.yoctoproject.org/Errors/Build/44915/
 LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES',

'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"

Review

Quoted 4 lines
recipes-qt/qt5/qtscript_git.bb +1 -1
-SRCREV = "e00ca9b6bec2adf78fd14e02376ecf1b55a93b0c"
+SRCREV = "86ee61734e0331459f9cfeb1ad56f773b7e994be"
(quoted diff) +0 -0

b/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path- for-cmake-file.patch

Quoted 2 lines

index 0b90a66..dc988fa 100644
--- a/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-

for-cmake-file.patch

Quoted 1 line

+++ b/recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-

for-cmake-file.patch

recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch Change-Id: Idb814be705e9cbaad7f1e68b5d7cdb79c4b65008 · line 16

Quoted 10 lines
recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch +1 -1
@@ -1,4 +1,4 @@
-From 210049f0e53f7fb8e5c44325b13947add9618f89 Mon Sep 17 00:00:00 2001
+From 89c9f60679b21629412503a17358426bf211a81b Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <[email protected]>
 Date: Tue, 10 Jan 2017 15:28:26 +0200
 Subject: [PATCH] Use external host bin path for cmake file
@@ -14,7 +14,7 @@ Change-Id: Idb814be705e9cbaad7f1e68b5d7cdb79c4b65008
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/scxml/Qt5ScxmlConfigExtras.cmake.in b/src/scxml/

Qt5ScxmlConfigExtras.cmake.in

recipes-qt/qt5/qtscxml_git.

Quoted 6 lines
recipes-qt/qt5/qtscxml/0001-Use-external-host-bin-path-for-cmake-file.patch +1 -1
-index edb320a..c2f8be8 100644
+index edb320a..ce7f2df 100644
 --- a/src/scxml/Qt5ScxmlConfigExtras.cmake.in
 +++ b/src/scxml/Qt5ScxmlConfigExtras.cmake.in
 @@ -40,7 +40,7 @@ if (NOT TARGET Qt5::qscxmlc)
recipes-qt/qt5/qtscxml_git. renamed from recipes-qt/qt5/qtscxml_git.bb +0 -0

bb

Quoted 4 lines

index e9ca8c1..36ca665 100644

recipes-qt/qt5/qtscxml_git.bb require qt5-git.inc · line 17

Quoted 10 lines
recipes-qt/qt5/qtscxml_git.bb +2 -2
@@ -10,10 +10,10 @@ require qt5-git.inc
 
 DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
 
-SRCREV = "eff82ac957e051f16f64c287f2dfaec9049bdfc1"
+SRCREV = "a1dff1a11ad303a1f82f181e6386194de90ec08f"
 
 # Patches from https://github.com/meta-qt5/qtscxml/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.

patch"

recipes-qt/qt5/qtsensors_

Quoted 3 lines
recipes-qt/qt5/qtscxml_git.bb +0 -0
 do_install_append_class-nativesdk() {
recipes-qt/qt5/qtsensors_ renamed from recipes-qt/qt5/qtsensors_git.bb +0 -0

git.bb

recipes-qt/qt5/

Quoted 10 lines

index 17d0639..8c3d925 100644

recipes-qt/qt5/qtsensors_git.bb +1 -1
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtdeclarative"
 
-SRCREV = "0c3c4d01ea34ed98a0d2928662f07b673f00535d"
+SRCREV = "1673dbed00ba68209b6de95981f1e3b4a2a24682"
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtserialbus_git.bb +0 -0

qtserialbus_git.bb

recipes-qt/qt5/

Quoted 10 lines

index 93a826b..d3a83a7 100644

recipes-qt/qt5/qtserialbus_git.bb +1 -1
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtserialport"
 
-SRCREV = "20811e3b004af817e3f02982c755e8b1560b8c3d"
+SRCREV = "1d37c357c843a2622d2af7e1684576e19a8c7c30"
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtserialport_git.bb +0 -0

qtserialport_git.bb

recipes-qt/qt5/qtsystems_

Quoted 20 lines

index 957000c..056e237 100644

recipes-qt/qt5/qtserialport_git.bb +1 -1
@@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
-SRCREV = "687f5a9bd44a45a29d24925f29470c43d6729dee"
+SRCREV = "93b539140c06da07d330c9ecad67ab5ed3f9b0c8"
recipes-qt/qt5/qtsvg_git.bb +1 -1
index fb8d44e..40854e0 100644
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
-SRCREV = "4fd787e90c70afbaa168abb3efdb8757ba77f3a4"
+SRCREV = "0fcd0160662941a9ba800b36671e88d82790bd95"
recipes-qt/qt5/qtsystems_ renamed from recipes-qt/qt5/qtsystems_git.bb +0 -0

git.bb

Review

Quoted 10 lines

index 7c155a2..911a709 100644

recipes-qt/qt5/qtsystems_git.bb +1 -1
@@ -30,4 +30,4 @@ do_install_append() {
 
 QT_MODULE_BRANCH = "dev"
 
-SRCREV = "434af789f0d56ca7a521ca2d9ec8cf3b1057fd37"
+SRCREV = "f364358a817ba57fa5aa9c67e731241249e704f8"
(quoted diff) +0 -0

b/recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch

recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch Signed-off-by: Martin Jansa <[email protected]> · line 18

Quoted 13 lines

index ed25390..7549ce9 100644

recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch +1 -1
@@ -1,4 +1,4 @@
-From e0387540876944a20461d60d2208191c734e00b1 Mon Sep 17 00:00:00 2001
+From 0098107f710e363d41b4913758302b43adccf2bd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
 Date: Wed, 4 Jun 2014 11:28:16 +0200
 Subject: [PATCH] add noqtwebkit configuration
@@ -16,16 +16,16 @@ Signed-off-by: Martin Jansa <[email protected]>
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/assistant/assistant/assistant.pro

b/src/assistant/assistant/assistant.pro

recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch Signed-off-by: Martin Jansa <[email protected]>

Quoted 7 lines
recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch +1 -3
-index 540c9689..2312b521 100644
+index 82f55092..ef07ee03 100644
 --- a/src/assistant/assistant/assistant.pro
 +++ b/src/assistant/assistant/assistant.pro
 @@ -1,4 +1,4 @@
--false:qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) {
-+false:qtHaveModule(webkitwidgets):!contains(QT_CONFIG,

static):!contains(CONFIG, noqtwebkit) {

recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch Signed-off-by: Martin Jansa <[email protected]>

Quoted 3 lines
recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch +2 -1
-     # FIXME: currently broken
+-qtHaveModule(webkitwidgets):!contains(QT_CONFIG, static) {
++qtHaveModule(webkitwidgets):!contains(QT_CONFIG,

static):!contains(CONFIG, noqtwebkit) {

Review

Quoted 9 lines
recipes-qt/qt5/qttools/0001-add-noqtwebkit-configuration.patch +2 -1
      BROWSER = qtwebkit
  } else {
-@@ -76,7 +76,7 @@ SOURCES += aboutdialog.cpp \
+     BROWSER = qtextbrowser
+@@ -75,7 +75,7 @@ SOURCES += aboutdialog.cpp \
      openpagesmanager.cpp \
      openpagesswitcher.cpp
 
(quoted diff) +0 -0

overriding-the-location-f.patch b/recipes-qt/qt5/qttools/0002- linguist-tools-cmake-allow-overriding-the-location-f.patch

Quoted 2 lines

index b2e017e..80f2ae7 100644
--- a/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-

overriding-the-location-f.patch

Quoted 1 line

+++ b/recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-

overriding-the-location-f.patch

recipes-qt/qt5/qttools_git.

Quoted 7 lines
recipes-qt/qt5/qttools/0002-linguist-tools-cmake-allow-overriding-the-location-f.patch +1 -1
@@ -1,4 +1,4 @@
-From 779278a109450ae84d5deb2e1e1c0dd9b737f1a2 Mon Sep 17 00:00:00 2001
+From 105277d4878ee1627bfb3be3d10833020e6923fc Mon Sep 17 00:00:00 2001
 From: Cody P Schafer <[email protected]>
 Date: Thu, 9 Jul 2015 11:28:19 -0400
 Subject: [PATCH] linguist-tools cmake: allow overriding the location for
recipes-qt/qt5/qttools_git. renamed from recipes-qt/qt5/qttools_git.bb +0 -0

bb

Quoted 13 lines

index 871b061..32d65d6 100644

recipes-qt/qt5/qttools_git.bb +1 -1
@@ -15,7 +15,7 @@ inherit ptest
 DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
 
 # Patches from https://github.com/meta-qt5/qttools/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += " \
     file://run-ptest \
     file://0001-add-noqtwebkit-configuration.patch \

recipes-qt/qt5/qttools_git.bb PACKAGECONFIG[qtwebkit] = ",,qtwebkit" · line 31

Quoted 2 lines
recipes-qt/qt5/qttools_git.bb +0 -0
@@ -30,7 +30,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
 
 EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG',

'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"

recipes-qt/qt5/

Quoted 7 lines
recipes-qt/qt5/qttools_git.bb +1 -1
-SRCREV = "88e02bb0a9b97d68a4b270e4ddfb6d0847c702a9"
+SRCREV = "fdc5749b5603653c5d0c59db267f44fd1609457e"
 
 BBCLASSEXTEND = "native nativesdk"
 
recipes-qt/qt5/ renamed from recipes-qt/qt5/qttranslations_git.bb +0 -0

qttranslations_git.bb

recipes-qt/qt5/qttranslations_git.bb line 4

Quoted 8 lines

index 822517f..0238ce9 100644

recipes-qt/qt5/qttranslations_git.bb +0 -1
@@ -1,12 +1,9 @@
 require qt5.inc
 require qt5-git.inc
 
-LICENSE = "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 )"

recipes-qt/qt5/qttranslations_git.bb line 4

Quoted 1 line
recipes-qt/qt5/qttranslations_git.bb +1 -0
+LICENSE = "GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 |

The-Qt-Company-Commercial"

Review

Quoted 16 lines
recipes-qt/qt5/qttranslations_git.bb +2 -5
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
-    file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
+    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
 "
 
 DEPENDS += "qtbase qttools-native"
@@ -114,4 +111,4 @@ FILES_${PN}-qt = " \
     ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \
 "
 
-SRCREV = "3e727a890f7856978469ee38ef0619b1b59a8ca7"
+SRCREV = "325a90e07e9dce4e5c915549e6c31a86423dfdd3"
(quoted diff) +0 -0

include-sys-time.h-for-timeval.patch b/recipes-qt/qt5/ qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch

Quoted 2 lines

index 8518ae9..c74854f 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-

timeval.patch

Quoted 1 line

+++ b/recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-

timeval.patch

recipes-qt/qt5/

Quoted 14 lines
recipes-qt/qt5/qtvirtualkeyboard/0001-include-sys-time.h-for-timeval.patch +1 -4
@@ -1,4 +1,4 @@
-From 78106c5b939cc7d84710fe4c8e2a356ac1f110ef Mon Sep 17 00:00:00 2001
+From 2e76f24615766593ad6eb182627fa9d0bdba3c2d Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Wed, 12 Jul 2017 23:59:52 -0700
 Subject: [PATCH] include sys/time.h for timeval
@@ -23,6 +23,3 @@ index 1b9673f..924be7b 100644
  #ifdef _WIN32
  #include <winsock.h> // timeval
  #else
---
-2.13.2
-
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtvirtualkeyboard_git.bb +0 -0

qtvirtualkeyboard_git.bb

recipes-qt/qt5/qtvirtualkeyboard_git.bb LIC_FILES_CHKSUM = " \ · line 9

Quoted 7 lines

index ec1dc42..122d068 100644

recipes-qt/qt5/qtvirtualkeyboard_git.bb +0 -0
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
 "
 
 # Patches from https://github.com/meta-qt5/

qtvirtualkeyboard/commits/b5.9

recipes-qt/qt5/qtvirtualkeyboard_git.bb LIC_FILES_CHKSUM = " \

Quoted 5 lines
recipes-qt/qt5/qtvirtualkeyboard_git.bb +1 -1
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += "file://0001-include-sys-time.h-for-timeval.patch"
 
 # To enabled Nuance T9 Write support, you need to provide the licensed

components

recipes-qt/qt5/qtvirtualkeyboard_git.bb FILES_${PN} += "${OE_QMAKE_PATH_DATA}/

Quoted 1 line
recipes-qt/qt5/qtvirtualkeyboard_git.bb +0 -0
@@ -53,4 +53,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/

qtvirtualkeyboard/lipi_toolkit"

recipes-qt/qt5/qtvirtualkeyboard_git.bb FILES_${PN} += "${OE_QMAKE_PATH_DATA}/ · line 53

Quoted 2 lines
recipes-qt/qt5/qtvirtualkeyboard_git.bb +0 -0
 DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg

qtxmlpatterns"

Review

Quoted 4 lines
recipes-qt/qt5/qtvirtualkeyboard_git.bb +1 -1
-SRCREV = "bdf61afe76e94ef03da1332c4540646f18f5852f"
+SRCREV = "dd8c39ea9312ec1441b3fdd830f9d42fe3258b58"
(quoted diff) +0 -0

b/recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch

Quoted 2 lines

index a86868e..11acd5f 100644
--- a/recipes-qt/qt5/qtwayland/0001-fix-build-without-

xkbcommon-evdev.patch

Quoted 1 line

+++ b/recipes-qt/qt5/qtwayland/0001-fix-build-without-

xkbcommon-evdev.patch

recipes-qt/qt5/qtwayland_

Quoted 7 lines
recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch +1 -1
@@ -1,4 +1,4 @@
-From 434be8d326adb02b7b0960481f045dc1a443cfce Mon Sep 17 00:00:00 2001
+From c4fae91b3d2b2b0f64e3fafac456a6a917c69e88 Mon Sep 17 00:00:00 2001
 From: Raphael Freudiger <[email protected]>
 Date: Tue, 10 Jan 2017 15:49:55 +0100
 Subject: [PATCH] fix build without xkbcommon-evdev
recipes-qt/qt5/qtwayland_ renamed from recipes-qt/qt5/qtwayland_git.bb +0 -0

git.bb

recipes-qt/qt5/qtwayland_git.bb PACKAGECONFIG[libhybris-egl-server] =

Quoted 4 lines

index cece86e..9847f39 100644

recipes-qt/qt5/qtwayland_git.bb +0 -0
@@ -37,10 +37,10 @@ PACKAGECONFIG[libhybris-egl-server] =

"-feature-libhybris-egl-server,-no-feature

recipes-qt/qt5/

Quoted 13 lines
recipes-qt/qt5/qtwayland_git.bb +2 -2
 EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
 
-SRCREV = "f1cf62fa8e9ffa2548c9968906848596f50dbc0b"
+SRCREV = "7f70da6a644bc5b690066f0ab4814e1358f57e81"
 
 # Patches from https://github.com/meta-qt5/qtwayland/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 # From https://bugreports.qt.io/browse/QTBUG-57767
 SRC_URI += " \
     file://0001-fix-build-without-xkbcommon-evdev.patch \
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtwebchannel_git.bb +0 -0

qtwebchannel_git.bb

recipes-qt/qt5/qtwebchannel_git.bb require qt5-git.inc · line 4

Quoted 6 lines

index f1167a9..7e12a33 100644

recipes-qt/qt5/qtwebchannel_git.bb +0 -0
@@ -3,18 +3,13 @@ require qt5-git.inc
 
 LICENSE = "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 )"

Review

Quoted 20 lines
recipes-qt/qt5/qtwebchannel_git.bb +3 -8
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-    file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
+    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
     file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
     file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
-    file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
-    file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
+    file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
 "
 
 DEPENDS += "qtdeclarative qtwebsockets"
 
-SRCREV = "6383f0fc5eec4935697a6d2d2f87b511bbeb678e"
+SRCREV = "b5229df6a08a902b11a2fc9529af6385f4d985d5"
(quoted diff) +0 -0

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

Quoted 2 lines

index 44c3f0b..0e9ea72 100644
--- a/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-

FALSE-and-1-to-TRUE-FIX-qtw.patch

Quoted 1 line

+++ b/recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-

FALSE-and-1-to-TRUE-FIX-qtw.patch

Review

Quoted 7 lines
recipes-qt/qt5/qtwebengine/0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch +1 -1
@@ -1,4 +1,4 @@
-From 1634633d27cea7369111c9ea6d08be8515c15ccd Mon Sep 17 00:00:00 2001
+From d559da6ab0834aeb7307008015b6232e586fea00 Mon Sep 17 00:00:00 2001
 From: Cleiton Bueno <[email protected]>
 Date: Thu, 24 Dec 2015 12:46:58 -0200
 Subject: [PATCH] chromium: Change false to FALSE and 1 to TRUE, FIX
(quoted diff) +0 -0

build-for-linux-oe-g-platform.patch b/recipes-qt/qt5/qtwebengine/ 0001-functions.prf-allow-build-for-linux-oe-g-platform.patch

Quoted 2 lines

index a91a298..275ef9e 100644
--- a/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-

build-for-linux-oe-g-platform.patch

Quoted 1 line

+++ b/recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-

build-for-linux-oe-g-platform.patch

recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch Signed-off-by: Martin Jansa <[email protected]> · line 14

Quoted 10 lines
recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch +1 -1
@@ -1,4 +1,4 @@
-From 491576d7e67d00b93106592140e5d7f0f34ea641 Mon Sep 17 00:00:00 2001
+From 96746f09947cc36f6c9fc8631bc6a6e7f59efe24 Mon Sep 17 00:00:00 2001
 From: Frieder Schrempf <[email protected]>
 Date: Mon, 1 Dec 2014 14:34:40 +0000
 Subject: [PATCH] functions.prf: allow build for linux-oe-g++ platform
@@ -12,10 +12,10 @@ Signed-off-by: Martin Jansa <[email protected]>
  1 file changed, 6 insertions(+)
 
 diff --git a/mkspecs/features/functions.prf

b/mkspecs/features/functions.prf

Review

Quoted 10 lines
recipes-qt/qt5/qtwebengine/0001-functions.prf-allow-build-for-linux-oe-g-platform.patch +2 -2
-index eb421f8b..4513742d 100644
+index 56894e58..ef418a4c 100644
 --- a/mkspecs/features/functions.prf
 +++ b/mkspecs/features/functions.prf
-@@ -33,6 +33,12 @@ defineTest(isPlatformSupported) {
+@@ -21,6 +21,12 @@ defineTest(isPlatformSupported) {
        return(false)
      }
      gcc:!clang:!isGCCVersionSupported(): return(false)
(quoted diff) +0 -0

qquickwebengineview_p_p.h-add-include-QCol.patch b/recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add- include-QCol.patch

Quoted 2 lines

index d5567c3..6ada3f9 100644
--- a/recipes-qt/qt5/qtwebengine/0002-WebEngine-

qquickwebengineview_p_p.h-add-include-QCol.patch

Quoted 1 line

+++ b/recipes-qt/qt5/qtwebengine/0002-WebEngine-

qquickwebengineview_p_p.h-add-include-QCol.patch

recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch Signed-off-by: Cleiton Bueno <[email protected]> · line 11

Quoted 10 lines
recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch +1 -1
@@ -1,4 +1,4 @@
-From 6b48d76b5af38a49f8e438e45c387f01b263e483 Mon Sep 17 00:00:00 2001
+From 06e9e7844ffa2b6985e5fa7a1c475c8a54ca252a Mon Sep 17 00:00:00 2001
 From: Cleiton Bueno <[email protected]>
 Date: Fri, 25 Dec 2015 18:16:05 -0200
 Subject: [PATCH] WebEngine qquickwebengineview_p_p.h add include QColor
@@ -9,7 +9,7 @@ Signed-off-by: Cleiton Bueno <[email protected]>
  1 file changed, 2 insertions(+)
 
 diff --git a/src/webengine/api/qquickwebengineview_p_p.h

b/src/webengine/api/qquickwebengineview_p_p.h

Review

Quoted 6 lines
recipes-qt/qt5/qtwebengine/0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch +1 -1
-index 2ecd70d7..703d1a92 100644
+index 19ecf5e1..f6f638ee 100644
 --- a/src/webengine/api/qquickwebengineview_p_p.h
 +++ b/src/webengine/api/qquickwebengineview_p_p.h
 @@ -59,6 +59,8 @@
(quoted diff) +0 -0

b/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host- toolchain-configuration.patch

Quoted 2 lines

index 5f9eb3a..4a1a975 100644
--- a/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-

toolchain-configuration.patch

Quoted 1 line

+++ b/recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-

toolchain-configuration.patch

Review

Quoted 7 lines
recipes-qt/qt5/qtwebengine/0002-chromium-Force-host-toolchain-configuration.patch +1 -1
@@ -1,4 +1,4 @@
-From b1a6f73d49a340e99145a4c4cf70dc796ed632ff Mon Sep 17 00:00:00 2001
+From a0b1a742813d0846472fab4aada2388bf2d42d80 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <[email protected]>
 Date: Wed, 15 Mar 2017 13:53:28 +0200
 Subject: [PATCH] chromium: Force host toolchain configuration
(quoted diff) +0 -0

QCoreApplication-translate.patch b/recipes-qt/qt5/qtwebengine/ 0003-Include-dependency-to-QCoreApplication-translate.patch

Quoted 2 lines

index 2fa1764..8c0484b 100644
--- a/recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-

QCoreApplication-translate.patch

Quoted 1 line

+++ b/recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-

QCoreApplication-translate.patch

Review

Quoted 7 lines
recipes-qt/qt5/qtwebengine/0003-Include-dependency-to-QCoreApplication-translate.patch +1 -1
@@ -1,4 +1,4 @@
-From 95a6e3fd9e8498cb1f59120d402ec8ecfcd3ec59 Mon Sep 17 00:00:00 2001
+From bfd5e19fea1315d10b3217acaf92dfc32018ad03 Mon Sep 17 00:00:00 2001
 From: Cleiton Bueno <[email protected]>
 Date: Thu, 24 Dec 2015 15:59:51 -0200
 Subject: [PATCH] Include dependency to QCoreApplication::translate()
(quoted diff) +0 -0

Define-TEMP_FAILURE_RETRY-if-n.patch b/recipes-qt/qt5/qtwebengine/ 0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch

Quoted 2 lines

index 8785842..d3c7a31 100644
--- a/recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-

Define-TEMP_FAILURE_RETRY-if-n.patch

Quoted 1 line

+++ b/recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-

Define-TEMP_FAILURE_RETRY-if-n.patch

recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch line 4

Quoted 6 lines
recipes-qt/qt5/qtwebengine/0003-chromium-musl-sandbox-Define-TEMP_FAILURE_RETRY-if-n.patch +1 -1
@@ -1,4 +1,4 @@
-From 8910e65fd777120261f16c4a35ace2b0dc6181b3 Mon Sep 17 00:00:00 2001
+From 6d4d1b4cd380c51a6709c97524fbce0e0f09ce39 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 14:01:12 -0700
 Subject: [PATCH] chromium: musl: sandbox: Define TEMP_FAILURE_RETRY if

not

Review

Quoted 1 line
(quoted diff) +0 -0

b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch

Quoted 2 lines

index 142595a..258afd5 100644
--- a/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-

configuration.patch

Quoted 1 line

+++ b/recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-

configuration.patch

recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch Signed-off-by: Samuli Piippo <[email protected]> · line 15

Quoted 10 lines
recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch +1 -1
@@ -1,4 +1,4 @@
-From e81f0a5139f8f1ea131438def3fe1aabe997aeff Mon Sep 17 00:00:00 2001
+From 5106be504b7edb7bc75309d581dfd33a89ed04fc Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <[email protected]>
 Date: Wed, 15 Mar 2017 13:53:28 +0200
 Subject: [PATCH] Force host toolchain configuration
@@ -13,10 +13,10 @@ Signed-off-by: Samuli Piippo <[email protected]>
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/src/buildtools/configure_host.pro b/src/buildtools/

configure_host.pro

Review

Quoted 19 lines
recipes-qt/qt5/qtwebengine/0004-Force-host-toolchain-configuration.patch +3 -3
-index fd27643e..f9acb6ff 100644
+index f1b3d47b..521c507b 100644
 --- a/src/buildtools/configure_host.pro
 +++ b/src/buildtools/configure_host.pro
-@@ -28,9 +28,9 @@ GN_CONTENTS = \
+@@ -29,9 +29,9 @@ GN_CONTENTS = \
  "import(\"//build/config/sysroot.gni\")" \
  "import(\"//build/toolchain/gcc_toolchain.gni\")" \
  "gcc_toolchain(\"host\") {" \
@@ -29,7 +29,7 @@ index fd27643e..f9acb6ff 100644
  "  ar = \"$$which(ar)\" " \
  "  nm = \"$$which(nm)\" " \
  "  toolchain_args = { " \
-@@ -41,9 +41,9 @@ GN_CONTENTS = \
+@@ -42,9 +42,9 @@ GN_CONTENTS = \
  "  } " \
  "}" \
  "gcc_toolchain(\"v8_snapshot\") {" \
(quoted diff) +0 -0

mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/ 0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch

Quoted 2 lines

index 05b813b..71e36bb 100644
--- a/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-

mallinfo-APIs-on-non-glibc-linux.patch

Quoted 1 line

+++ b/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-

mallinfo-APIs-on-non-glibc-linux.patch

recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch line 4

Quoted 6 lines
recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch +1 -1
@@ -1,4 +1,4 @@
-From 86f467724070e854c8c6b13269951c97c0832dae Mon Sep 17 00:00:00 2001
+From 6d92d4b6f7adf913da77b4aae837a5880e64aa21 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 14:09:06 -0700
 Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on

non-glibc/linux

Review

Quoted 1 line
(quoted diff) +0 -0

b/recipes-qt/qt5/qtwebengine/0005-Always-compile-
QWebEnginePage-print.patch

Quoted 3 lines

deleted file mode 100644
index c63086d..0000000
--- a/recipes-qt/qt5/qtwebengine/0005-Always-compile-

QWebEnginePage-print.patch

Quoted 7 lines

+++ /dev/null

recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -5
@@ -1,241 +0,0 @@
-From a8c0deca850ca519b3f146c71492a8f42a33dd84 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=BCri=20Valdmann?= <[email protected]>
-Date: Tue, 20 Jun 2017 15:36:43 +0200
-Subject: [PATCH] Always compile QWebEnginePage::print
-

recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch line 15

Quoted 10 lines
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -10
-- Remove two out of five layers of ifdefs around and inside this method.
-- Now always compiled but will yield an error if printing is disabled.
-- Remove printing-related ifdefs from demobrowser.
-
-Task-number: QTBUG-61510
-Change-Id: I79781189d3d3fb62db0a2216b2b989e3fa1d1f86
-Reviewed-by: Allan Sandfeld Jensen <[email protected]>
-Reviewed-by: Rolf Eike Beer <[email protected]>
----
- examples/webenginewidgets/demobrowser/browsermainwindow.cpp | 12

------------

Review line 16

Quoted 1 line
(quoted diff) +0 -1
- examples/webenginewidgets/demobrowser/browsermainwindow.h   |  6

------

Review line 17

Quoted 1 line
(quoted diff) +0 -1
- examples/webenginewidgets/demobrowser/printtopdfdialog.cpp  |  7

-------

Review line 18

Quoted 1 line
(quoted diff) +0 -1
- src/webenginewidgets/api/qwebenginepage.cpp                 | 10

++--------

Review line 19

Quoted 1 line
(quoted diff) +0 -1
- src/webenginewidgets/api/qwebenginepage.h                   |  8

--------

recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch

Quoted 3 lines
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -3
- 5 files changed, 2 insertions(+), 41 deletions(-)
-
-diff --git a/examples/webenginewidgets/demobrowser/browsermainwindow.cpp

b/examples/webenginewidgets/demobrowser/browsermainwindow.cpp

recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch

Quoted 4 lines
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -4
-index 327d7a9d..14d49f7f 100644
---- a/examples/webenginewidgets/demobrowser/browsermainwindow.cpp
-+++ b/examples/webenginewidgets/demobrowser/browsermainwindow.cpp
-@@ -109,9 +109,7 @@ BrowserMainWindow::BrowserMainWindow(QWidget

*parent, Qt::WindowFlags flags)

recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch

Quoted 12 lines
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -12
-     , m_historyForward(0)
-     , m_stop(0)
-     , m_reload(0)
--#ifndef QT_NO_PRINTER
-     , m_currentPrinter(nullptr)
--#endif
- {
-     setToolButtonStyle(Qt::ToolButtonFollowStyle);
-     setAttribute(Qt::WA_DeleteOnClose, true);
-@@ -312,9 +310,7 @@ void BrowserMainWindow::setupMenu()
- #if defined(QWEBENGINEPAGE_PRINT)
-     fileMenu->addAction(tr("P&rint Preview..."), this,

SLOT(slotFilePrintPreview()));

recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch

Quoted 3 lines
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -3
- #endif
--#ifndef QT_NO_PRINTER
-     fileMenu->addAction(tr("&Print..."), this, SLOT(slotFilePrint()),

QKeySequence::Print);

Review line 43

Quoted 2 lines
(quoted diff) +0 -2
--#endif
-     fileMenu->addAction(tr("&Print to PDF..."), this,

SLOT(slotFilePrintToPDF()));

Quoted 18 lines
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -18
-     fileMenu->addSeparator();
-
-@@ -702,23 +698,19 @@ void BrowserMainWindow::slotFileOpen()
-
- void BrowserMainWindow::slotFilePrintPreview()
- {
--#ifndef QT_NO_PRINTPREVIEWDIALOG
-     if (!currentTab())
-         return;
-     QPrintPreviewDialog *dialog = new QPrintPreviewDialog(this);
-     connect(dialog, SIGNAL(paintRequested(QPrinter*)),
-             currentTab(), SLOT(print(QPrinter*)));
-     dialog->exec();
--#endif
- }
-
- void BrowserMainWindow::slotFilePrint()
- {

recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch

Quoted 10 lines
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -10
--#ifndef QT_NO_PRINTER
-     if (!currentTab())
-         return;
-     printRequested(currentTab()->page());
--#endif
- }
-
- void BrowserMainWindow::slotHandlePdfPrinted(const QByteArray& result)
-@@ -751,7 +743,6 @@ void BrowserMainWindow::slotFilePrintToPDF()
-     currentTab()->page()->printToPdf(invoke(this, &BrowserMainWindow::slotHandlePdfPrinted),

dialog->pageLayout());

recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch

Quoted 7 lines
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -7
- }
-
--#ifndef QT_NO_PRINTER
- void BrowserMainWindow::slotHandlePagePrinted(bool result)
- {
-     Q_UNUSED(result);
-@@ -763,7 +754,6 @@ void BrowserMainWindow::slotHandlePagePrinted(bool

result)

recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch

Quoted 8 lines
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -8
-
- void BrowserMainWindow::printRequested(QWebEnginePage *page)
- {
--#ifndef QT_NO_PRINTDIALOG
-     if (m_currentPrinter)
-         return;
-     m_currentPrinter = new QPrinter();
-@@ -774,9 +764,7 @@ void BrowserMainWindow::printRequested(QWebEnginePage

*page)

recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch

Quoted 3 lines
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -3
-         return;
-     }
-     page->print(m_currentPrinter, invoke(this, &BrowserMainWindow::

slotHandlePagePrinted));

recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch

Quoted 7 lines
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -7
--#endif
- }
--#endif
-
- void BrowserMainWindow::slotPrivateBrowsing()
- {
-diff --git a/examples/webenginewidgets/demobrowser/browsermainwindow.h

b/examples/webenginewidgets/demobrowser/browsermainwindow.h

Quoted 25 lines
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -25
-index 91e1c1d2..5bbbb292 100644
---- a/examples/webenginewidgets/demobrowser/browsermainwindow.h
-+++ b/examples/webenginewidgets/demobrowser/browsermainwindow.h
-@@ -56,9 +56,7 @@
- #include <QtCore/QUrl>
-
- QT_BEGIN_NAMESPACE
--#ifndef QT_NO_PRINTER
- class QPrinter;
--#endif
- class QWebEnginePage;
- QT_END_NAMESPACE
-
-@@ -142,10 +140,8 @@ private slots:
-     void slotSwapFocus();
-     void slotHandlePdfPrinted(const QByteArray&);
-
--#ifndef QT_NO_PRINTER
-     void slotHandlePagePrinted(bool result);
-     void printRequested(QWebEnginePage *page);
--#endif
-     void geometryChangeRequested(const QRect &geometry);
-     void updateToolbarActionText(bool visible);
-     void updateBookmarksToolbarActionText(bool visible);
-@@ -180,9 +176,7 @@ private:

recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch

Quoted 10 lines
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -10
-     QAction *m_restoreLastSession;
-     QAction *m_addBookmark;
-
--#ifndef QT_NO_PRINTER
-     QPrinter *m_currentPrinter;
--#endif
-
-     QIcon m_reloadIcon;
-     QIcon m_stopIcon;
-diff --git a/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp

b/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp

Quoted 4 lines
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -4
-index 0f3b1765..50a8bb91 100644
---- a/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp
-+++ b/examples/webenginewidgets/demobrowser/printtopdfdialog.cpp
-@@ -52,10 +52,8 @@

recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch

Quoted 10 lines
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -10
- #include "ui_printtopdfdialog.h"
-
- #include <QtCore/QDir>
--#ifndef QT_NO_PRINTER
- #include <QtPrintSupport/QPageSetupDialog>
- #include <QtPrintSupport/QPrinter>
--#endif // QT_NO_PRINTER
- #include <QtWidgets/QFileDialog>
-
- PrintToPdfDialog::PrintToPdfDialog(const QString &filePath, QWidget

*parent) :

Review line 146

Quoted 1 line
(quoted diff) +0 -1
-@@ -66,11 +64,8 @@ PrintToPdfDialog::PrintToPdfDialog(const QString

&filePath, QWidget *parent) :

recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch

Quoted 3 lines
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -3
-     ui->setupUi(this);
-     setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-     connect(ui->chooseFilePathButton, &QToolButton::clicked, this,

&PrintToPdfDialog::onChooseFilePathButtonClicked);

Review line 151

Quoted 2 lines
(quoted diff) +0 -2
--#ifndef QT_NO_PRINTER
-     connect(ui->choosePageLayoutButton, &QToolButton::clicked, this,

&PrintToPdfDialog::onChoosePageLayoutButtonClicked);

Quoted 5 lines
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -5
--#else
-     ui->choosePageLayoutButton->hide();
--#endif // QT_NO_PRINTER
-     updatePageLayoutLabel();
-     setFilePath(filePath);

recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch

Quoted 10 lines
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -10
- }
-@@ -82,7 +77,6 @@ PrintToPdfDialog::~PrintToPdfDialog()
-
- void PrintToPdfDialog::onChoosePageLayoutButtonClicked()
- {
--#ifndef QT_NO_PRINTER
-     QPrinter printer;
-     printer.setPageLayout(currentPageLayout);
-
-@@ -92,7 +86,6 @@ void PrintToPdfDialog::onChoosePageLayoutButtonClicke

d()

Review line 168

Quoted 2 lines
(quoted diff) +0 -2
-     currentPageLayout.setPageSize(printer.pageLayout().pageSize());
-     currentPageLayout.setOrientation(printer.

pageLayout().orientation());

recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch

Quoted 6 lines
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -6
-     updatePageLayoutLabel();
--#endif // QT_NO_PRINTER
- }
-
- void PrintToPdfDialog::onChooseFilePathButtonClicked()
-diff --git a/src/webenginewidgets/api/qwebenginepage.cpp

b/src/webenginewidgets/api/qwebenginepage.cpp

Quoted 8 lines
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -8
-index 82720ae3..20d3268c 100644
---- a/src/webenginewidgets/api/qwebenginepage.cpp
-+++ b/src/webenginewidgets/api/qwebenginepage.cpp
-@@ -80,11 +80,9 @@
- #include <QMenu>
- #include <QMessageBox>
- #include <QMimeData>
--#if defined(QT_PRINTSUPPORT_LIB)

recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch

Quoted 10 lines
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -10
--#ifndef QT_NO_PRINTER
-+#ifdef ENABLE_PRINTING
- #include <QPrinter>
--#endif //QT_NO_PRINTER
--#endif //QT_PRINTSUPPORT_LIB
-+#endif
- #include <QStandardPaths>
- #include <QStyle>
- #include <QTimer>
-@@ -2052,8 +2050,6 @@ void QWebEnginePage::printToPdf(const

QWebEngineCallback<const QByteArray&> &res

recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch

Quoted 7 lines
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -7
- #endif // if defined(ENABLE_PDF)
- }
-
--#if defined(QT_PRINTSUPPORT_LIB)
--#ifndef QT_NO_PRINTER
- /*!
-     \fn void QWebEnginePage::print(QPrinter *printer, FunctorOrLambda

resultCallback)

Review line 200

Quoted 1 line
(quoted diff) +0 -1
-     Renders the current content of the page into a temporary PDF

document, then prints it using \a printer.

Review line 201

Quoted 1 line
(quoted diff) +0 -1
-@@ -2090,8 +2086,6 @@ void QWebEnginePage::print(QPrinter *printer,

const QWebEngineCallback<bool> &re

recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch

Quoted 9 lines
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -9
-     d->m_callbacks.invokeDirectly(resultCallback, false);
- #endif // if defined(ENABLE_PDF)
- }
--#endif // if defined(QT_NO_PRINTER)
--#endif // if defined(QT_PRINTSUPPORT_LIB)
-
- /*!
-     \since 5.7
-diff --git a/src/webenginewidgets/api/qwebenginepage.h

b/src/webenginewidgets/api/qwebenginepage.h

Quoted 7 lines
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -7
-index c7d5a19e..5619639c 100644
---- a/src/webenginewidgets/api/qwebenginepage.h
-+++ b/src/webenginewidgets/api/qwebenginepage.h
-@@ -55,11 +55,7 @@
-
- QT_BEGIN_NAMESPACE
- class QMenu;

recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch

Quoted 10 lines
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -10
--#if defined(QT_PRINTSUPPORT_LIB)
--#ifndef QT_NO_PRINTER
- class QPrinter;
--#endif // QT_NO_PRINTER
--#endif // QT_PRINTSUPPORT_LIB
-
- class QWebChannel;
- class QWebEngineContextMenuData;
-@@ -294,15 +290,11 @@ public:
-     void printToPdf(const QWebEngineCallback<const QByteArray&>

&resultCallback, const QPageLayout &layout = QPageLayout(QPageSize(QPageSize::A4), QPageLayout::Portrait, QMarginsF()));

recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch

Quoted 8 lines
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -8
- #endif
-
--#if defined(QT_PRINTSUPPORT_LIB)
--#ifndef QT_NO_PRINTER
- #ifdef Q_QDOC
-     void print(QPrinter *printer, FunctorOrLambda resultCallback);
- #else
-     void print(QPrinter *printer, const QWebEngineCallback<bool>

&resultCallback);

Review

Quoted 7 lines
recipes-qt/qt5/qtwebengine/0005-Always-compile-QWebEnginePage-print.patch deleted +0 -6
- #endif // QDOC
--#endif // QT_NO_PRINTER
--#endif // QT_PRINTSUPPORT_LIB
-
-     const QWebEngineContextMenuData &contextMenuData() const;
-
(quoted diff) +0 -0

b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include- fcntl.h-for-loff_t.patch

Quoted 2 lines

index 2d7bd02..00c875b 100644
--- a/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-

fcntl.h-for-loff_t.patch

Quoted 1 line

+++ b/recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-

fcntl.h-for-loff_t.patch

Review

Quoted 7 lines
recipes-qt/qt5/qtwebengine/0005-chromium-musl-include-fcntl.h-for-loff_t.patch +1 -1
@@ -1,4 +1,4 @@
-From 0a409a773f2b2936a2f1868d983e7bd1c92110bd Mon Sep 17 00:00:00 2001
+From 8780db69819ba37c8e2364ba361b03badf3c3ee4 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 14:37:49 -0700
 Subject: [PATCH] chromium: musl: include fcntl.h for loff_t
(quoted diff) +0 -0

t-instead-of-the-internal-__.patch b/recipes-qt/qt5/qtwebengine/ 0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch

Quoted 2 lines

index f58de8f..085cb01 100644
--- a/recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_

t-instead-of-the-internal-__.patch

Quoted 1 line

+++ b/recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_

t-instead-of-the-internal-__.patch

recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch line 4

Quoted 6 lines
recipes-qt/qt5/qtwebengine/0006-chromium-musl-use-off64_t-instead-of-the-internal-__.patch +1 -1
@@ -1,4 +1,4 @@
-From 375b70a99760c156b45e60def9bafd04902fb5a4 Mon Sep 17 00:00:00 2001
+From b360b036bb1ad31a74c056ce5d19e0271d75ff57 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 14:38:37 -0700
 Subject: [PATCH] chromium: musl: use off64_t instead of the internal

__off64_t

Review

Quoted 1 line
(quoted diff) +0 -0

glibc-make-the-distinction.patch b/recipes-qt/qt5/qtwebengine/ 0007-chromium-musl-linux-glibc-make-the-distinction.patch

Quoted 2 lines

index c3b1cbb..e23cabe 100644
--- a/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-

glibc-make-the-distinction.patch

Quoted 1 line

+++ b/recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-

glibc-make-the-distinction.patch

Review

Quoted 7 lines
recipes-qt/qt5/qtwebengine/0007-chromium-musl-linux-glibc-make-the-distinction.patch +1 -1
@@ -1,4 +1,4 @@
-From 314cfb7b41be8fc4f962956e0acd34f110114c6e Mon Sep 17 00:00:00 2001
+From 455a6603a33a87dfb7ab85a09587f534d9f5d984 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 14:54:38 -0700
 Subject: [PATCH] chromium: musl: linux != glibc, make the distinction
(quoted diff) +0 -0

Do-not-include-glibc_weak_sy.patch b/recipes-qt/qt5/qtwebengine/ 0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch

Quoted 2 lines

index 550fd79..53e8a81 100644
--- a/recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-

Do-not-include-glibc_weak_sy.patch

Quoted 1 line

+++ b/recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-

Do-not-include-glibc_weak_sy.patch

recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch line 4

Quoted 6 lines
recipes-qt/qt5/qtwebengine/0008-chromium-musl-allocator-Do-not-include-glibc_weak_sy.patch +1 -1
@@ -1,4 +1,4 @@
-From bc3745992889e3dc3b42c890b6a458038c6994e0 Mon Sep 17 00:00:00 2001
+From aa3bfc656b3c84aba04c8294ad17c630141f4b09 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 15:09:02 -0700
 Subject: [PATCH] chromium: musl: allocator: Do not include

glibc_weak_symbols

Review

Quoted 1 line
(quoted diff) +0 -0

correct-member-name-__si_fields-fr.patch b/recipes-qt/qt5/qtwebengine/ 0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch

Quoted 2 lines

index 82a2ccc..385e729 100644
--- a/recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-

correct-member-name-__si_fields-fr.patch

Quoted 1 line

+++ b/recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-

correct-member-name-__si_fields-fr.patch

recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch line 4

Quoted 6 lines
recipes-qt/qt5/qtwebengine/0009-chromium-musl-Use-correct-member-name-__si_fields-fr.patch +1 -1
@@ -1,4 +1,4 @@
-From de4e672044de11c5927aeb42a554f5eced0abf6c Mon Sep 17 00:00:00 2001
+From 85b21493f19bd2046f84836e03f0a9c32862bce8 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 7 Jul 2017 15:12:39 -0700
 Subject: [PATCH] chromium: musl: Use correct member name __si_fields

from

recipes-qt/qt5/

Quoted 1 line
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtwebengine_git.bb +0 -0

qtwebengine_git.bb

recipes-qt/qt5/qtwebengine_git.bb DEPENDS += " \ · line 19

Quoted 9 lines

index 9879749..2815cb9 100644

recipes-qt/qt5/qtwebengine_git.bb +1 -1
@@ -16,7 +16,7 @@ DEPENDS += " \
     ninja-native \
     yasm-native \
     qtwebchannel \
-    qtbase qtdeclarative qtxmlpatterns qtquickcontrols \
+    qtbase qtdeclarative qtxmlpatterns qtquickcontrols qtquickcontrols2

\

recipes-qt/qt5/qtwebengine_git.bb RDEPENDS_${PN}-examples += " \ · line 135

Quoted 11 lines
recipes-qt/qt5/qtwebengine_git.bb +1 -1
     qtlocation \
     libdrm fontconfig pixman openssl pango cairo icu pciutils \
     libcap \
@@ -130,18 +130,17 @@ RDEPENDS_${PN}-examples += " \
 QT_MODULE_BRANCH_CHROMIUM = "56-based"
 
 # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += " \
     ${QT_GIT}/qtwebengine-chromium.git;name=chromium;

branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_ PROTOCOL};destsuffix=git/src/3rdparty \

recipes-qt/qt5/qtwebengine_git.bb RDEPENDS_${PN}-examples += " \ · line 136

Quoted 1 line
recipes-qt/qt5/qtwebengine_git.bb +0 -0
     file://0001-functions.prf-allow-build-for-linux-oe-g-platform.patch

\

recipes-qt/qt5/qtwebengine_git.bb RDEPENDS_${PN}-examples += " \ · line 137

Quoted 1 line
recipes-qt/qt5/qtwebengine_git.bb +0 -0
     file://0002-WebEngine-qquickwebengineview_p_p.h-add-include-QCol.patch

\

recipes-qt/qt5/qtwebengine_git.bb RDEPENDS_${PN}-examples += " \ · line 138

Quoted 1 line
recipes-qt/qt5/qtwebengine_git.bb +0 -0
     file://0003-Include-dependency-to-QCoreApplication-translate.patch

\

recipes-qt/qt5/qtwebengine_git.bb RDEPENDS_${PN}-examples += " \

Quoted 5 lines
recipes-qt/qt5/qtwebengine_git.bb +0 -1
     file://0004-Force-host-toolchain-configuration.patch \
-    file://0005-Always-compile-QWebEnginePage-print.patch \
 "
 
 # Patches from https://github.com/meta-qt5/

qtwebengine-chromium/commits/56-based

recipes-qt/qt5/qtwebengine_git.bb RDEPENDS_${PN}-examples += " \

Quoted 4 lines
recipes-qt/qt5/qtwebengine_git.bb +1 -1
-# 56-based.meta-qt5.1
+# 56-based.meta-qt5.2
 SRC_URI += " \
     file://0001-chromium-Change-false-to-FALSE-and-1-to-TRUE-

FIX-qtw.patch;patchdir=src/3rdparty \

recipes-qt/qt5/qtwebengine_git.bb RDEPENDS_${PN}-examples += " \ · line 146

Quoted 1 line
recipes-qt/qt5/qtwebengine_git.bb +0 -0
     file://0002-chromium-Force-host-toolchain-configuration.patch;patchdir=src/3rdparty

\

recipes-qt/qt5/qtwebengine_git.bb SRC_URI_append_libc-musl = "\ · line 162

Quoted 2 lines
recipes-qt/qt5/qtwebengine_git.bb +0 -0
@@ -163,8 +162,8 @@ SRC_URI_append_libc-musl = "\
     file://0015-chromium-musl-tcmalloc-Use-off64_t-insread-

of-__off6.patch;patchdir=src/3rdparty \

recipes-qt/qt5/

Quoted 10 lines
recipes-qt/qt5/qtwebengine_git.bb +2 -2
 "
 
-SRCREV_qtwebengine = "73f7be5b2a95eab3dce11caede538eeb7beb71f2"
-SRCREV_chromium = "aa2fdd6be3d465280d2a0c3aacdc738bb4ffec05"
+SRCREV_qtwebengine = "99f84ffd2c0c78014a24534a863aa1c755abd51c"
+SRCREV_chromium = "21508b5b5421f10ba8627c3c66c5281efb39b2f9"
 SRCREV = "${SRCREV_qtwebengine}"
 
 SRCREV_FORMAT = "qtwebengine_chromium"
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtwebkit-examples_git.bb +0 -0

qtwebkit-examples_git.bb

recipes-qt/qt5/qtwebkit-examples_git.bb DEPENDS += "qtwebkit qtxmlpatterns" · line 18

Quoted 6 lines

index 286aeca..3e3e4a0 100644

recipes-qt/qt5/qtwebkit-examples_git.bb +0 -0
@@ -17,4 +17,4 @@ DEPENDS += "qtwebkit qtxmlpatterns"
 RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
 RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL',

'openssl', 'ca-certificates', '', d)}"

Review

Quoted 4 lines
recipes-qt/qt5/qtwebkit-examples_git.bb +1 -1
-SRCREV = "822426abc77a74752b0ee0da4d0a1c106c4dac22"
+SRCREV = "a24c780b60d7d8bc00c4a48042cf7f32db777d55"
(quoted diff) +0 -0

b/recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch

Review

Quoted 10 lines

index d393dc4..764b030 100644

recipes-qt/qt5/qtwebkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch +1 -1
@@ -1,4 +1,4 @@
-From f8bcac01fd5d95d0df8342809c53917aff1bf798 Mon Sep 17 00:00:00 2001
+From c4e691a8dd2037d9b359e0de9d4790da9078f74e Mon Sep 17 00:00:00 2001
 From: Trevor Woerner <[email protected]>
 Date: Fri, 7 Feb 2014 04:07:17 +0100
 Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH)
(quoted diff) +0 -0

b/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API- for-non-glibc-libraries.patch

Quoted 2 lines

index 147a7ba..cec6376 100644
--- a/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-

for-non-glibc-libraries.patch

Quoted 1 line

+++ b/recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-

for-non-glibc-libraries.patch

Review

Quoted 7 lines
recipes-qt/qt5/qtwebkit/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch +1 -1
@@ -1,4 +1,4 @@
-From 5d4f3219be0b66d63765e077644a51e18b1f4502 Mon Sep 17 00:00:00 2001
+From fc2773961eaa536e6a617ded7c1a972d979fa2e4 Mon Sep 17 00:00:00 2001
 From: Khem Raj <[email protected]>
 Date: Fri, 5 Jun 2015 19:55:05 -0700
 Subject: [PATCH] Exclude backtrace() API for non-glibc libraries
(quoted diff) +0 -0

b/recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch

Quoted 13 lines

deleted file mode 100644
index debbda1..0000000

recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch deleted +0 -8
@@ -1,89 +0,0 @@
-From 240bd33ba3e78fcc0e5e3299d9e0e53299ea07f8 Mon Sep 17 00:00:00 2001
-From: Konstantin Tokarev <[email protected]>
-Date: Thu, 4 May 2017 15:12:37 +0300
-Subject: [PATCH] Fix compilation with ICU 59
-
-Upstream fix: https://bugs.webkit.org/show_bug.cgi?id=171612
-
-Task-number: QTBUG-60532

recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch line 18

Quoted 10 lines
recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch deleted +0 -10
-Change-Id: I6014feea213aa70ebe40b09d9d1a03fd1ed3c843
-Reviewed-by: Allan Sandfeld Jensen <[email protected]>
----
- Source/JavaScriptCore/API/JSStringRef.cpp        | 6 +++---
- Source/JavaScriptCore/runtime/DateConversion.cpp | 3 ++-
- Source/WTF/wtf/TypeTraits.h                      | 3 +++
- Source/WebKit2/Shared/API/c/WKString.cpp         | 2 +-
- 4 files changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp

b/Source/JavaScriptCore/API/JSStringRef.cpp

recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch

Quoted 5 lines
recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch deleted +0 -5
-index 812f3d413..77a3fd0f4 100644
---- a/Source/JavaScriptCore/API/JSStringRef.cpp
-+++ b/Source/JavaScriptCore/API/JSStringRef.cpp
-@@ -37,7 +37,7 @@ using namespace WTF::Unicode;
- JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t

numChars)

recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch

Quoted 4 lines
recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch deleted +0 -4
- {
-     initializeThreading();
--    return OpaqueJSString::create(chars, numChars).leakRef();
-+    return OpaqueJSString::create(reinterpret_cast<const

UChar*>(chars), numChars).leakRef();

recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch

Quoted 4 lines
recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch deleted +0 -4
- }
-
- JSStringRef JSStringCreateWithUTF8CString(const char* string)
-@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const

char* string)

recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch line 32

Quoted 1 line
recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch deleted +0 -1
- JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars,

size_t numChars)

recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch

Quoted 3 lines
recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch deleted +0 -3
- {
-     initializeThreading();
--    return OpaqueJSString::create(StringImpl::createWithoutCopying(chars,

numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef();

recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch line 36

Quoted 1 line
recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch deleted +0 -1
-+    return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast<const

UChar*>(chars), numChars, WTF::DoesNotHaveTerminatingNullChar acter)).leakRef();

recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch

Quoted 13 lines
recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch deleted +0 -13
- }
-
- JSStringRef JSStringRetain(JSStringRef string)
-@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string)
-
- const JSChar* JSStringGetCharactersPtr(JSStringRef string)
- {
--    return string->characters();
-+    return reinterpret_cast<const JSChar*>(string->characters());
- }
-
- size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)
-diff --git a/Source/JavaScriptCore/runtime/DateConversion.cpp

b/Source/JavaScriptCore/runtime/DateConversion.cpp

recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch

Quoted 4 lines
recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch deleted +0 -4
-index 0b57f012d..05e27338b 100644
---- a/Source/JavaScriptCore/runtime/DateConversion.cpp
-+++ b/Source/JavaScriptCore/runtime/DateConversion.cpp
-@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t,

DateTimeFormat format, bool as

recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch

Quoted 4 lines
recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch deleted +0 -4
- #if OS(WINDOWS)
-             TIME_ZONE_INFORMATION timeZoneInformation;
-             GetTimeZoneInformation(&timeZoneInformation);
--            const WCHAR* timeZoneName = t.isDST() ?

timeZoneInformation.DaylightName : timeZoneInformation.StandardName;

recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch line 58

Quoted 1 line
recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch deleted +0 -1
-+            const WCHAR* winTimeZoneName = t.isDST() ?

timeZoneInformation.DaylightName : timeZoneInformation.StandardName;

recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch line 59

Quoted 1 line
recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch deleted +0 -1
-+            String timeZoneName(reinterpret_cast<const

UChar*>(winTimeZoneName));

recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch

Quoted 9 lines
recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch deleted +0 -9
- #else
-             struct tm gtm = t;
-             char timeZoneName[70];
-diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h
-index 9df2c95cf..f5d6121fd 100644
---- a/Source/WTF/wtf/TypeTraits.h
-+++ b/Source/WTF/wtf/TypeTraits.h
-@@ -72,6 +72,9 @@ namespace WTF {
-     template<> struct IsInteger<unsigned long>      { static const

bool value = true; };

recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch line 69

Quoted 1 line
recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch deleted +0 -1
-     template<> struct IsInteger<long long>          { static const

bool value = true; };

recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch line 70

Quoted 1 line
recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch deleted +0 -1
-     template<> struct IsInteger<unsigned long long> { static const

bool value = true; };

recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch line 71

Quoted 1 line
recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch deleted +0 -1
-+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) ||

(defined(_HAS_CHAR16_T_LANGUAGE_SUPPORT) && _HAS_CHAR16_T_LANGUAGE_ SUPPORT)

recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch line 72

Quoted 1 line
recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch deleted +0 -1
-+    template<> struct IsInteger<char16_t>           { static const

bool value = true; };

recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch

Quoted 3 lines
recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch deleted +0 -3
-+#endif
- #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
-     template<> struct IsInteger<wchar_t>            { static const

bool value = true; };

recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch line 77

Quoted 2 lines
recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch deleted +0 -2
- #endif
-diff --git a/Source/WebKit2/Shared/API/c/WKString.cpp

b/Source/WebKit2/Shared/API/c/WKString.cpp

recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch

Quoted 5 lines
recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch deleted +0 -5
-index cbac67dd8..23400a64e 100644
---- a/Source/WebKit2/Shared/API/c/WKString.cpp
-+++ b/Source/WebKit2/Shared/API/c/WKString.cpp
-@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef)
- size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer,

size_t bufferLength)

recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch line 84

Quoted 2 lines
recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch deleted +0 -2
- {
-     COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar),

WKStringGetCharacters_sizeof_WKChar_matches_UChar);

recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch line 85

Quoted 1 line
recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch deleted +0 -1
--    return (toImpl(stringRef)->getCharacters(static_cast<UChar*>(buffer),

bufferLength));

recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch line 86

Quoted 1 line
recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch deleted +0 -1
-+    return (toImpl(stringRef)->getCharacters(reinterpret_cast<UChar*>(buffer),

bufferLength));

recipes-qt/qt5/

Quoted 4 lines
recipes-qt/qt5/qtwebkit/0003-Fix-compilation-with-ICU-59.patch deleted +0 -3
- }
-
- size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef)
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtwebkit_git.bb +0 -0

qtwebkit_git.bb

Quoted 6 lines

index 0792c4a..8b3c3f5 100644

recipes-qt/qt5/qtwebkit_git.bb +0 -0
@@ -19,11 +19,10 @@ ARM_INSTRUCTION_SET_armv4 = "arm"
 ARM_INSTRUCTION_SET_armv5 = "arm"
 

recipes-qt/qt5/qtwebkit_git.bb ARM_INSTRUCTION_SET_armv4 = "arm" · line 28

Quoted 10 lines
recipes-qt/qt5/qtwebkit_git.bb +1 -2
 # Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.9
-# 5.9.meta-qt5.1
+# 5.9.meta-qt5.2
 SRC_URI += "\
     file://0001-qtwebkit-fix-QA-issue-bad-RPATH.patch \
     file://0002-Exclude-backtrace-API-for-non-glibc-libraries.patch \
-    file://0003-Fix-compilation-with-ICU-59.patch \
 "
 
 PACKAGECONFIG ??= "gstreamer qtlocation qtmultimedia qtsensors

qtwebchannel \

recipes-qt/qt5/qtwebkit_git.bb PACKAGES_remove = "${PN}-examples-dev

Quoted 1 line
recipes-qt/qt5/qtwebkit_git.bb +0 -0
@@ -88,4 +87,4 @@ PACKAGES_remove = "${PN}-examples-dev

${PN}-examples-staticdev ${PN}-examples-db

recipes-qt/qt5/qtwebkit_git.bb PACKAGES_remove = "${PN}-examples-dev · line 87

Quoted 1 line
recipes-qt/qt5/qtwebkit_git.bb +0 -0
 RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586',

'i386').replace('i686', 'i386') }"

recipes-qt/qt5/qtwebkit_git.bb PACKAGES_remove = "${PN}-examples-dev · line 88

Quoted 1 line
recipes-qt/qt5/qtwebkit_git.bb +0 -0
 export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_

LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}"

recipes-qt/qt5/

Quoted 4 lines
recipes-qt/qt5/qtwebkit_git.bb +1 -1
-SRCREV = "f27089657a207ef8c5c9d27d661d3d12c3af8df2"
+SRCREV = "97c4a80a1282c8c3eaa343011286b76fd4838c5f"
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtwebsockets_git.bb +0 -0

qtwebsockets_git.bb

recipes-qt/qt5/qtwebsockets_git.bb line 4

Quoted 8 lines

index 41ec27f..448ce5c 100644

recipes-qt/qt5/qtwebsockets_git.bb +0 -1
@@ -1,14 +1,14 @@
 require qt5.inc
 require qt5-git.inc
 
-LICENSE = "GFDL-1.3 & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1

| LGPL-3.0)"

Review

Quoted 17 lines
recipes-qt/qt5/qtwebsockets_git.bb +6 -5
+LICENSE = "GFDL-1.3 & (GPL-3 | LGPL-3.0)"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
-    file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \
+    file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
+    file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
 "
 
 DEPENDS += "qtbase qtdeclarative"
 
-SRCREV = "1421c3e4ae4213ca18f2f51d5ddb38e223450222"
+SRCREV = "fb71c823a7ae823345518ca33ccfe273fcf76494"
(quoted diff) +0 -0

b/recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch

Quoted 3 lines

deleted file mode 100644
index 82087b9..0000000
--- a/recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-

qWarning.patch

recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch line 11

Quoted 13 lines

+++ /dev/null

recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch deleted +0 -11
@@ -1,22 +0,0 @@
-From b946b6ea4a2a30bd12ecd036e40c9ef671681ba8 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <[email protected]>
-Date: Fri, 2 Jun 2017 13:12:18 +0300
-Subject: [PATCH] Add missing include for qWarning
-
-Change-Id: I7c7699e7a2b7ce59e4f659d460ec835f59bba439
----
- src/webview/qquickwebview.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/webview/qquickwebview.cpp b/src/webview/qquickwebview.

cpp

recipes-qt/qt5/qtwebview_

Quoted 12 lines
recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch deleted +0 -11
-index d760564..fbbbfd6 100644
---- a/src/webview/qquickwebview.cpp
-+++ b/src/webview/qquickwebview.cpp
-@@ -39,6 +39,7 @@
- #include <QtWebView/private/qwebviewloadrequest_p.h>
- #include <QtQml/qqmlengine.h>
- #include <QtCore/qmutex.h>
-+#include <QtCore/QDebug>
-
- namespace {
-
recipes-qt/qt5/qtwebview_ renamed from recipes-qt/qt5/qtwebview_git.bb +0 -0

git.bb

recipes-qt/qt5/

Quoted 21 lines

index 8b79aa1..0bbb09e 100644

recipes-qt/qt5/qtwebview_git.bb +1 -5
@@ -9,10 +9,6 @@ LIC_FILES_CHKSUM = " \
 require qt5.inc
 require qt5-git.inc
 
-# Patches from https://github.com/meta-qt5/qtwebview/commits/b5.9
-# 5.9.meta-qt5.1
-SRC_URI += "file://0001-Add-missing-include-for-qWarning.patch"
-
 DEPENDS += "qtbase qtwebengine"
 
 COMPATIBLE_MACHINE = "(-)"
@@ -23,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
 COMPATIBLE_MACHINE_armv7ve = "(.*)"
 COMPATIBLE_MACHINE_aarch64 = "(.*)"
 
-SRCREV = "6e55abf3b6a5f373cd4b649c2318a45c49b40589"
+SRCREV = "e4016a67bbffefed71a407494e249e978d212b3d"
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtx11extras_git.bb +0 -0

qtx11extras_git.bb

recipes-qt/qt5/

Quoted 10 lines

index bf03e9b..ed1440c 100644

recipes-qt/qt5/qtx11extras_git.bb +1 -1
@@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
-SRCREV = "9e83ff8713c1a3f69ce514bf3e31335194668da7"
+SRCREV = "f65d50eb063ad3c9a1d6f008f66e881d2e15f1d8"
recipes-qt/qt5/ renamed from recipes-qt/qt5/qtxmlpatterns_git.bb +0 -0

qtxmlpatterns_git.bb

Quoted 20 lines

index 30e5262..7c18079 100644

recipes-qt/qt5/qtxmlpatterns_git.bb +1 -2
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
-SRCREV = "c1c3af0ae456247c9bcd30161d51a94c9b38dc52"
+SRCREV = "fcfa824402bb4edaf644fad786dac3560c743ebe"
 
 BBCLASSEXTEND =+ "native nativesdk"
 
--

2.14.1

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#7 lore raw

Re: [meta-qt5][PATCHv2 5/7] qt: upgrade to latest revision in 5.9 branch

Quoted 3 lines · Martin Jansa

It looks like you're building 5.9.0 not 5.9.2 from the patch where you're replying, can you try if you can reproduce it with 5.9.2 as well? Maybe it was already fixed upstream.

is 5.9.2 in master-next ? if yes then I am on master-next as of today

#8 lore raw

Re: [meta-qt5][PATCHv2 5/7] qt: upgrade to latest revision in 5.9 branch

It's here on ML or in jansa/master-5.9-rebase branch

Quoted 9 lines · Khem Raj
Quoted 2 lines · Martin Jansa

It looks like you're building 5.9.0 not 5.9.2 from the patch where you're replying, can you try if you can reproduce it with 5.9.2 as well? Maybe

it

Quoted 1 line

was already fixed upstream.

is 5.9.2 in master-next ? if yes then I am on master-next as of today

#9 lore raw

Re: [meta-qt5][PATCHv2 5/7] qt: upgrade to latest revision in 5.9 branch

Quoted 14 lines · Martin Jansa

It's here on ML or in jansa/master-5.9-rebase branch

Quoted 10 lines · Khem Raj
Quoted 5 lines · Martin Jansa

It looks like you're building 5.9.0 not 5.9.2 from the patch where you're
replying, can you try if you can reproduce it with 5.9.2 as well? Maybe it
was already fixed upstream.

is 5.9.2 in master-next ? if yes then I am on master-next as of today

OK. Thanks I will switch to this branch

Quoted 1 line