From 960aaf3658a4dc7c455cdb2d42e626118ee76378 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Sat, 13 May 2017 15:24:48 -0400 Subject: qwt: Add recipe. * Build tested for raspberrypi3. Signed-off-by: Philip Balister Signed-off-by: Martin Jansa --- recipes-qt/qwt/qwt-qt5.inc | 47 +++++++++++++++++++++++++++++++++++++++++ recipes-qt/qwt/qwt-qt5_6.1.3.bb | 8 +++++++ 2 files changed, 55 insertions(+) create mode 100644 recipes-qt/qwt/qwt-qt5.inc create mode 100644 recipes-qt/qwt/qwt-qt5_6.1.3.bb diff --git a/recipes-qt/qwt/qwt-qt5.inc b/recipes-qt/qwt/qwt-qt5.inc new file mode 100644 index 00000000..ee4fbd77 --- /dev/null +++ b/recipes-qt/qwt/qwt-qt5.inc @@ -0,0 +1,47 @@ +DESCRIPTION = "Qt Widget Extension for Technical Applications" +SECTION = "libs" + +# LGPLv2.1 + some exceptions +LICENSE = "QWTv1.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=dac2743472b0462ff3cfb4af42051c88" + +DEPENDS = "qtbase qtsvg qttools" + +SRC_URI = "${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tar.bz2;name=qwt \ + " +# file://qwt6.patch +# file://qwt6-fix-linking-with-ld-gold.patch" + +S = "${WORKDIR}/qwt-${PV}" + +do_configure_prepend() { + cd ${S} + sed -i -e 's:RELEASE_SUFFIX = :RELEASE_SUFFIX = ${QT_LIBINFIX}:' *.pri + sed -i -e 's:qtAddLibrary(qwt:qtAddLibrary(qwt)${QT_LIBINFIX}:g' *.prf + sed -e 's/# QWT_CONFIG += QwtExamples/QWT_CONFIG += QwtExamples/g' -i qwtconfig.pri + sed -i -e 's:/usr/local/qwt-$$QWT_VERSION:${D}${prefix}:g' ${S}/*.pri +} + +do_install() { + cd ${S} + oe_runmake -e install +# install -d ${D}${datadir}/doc/${PN} +# mv ${D}${prefix}/doc/* ${D}${datadir}/doc/${PN}/ +# rmdir ${D}${prefix}/doc +# cd ${S}/examples +# install -d ${D}/${bindir} +# cd bin${QT_LIBINFIX}/ +# for i in * ; do +# cp -pPR ${i} ${D}/${bindir}/${i}${QT_LIBINFIX} +# done +# install -d ${D}${libdir}/${QT_DIR_NAME} +# mv ${D}${prefix}/plugins ${D}${libdir}/${QT_DIR_NAME} +} + +PACKAGES_prepend = "${PN}-examples ${PN}-features ${PN}-plugins " +FILES_${PN}-examples = "${bindir}/*" +FILES_${PN}-features = "${prefix}/features" +FILES_${PN}-plugins = "${prefix}/plugins/designer/*.so" +FILES_${PN}-dbg += "${prefix}/plugins/designer/.debug" +FILES_${PN}-doc += "${prefix}/doc" + diff --git a/recipes-qt/qwt/qwt-qt5_6.1.3.bb b/recipes-qt/qwt/qwt-qt5_6.1.3.bb new file mode 100644 index 00000000..626bd0ab --- /dev/null +++ b/recipes-qt/qwt/qwt-qt5_6.1.3.bb @@ -0,0 +1,8 @@ +inherit qmake5 + +require qwt-qt5.inc + +SRC_URI[qwt.md5sum] = "19d1f5fa5e22054d22ee3accc37c54ba" +SRC_URI[qwt.sha256sum] = "f3ecd34e72a9a2b08422fb6c8e909ca76f4ce5fa77acad7a2883b701f4309733" + +RPROVIDES_${PN}-dev = "libqwt-qt5-dev" -- cgit v1.2.3-54-g00ecf From 6605c48f3a900da26425ef31d83eb1c95d551531 Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Mon, 15 May 2017 09:33:14 -0400 Subject: python-pyqt5: Add recipe. * Build tested on raspberrypi3 * I promise to chase the patch upstream. * v2 auto detects QT_VERSION Signed-off-by: Philip Balister Signed-off-by: Martin Jansa --- recipes-python/pyqt5/files/fix-sm.patch | 17 ++++++++ recipes-python/pyqt5/python-pyqt5_5.8.2.bb | 69 ++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 recipes-python/pyqt5/files/fix-sm.patch create mode 100644 recipes-python/pyqt5/python-pyqt5_5.8.2.bb diff --git a/recipes-python/pyqt5/files/fix-sm.patch b/recipes-python/pyqt5/files/fix-sm.patch new file mode 100644 index 00000000..f2936a23 --- /dev/null +++ b/recipes-python/pyqt5/files/fix-sm.patch @@ -0,0 +1,17 @@ +--- PyQt5_gpl-5.8.2/sip/QtGui/qguiapplication.sip.orig 2017-05-13 13:28:42.523392315 -0400 ++++ PyQt5_gpl-5.8.2/sip/QtGui/qguiapplication.sip 2017-05-13 13:30:08.081207211 -0400 +@@ -270,12 +270,14 @@ + %End + + public: ++%If (PyQt_SessionManager) + %If (Qt_5_6_0 -) + static bool isFallbackSessionManagementEnabled(); + %End + %If (Qt_5_6_0 -) + static void setFallbackSessionManagementEnabled(bool); + %End ++%End + + signals: + %If (Qt_5_6_0 -) diff --git a/recipes-python/pyqt5/python-pyqt5_5.8.2.bb b/recipes-python/pyqt5/python-pyqt5_5.8.2.bb new file mode 100644 index 00000000..3fa3d644 --- /dev/null +++ b/recipes-python/pyqt5/python-pyqt5_5.8.2.bb @@ -0,0 +1,69 @@ +SUMMARY = "Python Qt5 Bindings" +AUTHOR = "Phil Thomson @ riverbank.co.uk" +HOMEPAGE = "http://riverbankcomputing.co.uk" +SECTION = "devel/python" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "\ + file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \ +" +DEPENDS = "sip sip-native qtbase python" + +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/pyqt/PyQt5_gpl-${PV}.tar.gz \ + file://fix-sm.patch \ +" +SRC_URI[md5sum] = "c3048e9d242f3e72fd393630da1d971a" +SRC_URI[sha256sum] = "ebd70515b30bbd6098fee29e6271a6696b1183c5530ee30e6ba9aaab195536e8" + +S = "${WORKDIR}/PyQt5_gpl-${PV}" + + +inherit qmake5 pythonnative python-dir distro_features_check +# depends on qt4-x11-free +REQUIRED_DISTRO_FEATURES = "x11" + +export BUILD_SYS +export HOST_SYS +export STAGING_INCDIR +export STAGING_LIBDIR + +DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager" + +DISABLED_FEATURES_append_arm = " PyQt_qreal_double" + +PYQT_MODULES = "QtCore QtGui QtNetwork" +PYQT_MODULES_aarch64 = "QtCore QtGui QtNetwork" + +do_configure_prepend() { + cd ${S} + echo "py_platform = linux" > pyqt.cfg + echo "py_inc_dir = %(sysroot)/$includedir/python%(py_major).%(py_minor)" >> pyqt.cfg + echo "py_pylib_dir = %(sysroot)/${libdir}/python%(py_major).%(py_minor)" >> pyqt.cfg + echo "py_pylib_lib = python%(py_major).%(py_minor)mu" >> pyqt.cfg + echo "pyqt_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> pyqt.cfg + echo "pyqt_bin_dir = ${D}/${bindir}" >> pyqt.cfg + echo "pyqt_sip_dir = ${D}/${datadir}/sip/PyQt5" >> pyqt.cfg + echo "pyuic_interpreter = ${D}/${bindir}/python%(py_major).%(py_minor)" >> pyqt.cfg + echo "pyqt_disabled_features = ${DISABLED_FEATURES}" >> pyqt.cfg + echo "qt_shared = True" >> pyqt.cfg + QT_VERSION=`${OE_QMAKE_QMAKE} -query QT_VERSION` + echo "[Qt $QT_VERSION]" >> pyqt.cfg + echo "pyqt_modules = ${PYQT_MODULES}" >> pyqt.cfg + echo yes | python configure.py --verbose --qmake ${STAGING_BINDIR_NATIVE}/qt5/qmake --configuration pyqt.cfg --sysroot ${STAGING_DIR_HOST} +} + +do_compile() { + cd ${S} + oe_runmake +} + +do_install() { + cd ${S} + oe_runmake install +} + +RDEPENDS_${PN} = "python-core python-sip" + +FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt5/" +FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/*/.debug/" + -- cgit v1.2.3-54-g00ecf From e91e6a01a6623225290059073e806217f23e1f07 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 29 May 2017 09:21:27 +0300 Subject: qtbase: update to 5.9.0 RC2 Change-Id: Ic8d87f53f296387a4f8757fb5045ac5f0539d289 Reviewed-by: Kari Oikarinen Reviewed-by: Samuli Piippo --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 5040a1a4..fac5791f 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -191,4 +191,4 @@ fakeroot do_generate_qt_environment_file() { addtask generate_qt_environment_file after do_install before do_package -SRCREV = "31374105940bb15a68683a0ae691e7fe1f9b049a" +SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index a786f33a..66b43e05 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -109,4 +109,4 @@ do_install() { install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} } -SRCREV = "31374105940bb15a68683a0ae691e7fe1f9b049a" +SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 96cdc36d..09d6cec6 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -182,4 +182,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "31374105940bb15a68683a0ae691e7fe1f9b049a" +SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b" -- cgit v1.2.3-54-g00ecf From 0aa7c99d444a8ff492dd1dba8bc72e7ffdf00fa0 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 31 May 2017 13:27:32 +0300 Subject: qtwebview: add recipe for Qt WebView Task-number: QTBUG-61124 Change-Id: I20be287aba9d0dc3bf2c62eed103ab3dd19fbf7c Reviewed-by: Mikko Gronoff Reviewed-by: Samuli Piippo --- .../0001-Add-missing-include-for-qWarning.patch | 22 ++++++++++++++++++++++ recipes-qt/qt5/qtwebview_git.bb | 16 ++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch create mode 100644 recipes-qt/qt5/qtwebview_git.bb diff --git a/recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch b/recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch new file mode 100644 index 00000000..82087b9a --- /dev/null +++ b/recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch @@ -0,0 +1,22 @@ +From b946b6ea4a2a30bd12ecd036e40c9ef671681ba8 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +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 + #include + #include ++#include + + namespace { + diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb new file mode 100644 index 00000000..2229cb10 --- /dev/null +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -0,0 +1,16 @@ +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" + +SRCREV = "6e55abf3b6a5f373cd4b649c2318a45c49b40589" -- cgit v1.2.3-54-g00ecf From 15a2e1643239b40ee1bc2ee32dd3b91ec6960dbf Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 7 Jun 2017 16:15:53 +0300 Subject: qtlocation: make mapbox-gl plugin a PACKAGECONFIG option mapbox-gl-native won't compile on ARMv5 or older, so make it optional Change-Id: I464b0653edd11297856510c6a848a71d9de4ce85 Reviewed-by: Teemu Holappa --- .../0001-Make-mapbox-gl-build-configurable.patch | 27 ++++++++++++++++++++++ recipes-qt/qt5/qtlocation_git.bb | 4 ++++ 2 files changed, 31 insertions(+) create mode 100644 recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch diff --git a/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch b/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch new file mode 100644 index 00000000..49fcff6b --- /dev/null +++ b/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch @@ -0,0 +1,27 @@ +From f7c76b91e726a0e63e5226eb6e89b13e0c3509b7 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +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 { diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index af295769..ea24fe44 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -13,11 +13,15 @@ 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}" SRC_URI += " \ -- cgit v1.2.3-54-g00ecf From 8116cc0e8acf90f8651fcb39eafcf006419e6e06 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 7 Jun 2017 16:16:59 +0300 Subject: qtremoteobjects: build repc tool for native and nativesdk Tools is required for actually using QtRemoteObjects Change-Id: I455f5e693261da2290f742cd1f0131240cc4afe5 Reviewed-by: Teemu Holappa --- .../0001-Allow-a-tools-only-build.patch | 37 ++++++++++++++++++++++ recipes-qt/qt5/qtremoteobjects_git.bb | 15 ++++++++- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch diff --git a/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch b/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch new file mode 100644 index 00000000..dfebc184 --- /dev/null +++ b/recipes-qt/qt5/qtremoteobjects/0001-Allow-a-tools-only-build.patch @@ -0,0 +1,37 @@ +From dd9d1e5ecdcd8267215523ad08ea893656a7f42d Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +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 ++} diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index 550e0305..f563818d 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -9,6 +9,19 @@ LIC_FILES_CHKSUM = " \ require qt5.inc require qt5-git.inc -DEPENDS += "qtbase qtdeclarative" +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" -- cgit v1.2.3-54-g00ecf From 90174b9167016ecf3be653f132ca836bfb349e39 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 7 Jun 2017 16:18:05 +0300 Subject: qtwebengine: fix build with latest oe-core oe-core has now a whitelist for all the allowed host tools (HOSTTOOL). Change the used host compiler to gcc/g++ which are already whitelisted. Change-Id: I5513ef5755e4e827e9f73abbca4738d77f5b26ba Reviewed-by: Teemu Holappa --- .../qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch index 130f3a38..e10d3b82 100644 --- a/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch +++ b/recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch @@ -52,8 +52,8 @@ index 75b9690..601f688 100755 else: - cc = os.environ.get('CC', 'cc') - cxx = os.environ.get('CXX', 'c++') -+ cc = os.environ.get('CC_host', 'cc') -+ cxx = os.environ.get('CXX_host', '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') -- cgit v1.2.3-54-g00ecf From f54f8401b268cb50d2f270e2da88d07c1c5e4148 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 9 Jun 2017 10:01:06 +0300 Subject: qt5: update submodules Latest Qt 5.9.1 Change-Id: I109b3bdd6d5a54b9bb3b1b4d86553260b7028434 Reviewed-by: Mikko Gronoff Reviewed-by: Samuli Piippo --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qt5-git.inc | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- ...l.pro-do-not-build-with-bootstrapped-depe.patch | 49 ++++++++++------------ recipes-qt/qt5/qtbase_git.bb | 2 +- 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/qtgamepad_git.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 9 +--- recipes-qt/qt5/qtimageformats_git.bb | 2 +- .../0001-Make-mapbox-gl-build-configurable.patch | 8 ++-- recipes-qt/qt5/qtlocation_git.bb | 4 +- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtnetworkauth_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 4 +- recipes-qt/qt5/qtremoteobjects_git.bb | 2 +- recipes-qt/qt5/qtscript_git.bb | 2 +- recipes-qt/qt5/qtscxml_git.bb | 2 +- recipes-qt/qt5/qtsensors_git.bb | 11 +++-- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 2 +- recipes-qt/qt5/qtsvg_git.bb | 2 +- recipes-qt/qt5/qttools_git.bb | 2 +- recipes-qt/qt5/qttranslations_git.bb | 9 ++-- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 +- recipes-qt/qt5/qtwayland_git.bb | 2 +- recipes-qt/qt5/qtwebchannel_git.bb | 7 +--- recipes-qt/qt5/qtwebengine_git.bb | 2 +- recipes-qt/qt5/qtwebkit-examples_git.bb | 2 +- recipes-qt/qt5/qtwebkit_git.bb | 2 +- recipes-qt/qt5/qtwebsockets_git.bb | 12 +++--- recipes-qt/qt5/qtwebview_git.bb | 2 +- recipes-qt/qt5/qtx11extras_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- 39 files changed, 74 insertions(+), 99 deletions(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index fac5791f..a96d3f60 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -191,4 +191,4 @@ fakeroot do_generate_qt_environment_file() { addtask generate_qt_environment_file after do_install before do_package -SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b" +SRCREV = "5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index f0f960af..f5164f22 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -34,6 +34,6 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "f39d0a0c32cc489849a0cd5c2880f6e824223485" +SRCREV = "ab0a43e9efba3da95da2ebc7662a1437d5e3a899" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index b7fee9c9..2ffe72a6 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -12,4 +12,4 @@ SRC_URI = " \ S = "${WORKDIR}/git" -PV = "5.9.0+git${SRCPV}" +PV = "5.9.1+git${SRCPV}" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 66b43e05..309672f6 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -109,4 +109,4 @@ do_install() { install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} } -SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b" +SRCREV = "5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5" diff --git a/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch b/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch index e72601ca..9c5f8fef 100644 --- a/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch +++ b/recipes-qt/qt5/qtbase/0012-qdbuscpp2xml.pro-do-not-build-with-bootstrapped-depe.patch @@ -1,4 +1,4 @@ -From 86ae0ce931edbe0ac30cfe5f94f681f1d055fdb0 Mon Sep 17 00:00:00 2001 +From 9bd7ad277698be81db2af1a86d5b4efad5818203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 6 Mar 2017 11:50:38 +0100 Subject: [PATCH] qdbuscpp2xml.pro: do not build with bootstrapped @@ -9,15 +9,16 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Pending +Change-Id: I14e9b9a2bb4aca08d408c8aa76a2c58b54e74e7d Signed-off-by: Andreas Müller --- src/src.pro | 9 ++------- - src/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 3 +-- - src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 5 +---- - 3 files changed, 4 insertions(+), 13 deletions(-) + src/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 1 + + src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 1 + + 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/src.pro b/src/src.pro -index 90d7e2b..0aaf604 100644 +index a2064b1..d6f05e0 100644 --- a/src/src.pro +++ b/src/src.pro @@ -4,9 +4,6 @@ QT_FOR_CONFIG += gui-private @@ -30,7 +31,7 @@ index 90d7e2b..0aaf604 100644 src_qtzlib.file = $$PWD/corelib/qtzlib.pro src_qtzlib.target = sub-zlib -@@ -37,13 +34,11 @@ src_tools_bootstrap_dbus.depends = src_tools_bootstrap +@@ -41,13 +38,11 @@ src_tools_bootstrap_dbus.depends = src_tools_bootstrap src_tools_qdbusxml2cpp.subdir = tools/qdbusxml2cpp src_tools_qdbusxml2cpp.target = sub-qdbusxml2cpp @@ -44,36 +45,28 @@ index 90d7e2b..0aaf604 100644 -else: src_tools_qdbuscpp2xml.depends = src_dbus +src_tools_qdbuscpp2xml.depends = src_dbus - src_winmain.subdir = $$PWD/winmain - src_winmain.target = sub-winmain + src_tools_qvkgen.subdir = tools/qvkgen + src_tools_qvkgen.target = sub-qvkgen diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro -index 5ac3159..74c507c 100644 +index 5ac3159..65de97e 100644 --- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro +++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro -@@ -1,7 +1,6 @@ +@@ -1,5 +1,6 @@ option(host_build) QT = core-private --force_bootstrap: QT += bootstrap_dbus-private --else: QT += dbus-private -+QT += dbus-private ++CONFIG -= force_bootstrap + force_bootstrap: QT += bootstrap_dbus-private + else: QT += dbus-private DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH - QMAKE_CXXFLAGS += $$QT_HOST_CFLAGS_DBUS - diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro -index d9ee5de..e891103 100644 +index 95fcbcb..d1ebdde 100644 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro -@@ -1,9 +1,6 @@ - option(host_build) --!force_bootstrap:!qtConfig(commandlineparser): \ -- CONFIG += force_bootstrap +@@ -5,6 +5,7 @@ option(host_build) + CONFIG += force_bootstrap + } QT = core-private --force_bootstrap: QT += bootstrap_dbus-private --else: QT += dbus-private -+QT += dbus-private ++CONFIG -= force_bootstrap + force_bootstrap: QT += bootstrap_dbus-private + else: QT += dbus-private DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_FOREACH - QMAKE_CXXFLAGS += $$QT_HOST_CFLAGS_DBUS - --- -2.9.3 - diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 09d6cec6..4cc5f99c 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -182,4 +182,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "f6b36eaafec24b4c67efff621d380a4ca4257d0b" +SRCREV = "5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index b2a07247..f1605416 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "qtdeclarative" -SRCREV = "116737dc8fa244282dda95a8f13624b66fdb5521" +SRCREV = "dba1f553c04b28997dbb03a8d341d6b4305c234b" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 6b895aaa..ea109485 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "de7f741c428febfe3c81a28f955996d2314953fc" +SRCREV = "030f3d03545ed56730ea005f312fc63d04c41b29" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 0d13dc40..bc7c2e18 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "8dcbf68e4579e03ea6d2808ac0c670169b59d0df" +SRCREV = "e5ed5619e6a5ca79474bf922743b6f56bd8058ab" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 0cbd04e6..ff76d656 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" -SRCREV = "84490ff75be5acdaeb3fd93900e4ebf7ba8f539b" +SRCREV = "9546547495582628ba815a7d99e621d11ca84fa1" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index a578a065..94a09778 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -32,6 +32,6 @@ do_install_append_class-nativesdk() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" -SRCREV = "96f6ba5f562073f508cd8569ac354592fdd48f4a" +SRCREV = "d8f84e5769632544dfac5138348481330c4da4cd" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 94f04a49..b4735443 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "ef8850fee38e2552d535379a8477c9abebdf8bb4" +SRCREV = "fcffc32b64ea1d01503dafd8e16613d009c8ad34" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index d98d77e9..57600495 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -4,19 +4,12 @@ require qt5-git.inc 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.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " DEPENDS += "qtdeclarative" -RDEPENDS_${PN}-dev = "" - -SRCREV = "db93af5b2bb49af74fbad6c9cd80bd7010434e78" +SRCREV = "57b9063e167a02d653507b78c2c079264bf1acaf" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 4dd64df2..0e5a5258 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -26,4 +26,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "71ccf0dff82835ce7b5aed74c37829afdef44cde" +SRCREV = "c1645fee237213074c5b3b53c21e8d9cd3a21167" diff --git a/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch b/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch index 49fcff6b..5e452c03 100644 --- a/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch +++ b/recipes-qt/qt5/qtlocation/0001-Make-mapbox-gl-build-configurable.patch @@ -1,4 +1,4 @@ -From f7c76b91e726a0e63e5226eb6e89b13e0c3509b7 Mon Sep 17 00:00:00 2001 +From 632cfa131a890d42275873a7ca8cdf95ada61360 Mon Sep 17 00:00:00 2001 From: Samuli Piippo 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 459897a..d97e05d 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 { diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index ea24fe44..d058f43b 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -28,7 +28,7 @@ SRC_URI += " \ ${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 = "d89701c5c8646dedb0ebb2e011c4da796a6ae8a1" +SRCREV_qtlocation-mapboxgl = "9ecbe3642fb4a53b558598239b59bf1d0224c25b" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index c1ae7862..d242733b 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -29,4 +29,4 @@ SRC_URI += "\ file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ " -SRCREV = "559c305ded730e23505e8b29536a98dc59e2acfa" +SRCREV = "a6cc1af0546ab10701c10475315139ebb50ad1e5" diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index eb5e4f61..c161e41b 100644 --- a/recipes-qt/qt5/qtnetworkauth_git.bb +++ b/recipes-qt/qt5/qtnetworkauth_git.bb @@ -9,4 +9,4 @@ require qt5-git.inc DEPENDS += "qtbase" -SRCREV = "86c5036848ad004208803d9d497cfcd08c9623d6" +SRCREV = "9c170ef9431f8ceec8d9c474de9d75d8dedaa3b9" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index a84cfb32..422f8216 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative" -SRCREV = "ef6b8d3081f0bf93d6d59e67c8e3f82c63c511c3" +SRCREV = "6b23b6b4507b42a96fb3fb7d2315523f54ce1ac0" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index 83ed908d..fa7e5851 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -15,8 +15,6 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative" -RDEPENDS_${PN}-dev = "" - FILES_${PN}-qmlplugins += " \ ${OE_QMAKE_PATH_QML}/QtQuick/Controls/Shaders \ ${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \ @@ -26,4 +24,4 @@ SRC_URI += " \ file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ " -SRCREV = "dacb91916b202208681471ba764504c7c7d086f0" +SRCREV = "ae688459bc845ab919ce256f315843d97ba9ff32" diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index f563818d..c5ffd261 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -22,6 +22,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "ae0b101884b05355e3a7bc06dbca722ad3d08d0f" +SRCREV = "68f876f17b21ec0c95d1e487238f264b5a568c65" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index ae5e0da4..8423b583 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -25,4 +25,4 @@ ARM_INSTRUCTION_SET_armv5 = "arm" DEPENDS += "qtbase" -SRCREV = "e00ca9b6bec2adf78fd14e02376ecf1b55a93b0c" +SRCREV = "ab816ddbfeca2ff6dadca0a31de168f1a5a3f7f4" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index c2c00e1b..e82abfc5 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -10,7 +10,7 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" -SRCREV = "eff82ac957e051f16f64c287f2dfaec9049bdfc1" +SRCREV = "27c4c643bae356d5bbdb58e44ec4b7932f277886" SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch" diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 17d06394..9abc6173 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -3,14 +3,13 @@ require qt5-git.inc 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.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ + file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ + file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ - file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ " DEPENDS += "qtbase qtdeclarative" -SRCREV = "0c3c4d01ea34ed98a0d2928662f07b673f00535d" +SRCREV = "2ff8f06e71d5eeb40cbdebc104c00073a3c2871a" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 93a826bd..ba100add 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "20811e3b004af817e3f02982c755e8b1560b8c3d" +SRCREV = "8cec9f474af2cf654828b5d47b166da7d3c36574" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 957000c4..bd92de9b 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "687f5a9bd44a45a29d24925f29470c43d6729dee" +SRCREV = "a7594fd4e883a33faffb8340d73547f882eccb29" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index fb8d44e1..d3645030 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "4fd787e90c70afbaa168abb3efdb8757ba77f3a4" +SRCREV = "c0f586c374d6efbac2b3a25a1cb37924c70286db" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 9ca90a2c..f13b7bbd 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -27,7 +27,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" -SRCREV = "88e02bb0a9b97d68a4b270e4ddfb6d0847c702a9" +SRCREV = "80c135154c1e78c7af7d6d54129e009bc6015c33" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 822517f6..34df6428 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -1,12 +1,9 @@ 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 = "ad5a9af215e2b1276893490c7fe92de39cc25005" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 6d45a508..82f31248 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -49,4 +49,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" -SRCREV = "bdf61afe76e94ef03da1332c4540646f18f5852f" +SRCREV = "2102196073a045d354e1ff5ea0e00ee4923b948d" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 26ef8532..09150909 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -37,7 +37,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "f1cf62fa8e9ffa2548c9968906848596f50dbc0b" +SRCREV = "4934b87156a889584a34e36c22abd9aee64cef7e" # From https://bugreports.qt.io/browse/QTBUG-57767 SRC_URI += " \ diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index f1167a9e..a7d39e95 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -4,17 +4,12 @@ require qt5-git.inc 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.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "6383f0fc5eec4935697a6d2d2f87b511bbeb678e" +SRCREV = "f6b06b37fffdb35c8dd8a9b9cfd0177daae473be" diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 26d2e28d..60f48d99 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -113,7 +113,7 @@ SRC_URI += " \ file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ " -SRCREV_qtwebengine = "73f7be5b2a95eab3dce11caede538eeb7beb71f2" +SRCREV_qtwebengine = "1906d4df2146319dcdd5ef71ee26aa0a8ff6fb61" SRCREV_chromium = "aa2fdd6be3d465280d2a0c3aacdc738bb4ffec05" SRCREV = "${SRCREV_qtwebengine}" diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb index 286aecae..460ff0c7 100644 --- a/recipes-qt/qt5/qtwebkit-examples_git.bb +++ b/recipes-qt/qt5/qtwebkit-examples_git.bb @@ -17,4 +17,4 @@ DEPENDS += "qtwebkit qtxmlpatterns" RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins" RDEPENDS_${PN}-examples += "${@bb.utils.contains('PACKAGECONFIG_OPENSSL', 'openssl', 'ca-certificates', '', d)}" -SRCREV = "822426abc77a74752b0ee0da4d0a1c106c4dac22" +SRCREV = "f544b2eec0c18b7674ac4df629ae98e8cacce5c7" diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 722af85e..86460595 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -85,4 +85,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db 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 = "821eaaadc9d63d03aca65cf757230b520daaaa7c" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 41ec27f6..d85a6690 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb @@ -1,14 +1,14 @@ 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 & 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.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \ - file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ - file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ - file://LGPL_EXCEPTION.txt;md5=bb426f3367c4805d1e12fad05bd0b750 \ + file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ + file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ " DEPENDS += "qtbase qtdeclarative" -SRCREV = "1421c3e4ae4213ca18f2f51d5ddb38e223450222" +SRCREV = "8bac2e667f56efc552228ed61c4ccbc3e9efa721" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index 2229cb10..cdf465d6 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -13,4 +13,4 @@ SRC_URI += "file://0001-Add-missing-include-for-qWarning.patch" DEPENDS += "qtbase qtwebengine" -SRCREV = "6e55abf3b6a5f373cd4b649c2318a45c49b40589" +SRCREV = "22e7f1941fbbb7aa7212faabf5939b6d2ca7bd49" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index bf03e9bb..98df01b7 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "9e83ff8713c1a3f69ce514bf3e31335194668da7" +SRCREV = "59efd8f79abd30a71e3bb81070cae2af2eede842" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 85563862..552549d0 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -16,6 +16,6 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "c1c3af0ae456247c9bcd30161d51a94c9b38dc52" +SRCREV = "7aad4fb7bcd219badbc19b393b6d0aa6192ac8fe" BBCLASSEXTEND =+ "native nativesdk" -- cgit v1.2.3-54-g00ecf From a429f4f8ef5142201b6bd978e598b1976428762b Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 21 Jun 2017 13:35:41 +0300 Subject: qt5: update submodules Qt 5.9.1 RC Change-Id: Icc5b142d86739ac6dd298187ee22f460972fbd5b Reviewed-by: Mikko Gronoff Reviewed-by: Samuli Piippo --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bb | 2 +- recipes-qt/qt5/qtimageformats_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtremoteobjects_git.bb | 2 +- recipes-qt/qt5/qtscript_git.bb | 2 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qttools_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 +- recipes-qt/qt5/qtwayland_git.bb | 2 +- recipes-qt/qt5/qtwebengine_git.bb | 4 ++-- recipes-qt/qt5/qtwebkit_git.bb | 2 +- recipes-qt/qt5/qtwebview_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index a96d3f60..81c9e51b 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -191,4 +191,4 @@ fakeroot do_generate_qt_environment_file() { addtask generate_qt_environment_file after do_install before do_package -SRCREV = "5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5" +SRCREV = "70112521454f26cbca9b370ec88de6024a6d4f8d" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index f5164f22..ceaa8c93 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -34,6 +34,6 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "ab0a43e9efba3da95da2ebc7662a1437d5e3a899" +SRCREV = "e35b41fa9f713dcbfb7299b9effeadf52cfb6353" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 309672f6..04c8206e 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -109,4 +109,4 @@ do_install() { install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} } -SRCREV = "5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5" +SRCREV = "70112521454f26cbca9b370ec88de6024a6d4f8d" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 4cc5f99c..562a36cd 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -182,4 +182,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5" +SRCREV = "70112521454f26cbca9b370ec88de6024a6d4f8d" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index bc7c2e18..3e87a809 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "e5ed5619e6a5ca79474bf922743b6f56bd8058ab" +SRCREV = "1ed8390e17831afc5624bc7519b667eb8eea05a7" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 94a09778..7f0f7afe 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -32,6 +32,6 @@ do_install_append_class-nativesdk() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" -SRCREV = "d8f84e5769632544dfac5138348481330c4da4cd" +SRCREV = "7d28940a316128c8ee43def83a71843711d702c9" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 0e5a5258..51cddccb 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -26,4 +26,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "c1645fee237213074c5b3b53c21e8d9cd3a21167" +SRCREV = "6a325512a8d50f68a650ec9822dcd918653567c4" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index d058f43b..a953ee58 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -28,7 +28,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 = "d89701c5c8646dedb0ebb2e011c4da796a6ae8a1" +SRCREV_qtlocation = "0871241358ae3d98c9143b9b6a308ac4914712f2" SRCREV_qtlocation-mapboxgl = "9ecbe3642fb4a53b558598239b59bf1d0224c25b" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index d242733b..ab04a6cc 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -29,4 +29,4 @@ SRC_URI += "\ file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ " -SRCREV = "a6cc1af0546ab10701c10475315139ebb50ad1e5" +SRCREV = "b934cf056e3875a13af48eefe519cffe1332cde2" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 422f8216..da92d42d 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative" -SRCREV = "6b23b6b4507b42a96fb3fb7d2315523f54ce1ac0" +SRCREV = "0d851ddab069bd4373e90beacba0efa38ec021bb" diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index c5ffd261..f92d0832 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -22,6 +22,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "68f876f17b21ec0c95d1e487238f264b5a568c65" +SRCREV = "2ca7b229f7552c28f906c0efff8a662c06cc2e40" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 8423b583..2ca38919 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -25,4 +25,4 @@ ARM_INSTRUCTION_SET_armv5 = "arm" DEPENDS += "qtbase" -SRCREV = "ab816ddbfeca2ff6dadca0a31de168f1a5a3f7f4" +SRCREV = "dc65e802cae6751b167ada36b45f5b7ec53a1865" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index ba100add..a2c631e0 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "8cec9f474af2cf654828b5d47b166da7d3c36574" +SRCREV = "b919d62924f0f347c7c356f1cc1b2da55a637e40" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index f13b7bbd..6903edf7 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -27,7 +27,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" -SRCREV = "80c135154c1e78c7af7d6d54129e009bc6015c33" +SRCREV = "6ccb19d3608709bd874819049019cb78f1cca017" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 82f31248..08e9c1fc 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -49,4 +49,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" -SRCREV = "2102196073a045d354e1ff5ea0e00ee4923b948d" +SRCREV = "88c57c1ad8b3a388de3359fc152e4354a09f8c0f" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 09150909..294a4e7d 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -37,7 +37,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "4934b87156a889584a34e36c22abd9aee64cef7e" +SRCREV = "29dbb9acede3f5d9e477fdedd53d04be4136c0de" # From https://bugreports.qt.io/browse/QTBUG-57767 SRC_URI += " \ diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 60f48d99..64352ec3 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -113,8 +113,8 @@ SRC_URI += " \ file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ " -SRCREV_qtwebengine = "1906d4df2146319dcdd5ef71ee26aa0a8ff6fb61" -SRCREV_chromium = "aa2fdd6be3d465280d2a0c3aacdc738bb4ffec05" +SRCREV_qtwebengine = "55a5420173b6ab10611eb91386b54217b8218ba0" +SRCREV_chromium = "cf200aa240206da0bb30a3601192c45c3b8b2e94" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 86460595..db1bdc57 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -85,4 +85,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db 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 = "821eaaadc9d63d03aca65cf757230b520daaaa7c" +SRCREV = "bf172ae289a1348842005a9421797970f9b72060" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index cdf465d6..c0e100fc 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -13,4 +13,4 @@ SRC_URI += "file://0001-Add-missing-include-for-qWarning.patch" DEPENDS += "qtbase qtwebengine" -SRCREV = "22e7f1941fbbb7aa7212faabf5939b6d2ca7bd49" +SRCREV = "c795aad0aa9ff62da8d48dfa4b4c92bd55a18e45" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 552549d0..efe5fec2 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -16,6 +16,6 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "7aad4fb7bcd219badbc19b393b6d0aa6192ac8fe" +SRCREV = "55bf61b68b42a79548bf1bf1358981d40cf75911" BBCLASSEXTEND =+ "native nativesdk" -- cgit v1.2.3-54-g00ecf From 5685e098d6f6c6d51f5305733688b3c712f182ce Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 26 Jun 2017 10:25:15 +0300 Subject: qt5: update submodules Qt 5.9.1 RC2 - added 5.9.1 changefiles & updated webengine Change-Id: I09b98127a01cb67eab728e3ec7ee88a8a4f2ac9c Reviewed-by: Samuli Piippo --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- 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/qtgamepad_git.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- 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 +- recipes-qt/qt5/qttools_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 +- recipes-qt/qt5/qtwayland_git.bb | 2 +- recipes-qt/qt5/qtwebchannel_git.bb | 2 +- recipes-qt/qt5/qtwebengine_git.bb | 4 ++-- recipes-qt/qt5/qtwebsockets_git.bb | 2 +- recipes-qt/qt5/qtwebview_git.bb | 2 +- recipes-qt/qt5/qtx11extras_git.bb | 2 +- 28 files changed, 29 insertions(+), 29 deletions(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 81c9e51b..6363d075 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -191,4 +191,4 @@ fakeroot do_generate_qt_environment_file() { addtask generate_qt_environment_file after do_install before do_package -SRCREV = "70112521454f26cbca9b370ec88de6024a6d4f8d" +SRCREV = "0c0210682bdf32b0bcf0ce815d7be3df6bdab0ae" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index ceaa8c93..fd6a506b 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -34,6 +34,6 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "e35b41fa9f713dcbfb7299b9effeadf52cfb6353" +SRCREV = "6310f055965f824f716ccc3fbc99e4209f667635" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 04c8206e..6c059adc 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -109,4 +109,4 @@ do_install() { install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} } -SRCREV = "70112521454f26cbca9b370ec88de6024a6d4f8d" +SRCREV = "0c0210682bdf32b0bcf0ce815d7be3df6bdab0ae" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 562a36cd..19129764 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -182,4 +182,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "70112521454f26cbca9b370ec88de6024a6d4f8d" +SRCREV = "0c0210682bdf32b0bcf0ce815d7be3df6bdab0ae" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index f1605416..35acfa86 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "qtdeclarative" -SRCREV = "dba1f553c04b28997dbb03a8d341d6b4305c234b" +SRCREV = "e232f7d48825c9384fbc2c5cd5903a37c7784132" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index ea109485..919dae6d 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "030f3d03545ed56730ea005f312fc63d04c41b29" +SRCREV = "6d56ceef6c219c3866862c561671151b6f8b07af" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 3e87a809..887e725f 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "1ed8390e17831afc5624bc7519b667eb8eea05a7" +SRCREV = "a6772267d013bff5fbdf09634dc60977d83933b3" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index ff76d656..e4ef76c1 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" -SRCREV = "9546547495582628ba815a7d99e621d11ca84fa1" +SRCREV = "8c6db2a9e8e392cf4408278169250334a042d522" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 7f0f7afe..95c57589 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -32,6 +32,6 @@ do_install_append_class-nativesdk() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" -SRCREV = "7d28940a316128c8ee43def83a71843711d702c9" +SRCREV = "525de4ff29cfefd9f676ba35a4e8d7494e5198c2" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index b4735443..10d1c53b 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "fcffc32b64ea1d01503dafd8e16613d009c8ad34" +SRCREV = "714b3dd904b758b671f563e1b1954ab8cc1e8890" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 57600495..c16f5066 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative" -SRCREV = "57b9063e167a02d653507b78c2c079264bf1acaf" +SRCREV = "ef26dd7c053c3a7a816e78a95898072a8f9b22ed" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index a953ee58..15ad9088 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -28,7 +28,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 = "0871241358ae3d98c9143b9b6a308ac4914712f2" +SRCREV_qtlocation = "dc70a1ffdcb6ab5753773917642b4d89e68d21e7" SRCREV_qtlocation-mapboxgl = "9ecbe3642fb4a53b558598239b59bf1d0224c25b" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index ab04a6cc..9b6e536a 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -29,4 +29,4 @@ SRC_URI += "\ file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ " -SRCREV = "b934cf056e3875a13af48eefe519cffe1332cde2" +SRCREV = "631a6f6c38a5140e22c63b0840d9badb87851949" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index da92d42d..503f97c6 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative" -SRCREV = "0d851ddab069bd4373e90beacba0efa38ec021bb" +SRCREV = "20145d37a40a940967b13e3cdc5e4adcf8cc9323" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index fa7e5851..fd2f42ba 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -24,4 +24,4 @@ SRC_URI += " \ file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ " -SRCREV = "ae688459bc845ab919ce256f315843d97ba9ff32" +SRCREV = "5362d2d12970e435cc03dbd354fdd781ae666101" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index e82abfc5..5a4d2ca5 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -10,7 +10,7 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" -SRCREV = "27c4c643bae356d5bbdb58e44ec4b7932f277886" +SRCREV = "fd324b6385842b15f7dda4116b19adbaec3195b7" SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch" diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 9abc6173..844d88d3 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "2ff8f06e71d5eeb40cbdebc104c00073a3c2871a" +SRCREV = "c67dbe9b0f853bd607fcdc29d8f7a128db7d9f0a" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index a2c631e0..25c7d634 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "b919d62924f0f347c7c356f1cc1b2da55a637e40" +SRCREV = "03470806dddcfed7249ad2bffb0940e29eea4b5a" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index bd92de9b..0c6596ac 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "a7594fd4e883a33faffb8340d73547f882eccb29" +SRCREV = "385eb5bcb9b230222a99dc8c125b3d13be978465" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index d3645030..99d1019d 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "c0f586c374d6efbac2b3a25a1cb37924c70286db" +SRCREV = "96d3cb055fe477aa2699682555c3c33c66e0e300" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 6903edf7..8bb4fea4 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -27,7 +27,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" -SRCREV = "6ccb19d3608709bd874819049019cb78f1cca017" +SRCREV = "dfda6f14b3e210a33b71ef1c6fa3c75a9c866cce" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 08e9c1fc..c994e508 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -49,4 +49,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" -SRCREV = "88c57c1ad8b3a388de3359fc152e4354a09f8c0f" +SRCREV = "234084004520b512b31ceb73a2fbfa47f441ab9d" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 294a4e7d..81eb43b1 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -37,7 +37,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "29dbb9acede3f5d9e477fdedd53d04be4136c0de" +SRCREV = "ef4eeb4d243e0fd6f44f52be2c345ab450c70a49" # From https://bugreports.qt.io/browse/QTBUG-57767 SRC_URI += " \ diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index a7d39e95..861ae78d 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "f6b06b37fffdb35c8dd8a9b9cfd0177daae473be" +SRCREV = "392da2b649ce669bf329b49668a69007179e4726" diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb index 64352ec3..6a8791d8 100644 --- a/recipes-qt/qt5/qtwebengine_git.bb +++ b/recipes-qt/qt5/qtwebengine_git.bb @@ -113,8 +113,8 @@ SRC_URI += " \ file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \ " -SRCREV_qtwebengine = "55a5420173b6ab10611eb91386b54217b8218ba0" -SRCREV_chromium = "cf200aa240206da0bb30a3601192c45c3b8b2e94" +SRCREV_qtwebengine = "0340d87b7c12a5e56966e61db156e4a299b57bd9" +SRCREV_chromium = "c66a939fc7fcbe9cff6a1c94c81ec925133e63b8" SRCREV = "${SRCREV_qtwebengine}" SRCREV_FORMAT = "qtwebengine_chromium" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index d85a6690..baaa00cb 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "8bac2e667f56efc552228ed61c4ccbc3e9efa721" +SRCREV = "2818cc3e3d1aeb739eb82d5636a8caf56f5cfaf2" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index c0e100fc..2735c98a 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -13,4 +13,4 @@ SRC_URI += "file://0001-Add-missing-include-for-qWarning.patch" DEPENDS += "qtbase qtwebengine" -SRCREV = "c795aad0aa9ff62da8d48dfa4b4c92bd55a18e45" +SRCREV = "531b3cca5c7d480c8b332ffe3e9dd68c214adc79" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 98df01b7..08ad3dbb 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "59efd8f79abd30a71e3bb81070cae2af2eede842" +SRCREV = "a4eef519a7524835c93f5658dbf7064c83e33bbc" -- cgit v1.2.3-54-g00ecf From 5df9d273194e89498ea7fa93ac4ec987007253d2 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Tue, 27 Jun 2017 13:07:00 +0300 Subject: qtbase: update to 5.9.1 RC3 Change-Id: Ie2e8ae52e9927d688f82fb2df538ef3e79e7a69c Reviewed-by: Samuli Piippo --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 6363d075..50ed16c1 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -191,4 +191,4 @@ fakeroot do_generate_qt_environment_file() { addtask generate_qt_environment_file after do_install before do_package -SRCREV = "0c0210682bdf32b0bcf0ce815d7be3df6bdab0ae" +SRCREV = "160533328cae32c8647cecafad21233aa3529659" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 6c059adc..f77606ca 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -109,4 +109,4 @@ do_install() { install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} } -SRCREV = "0c0210682bdf32b0bcf0ce815d7be3df6bdab0ae" +SRCREV = "160533328cae32c8647cecafad21233aa3529659" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 19129764..bd7efb14 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -182,4 +182,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "0c0210682bdf32b0bcf0ce815d7be3df6bdab0ae" +SRCREV = "160533328cae32c8647cecafad21233aa3529659" -- cgit v1.2.3-54-g00ecf From 41e4144d4d8c50b52ed6224a28f2ca4042c1e5b2 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Fri, 11 Aug 2017 13:54:46 +0300 Subject: qt5: update submodules Update to Qt 5.9.2 (snapshot 1) Task-number: QTBUG-62447 Change-Id: I0a7f23f4efb7f07aea589fdd3f2c5bcf9a633539 Reviewed-by: Samuli Piippo --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 2 +- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qtbase-native_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 2 +- 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/qtgamepad_git.bb | 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +- recipes-qt/qt5/qtimageformats_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 2 +- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- recipes-qt/qt5/qtremoteobjects_git.bb | 2 +- recipes-qt/qt5/qtscript_git.bb | 2 +- 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 +- recipes-qt/qt5/qttools_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 +- recipes-qt/qt5/qtwayland_git.bb | 2 +- recipes-qt/qt5/qtwebchannel_git.bb | 2 +- recipes-qt/qt5/qtwebkit_git.bb | 2 +- recipes-qt/qt5/qtwebsockets_git.bb | 2 +- recipes-qt/qt5/qtwebview_git.bb | 2 +- recipes-qt/qt5/qtx11extras_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 50ed16c1..a96d3f60 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -191,4 +191,4 @@ fakeroot do_generate_qt_environment_file() { addtask generate_qt_environment_file after do_install before do_package -SRCREV = "160533328cae32c8647cecafad21233aa3529659" +SRCREV = "5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index fd6a506b..f5164f22 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -34,6 +34,6 @@ do_configure_prepend() { ${S}/src/quick3d/imports/input/importsinput.pro } -SRCREV = "6310f055965f824f716ccc3fbc99e4209f667635" +SRCREV = "ab0a43e9efba3da95da2ebc7662a1437d5e3a899" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index f77606ca..309672f6 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -109,4 +109,4 @@ do_install() { install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} } -SRCREV = "160533328cae32c8647cecafad21233aa3529659" +SRCREV = "5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index bd7efb14..4cc5f99c 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -182,4 +182,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "160533328cae32c8647cecafad21233aa3529659" +SRCREV = "5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 35acfa86..f1605416 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bb +++ b/recipes-qt/qt5/qtcanvas3d_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "qtdeclarative" -SRCREV = "e232f7d48825c9384fbc2c5cd5903a37c7784132" +SRCREV = "dba1f553c04b28997dbb03a8d341d6b4305c234b" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 919dae6d..ea109485 100644 --- a/recipes-qt/qt5/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia" -SRCREV = "6d56ceef6c219c3866862c561671151b6f8b07af" +SRCREV = "030f3d03545ed56730ea005f312fc63d04c41b29" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 887e725f..bc7c2e18 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "a6772267d013bff5fbdf09634dc60977d83933b3" +SRCREV = "e5ed5619e6a5ca79474bf922743b6f56bd8058ab" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index e4ef76c1..ff76d656 100644 --- a/recipes-qt/qt5/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb @@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns" -SRCREV = "8c6db2a9e8e392cf4408278169250334a042d522" +SRCREV = "9546547495582628ba815a7d99e621d11ca84fa1" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 95c57589..94a09778 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -32,6 +32,6 @@ do_install_append_class-nativesdk() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" -SRCREV = "525de4ff29cfefd9f676ba35a4e8d7494e5198c2" +SRCREV = "d8f84e5769632544dfac5138348481330c4da4cd" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 10d1c53b..b4735443 100644 --- a/recipes-qt/qt5/qtgamepad_git.bb +++ b/recipes-qt/qt5/qtgamepad_git.bb @@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "714b3dd904b758b671f563e1b1954ab8cc1e8890" +SRCREV = "fcffc32b64ea1d01503dafd8e16613d009c8ad34" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index c16f5066..57600495 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative" -SRCREV = "ef26dd7c053c3a7a816e78a95898072a8f9b22ed" +SRCREV = "57b9063e167a02d653507b78c2c079264bf1acaf" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index 51cddccb..0e5a5258 100644 --- a/recipes-qt/qt5/qtimageformats_git.bb +++ b/recipes-qt/qt5/qtimageformats_git.bb @@ -26,4 +26,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "6a325512a8d50f68a650ec9822dcd918653567c4" +SRCREV = "c1645fee237213074c5b3b53c21e8d9cd3a21167" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 15ad9088..d058f43b 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -28,7 +28,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 = "dc70a1ffdcb6ab5753773917642b4d89e68d21e7" +SRCREV_qtlocation = "d89701c5c8646dedb0ebb2e011c4da796a6ae8a1" SRCREV_qtlocation-mapboxgl = "9ecbe3642fb4a53b558598239b59bf1d0224c25b" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 9b6e536a..d242733b 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -29,4 +29,4 @@ SRC_URI += "\ file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ " -SRCREV = "631a6f6c38a5140e22c63b0840d9badb87851949" +SRCREV = "a6cc1af0546ab10701c10475315139ebb50ad1e5" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 503f97c6..422f8216 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative" -SRCREV = "20145d37a40a940967b13e3cdc5e4adcf8cc9323" +SRCREV = "6b23b6b4507b42a96fb3fb7d2315523f54ce1ac0" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index fd2f42ba..fa7e5851 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -24,4 +24,4 @@ SRC_URI += " \ file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ " -SRCREV = "5362d2d12970e435cc03dbd354fdd781ae666101" +SRCREV = "ae688459bc845ab919ce256f315843d97ba9ff32" diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index f92d0832..c5ffd261 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb @@ -22,6 +22,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "2ca7b229f7552c28f906c0efff8a662c06cc2e40" +SRCREV = "68f876f17b21ec0c95d1e487238f264b5a568c65" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 2ca38919..8423b583 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -25,4 +25,4 @@ ARM_INSTRUCTION_SET_armv5 = "arm" DEPENDS += "qtbase" -SRCREV = "dc65e802cae6751b167ada36b45f5b7ec53a1865" +SRCREV = "ab816ddbfeca2ff6dadca0a31de168f1a5a3f7f4" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index 5a4d2ca5..e82abfc5 100644 --- a/recipes-qt/qt5/qtscxml_git.bb +++ b/recipes-qt/qt5/qtscxml_git.bb @@ -10,7 +10,7 @@ require qt5-git.inc DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native" -SRCREV = "fd324b6385842b15f7dda4116b19adbaec3195b7" +SRCREV = "27c4c643bae356d5bbdb58e44ec4b7932f277886" SRC_URI += "file://0001-Use-external-host-bin-path-for-cmake-file.patch" diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb index 844d88d3..9abc6173 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "c67dbe9b0f853bd607fcdc29d8f7a128db7d9f0a" +SRCREV = "2ff8f06e71d5eeb40cbdebc104c00073a3c2871a" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 25c7d634..ba100add 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtserialport" -SRCREV = "03470806dddcfed7249ad2bffb0940e29eea4b5a" +SRCREV = "8cec9f474af2cf654828b5d47b166da7d3c36574" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 0c6596ac..bd92de9b 100644 --- a/recipes-qt/qt5/qtserialport_git.bb +++ b/recipes-qt/qt5/qtserialport_git.bb @@ -15,4 +15,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "385eb5bcb9b230222a99dc8c125b3d13be978465" +SRCREV = "a7594fd4e883a33faffb8340d73547f882eccb29" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 99d1019d..d3645030 100644 --- a/recipes-qt/qt5/qtsvg_git.bb +++ b/recipes-qt/qt5/qtsvg_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "96d3cb055fe477aa2699682555c3c33c66e0e300" +SRCREV = "c0f586c374d6efbac2b3a25a1cb37924c70286db" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 8bb4fea4..f13b7bbd 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -27,7 +27,7 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" -SRCREV = "dfda6f14b3e210a33b71ef1c6fa3c75a9c866cce" +SRCREV = "80c135154c1e78c7af7d6d54129e009bc6015c33" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index c994e508..82f31248 100644 --- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -49,4 +49,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit" DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" -SRCREV = "234084004520b512b31ceb73a2fbfa47f441ab9d" +SRCREV = "2102196073a045d354e1ff5ea0e00ee4923b948d" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 81eb43b1..09150909 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -37,7 +37,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "ef4eeb4d243e0fd6f44f52be2c345ab450c70a49" +SRCREV = "4934b87156a889584a34e36c22abd9aee64cef7e" # From https://bugreports.qt.io/browse/QTBUG-57767 SRC_URI += " \ diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index 861ae78d..a7d39e95 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "392da2b649ce669bf329b49668a69007179e4726" +SRCREV = "f6b06b37fffdb35c8dd8a9b9cfd0177daae473be" diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index db1bdc57..86460595 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -85,4 +85,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db 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 = "bf172ae289a1348842005a9421797970f9b72060" +SRCREV = "821eaaadc9d63d03aca65cf757230b520daaaa7c" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index baaa00cb..d85a6690 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bb +++ b/recipes-qt/qt5/qtwebsockets_git.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "2818cc3e3d1aeb739eb82d5636a8caf56f5cfaf2" +SRCREV = "8bac2e667f56efc552228ed61c4ccbc3e9efa721" diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb index 2735c98a..cdf465d6 100644 --- a/recipes-qt/qt5/qtwebview_git.bb +++ b/recipes-qt/qt5/qtwebview_git.bb @@ -13,4 +13,4 @@ SRC_URI += "file://0001-Add-missing-include-for-qWarning.patch" DEPENDS += "qtbase qtwebengine" -SRCREV = "531b3cca5c7d480c8b332ffe3e9dd68c214adc79" +SRCREV = "22e7f1941fbbb7aa7212faabf5939b6d2ca7bd49" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 08ad3dbb..98df01b7 100644 --- a/recipes-qt/qt5/qtx11extras_git.bb +++ b/recipes-qt/qt5/qtx11extras_git.bb @@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "a4eef519a7524835c93f5658dbf7064c83e33bbc" +SRCREV = "59efd8f79abd30a71e3bb81070cae2af2eede842" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index efe5fec2..552549d0 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bb +++ b/recipes-qt/qt5/qtxmlpatterns_git.bb @@ -16,6 +16,6 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -SRCREV = "55bf61b68b42a79548bf1bf1358981d40cf75911" +SRCREV = "7aad4fb7bcd219badbc19b393b6d0aa6192ac8fe" BBCLASSEXTEND =+ "native nativesdk" -- cgit v1.2.3-54-g00ecf