diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-09-21 12:16:45 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-10-18 07:11:44 +0000 |
commit | f3213460a0495cac618d37bcbe59fddd58b6d65d (patch) | |
tree | d34301fa895cf5dc28927ed25abab95b5b83e068 /recipes-qt/qt5 | |
parent | 5d583afc7156521d15f85d1f4c197d57d5f63322 (diff) |
qt5: update submodules
Update submodules to Qt 5.10 Beta
(except webengine/chromium left as Alpha version)
Change-Id: I2b99e7eb7870e41901bbb9622176a95b0c3a9307
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5')
26 files changed, 58 insertions, 63 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 4d9e77f0..38dd5283 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 = "037652d7a258535bd92e6950ff46398e2e74e728" +SRCREV = "f27e029ef2e8400b803cec1b17ffd4e244d8610a" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 7c20badf..bd97556a 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 = "8a4b9ebadb9e63ae367694f04786c7faf6306f27" +SRCREV = "3f03499bf8a7cf3c3f8d19a020179c1205980bde" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 2a3a0e6c..e4667dd1 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -110,4 +110,4 @@ do_install() { install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} } -SRCREV = "037652d7a258535bd92e6950ff46398e2e74e728" +SRCREV = "f27e029ef2e8400b803cec1b17ffd4e244d8610a" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 72d957a1..a95c17a4 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -183,4 +183,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "037652d7a258535bd92e6950ff46398e2e74e728" +SRCREV = "f27e029ef2e8400b803cec1b17ffd4e244d8610a" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 455ef3e5..733608f3 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 = "5be124d7373c36daf9a6c01712e6eab057bbf56d" +SRCREV = "3b24ef25fa328bf993891e242c0c3ff677fafbcb" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index f803abdc..69c63e2c 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 = "c245b25dd2ed8b9e141ac85b77f58d3522815823" +SRCREV = "cd8716678cf0cf2c9678edf4531a76cc00c7f828" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index 51d05594..5099c444 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -19,4 +19,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "ed5a1134d50f6dbed3fc568c799a39f4e2338056" +SRCREV = "18af3226765b62312acc8f801cc531fde0d9822b" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 1cb25bc4..555467f3 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 = "c54adde27f5aa723882ffc5f77fae86b3793b6e2" +SRCREV = "6300ff26ae43683a6ab701fcf031be2ff45b30f0" diff --git a/recipes-qt/qt5/qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch b/recipes-qt/qt5/qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch deleted file mode 100644 index 050a914e..00000000 --- a/recipes-qt/qt5/qtdeclarative/0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f9dcbf008b430aadd464985b7a618eca8173d264 Mon Sep 17 00:00:00 2001 -From: Robert Griebl <robert.griebl@pelagicore.com> -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 <simon.hausmann@qt.io> -Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com> ---- - 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 - diff --git a/recipes-qt/qt5/qtdeclarative/0001-QQmlTypeLoader-The-profiler-is-a-quintptr-0-if-QT_NO.patch b/recipes-qt/qt5/qtdeclarative/0001-QQmlTypeLoader-The-profiler-is-a-quintptr-0-if-QT_NO.patch new file mode 100644 index 00000000..92a63a3c --- /dev/null +++ b/recipes-qt/qt5/qtdeclarative/0001-QQmlTypeLoader-The-profiler-is-a-quintptr-0-if-QT_NO.patch @@ -0,0 +1,32 @@ +From 330e96565b37e227162ab7ec6d4c6f3f56d2a1fe Mon Sep 17 00:00:00 2001 +From: Ulf Hermann <ulf.hermann@qt.io> +Date: Mon, 25 Sep 2017 11:55:20 +0200 +Subject: [PATCH] QQmlTypeLoader: The profiler is a quintptr(0) if + QT_NO_QML_DEBUGGING + +This follows the pattern established in other places. + +Task-number: QTBUG-63392 +Change-Id: I11cd66d5552f751804dd0a9460b26bda546c1726 +Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> +Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> +Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> +--- + src/qml/qml/qqmltypeloader_p.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h +index c214f0c..abc0df9 100644 +--- a/src/qml/qml/qqmltypeloader_p.h ++++ b/src/qml/qml/qqmltypeloader_p.h +@@ -322,8 +322,8 @@ public: + void invalidate(); + + #ifdef QT_NO_QML_DEBUGGER +- QQmlProfiler *profiler() const { return nullptr; } +- void setProfiler(QQmlProfiler *) {} ++ quintptr profiler() const { return 0; } ++ void setProfiler(quintptr) {} + #else + QQmlProfiler *profiler() const { return m_profiler.data(); } + void setProfiler(QQmlProfiler *profiler); diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 7bd64966..8830ec50 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb @@ -10,12 +10,10 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " -SRC_URI += " \ - file://0001-Fix-QQmlExpression-leaking-QQmlError-objects.patch \ -" - DEPENDS += "qtbase" +SRC_URI += "file://0001-QQmlTypeLoader-The-profiler-is-a-quintptr-0-if-QT_NO.patch" + PACKAGECONFIG ??= "qtxmlpatterns" PACKAGECONFIG[qtxmlpatterns] = ",,qtxmlpatterns" @@ -32,6 +30,6 @@ do_install_append_class-nativesdk() { EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" -SRCREV = "00adacd7934d7553eaea7c6d2b43bcb3df439e3e" +SRCREV = "ff5c83087e94f340a8c5695998f2ea81e29da8ea" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 49d9b461..0755c60e 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -25,7 +25,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 = "3f2c6d8af0367c5e87eb38d348c99e2e2a2f0a76" +SRCREV_qtlocation = "2b230b0a10d898979e9d5193f4da2e408b397fe3" SRCREV_qtlocation-mapboxgl = "1c633072fcea7ad153ab6f8ec40dd72d83541ead" SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 826703ab..deefcaa6 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 = "230f070c7ed353605260f9fa79d0a5bc5181321c" +SRCREV = "951393508a5068bd999c3225158cbb06872d881c" diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb index a120d7d4..a34b0d02 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 = "4e681472f6e25153745151f2b41a8ebf4bc94f54" +SRCREV = "d811ebc6c6e83b33d765664328da5c8c6f518f66" diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index 2f16a36f..b8f09c95 100644 --- a/recipes-qt/qt5/qtquick1_git.bb +++ b/recipes-qt/qt5/qtquick1_git.bb @@ -23,4 +23,4 @@ do_configure_prepend() { } QT_MODULE_BRANCH = "dev" -SRCREV = "695460401d9a89d2f156016d51601b2e59b64105" +SRCREV = "9bf0edd9bd46ecb900bcdc3349d14869b87ab7de" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index dbfd1129..ac93db9a 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 = "bc6e79ebab8f7556aa2c7cd4352ba24509bd4792" +SRCREV = "7cbf3685565d7f62c9a01b090a4c1600b4abe220" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index d176d1b5..b9499513 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 = "caa38d217ecbcaaa5617255290598012477c4492" +SRCREV = "f9c410f619c1019fc361e230df0e4d2a2259e8e9" diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index e4e32b76..d430a359 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 = "d2269c4e68f283f704547a0a96a662b5feeea732" +SRCREV = "a3e68cda27ff01ab8fab73978f3f09db21222a98" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index cba6340b..114d6d5a 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 = "b2e4e7a49990a68915820df525680b9c70971527" +SRCREV = "01df1b7a635b11c9d0985f9651cfa4ae3d037890" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 37a99d32..b0efbd68 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 = "004289a1b7e5ff5c4f19fab3c3d41c009429b352" +SRCREV = "07e1fc7bb93dc4c306d8e64f4cb88d42177cba2e" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index cb86439c..920341d1 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 = "1ace238ce0347857a5ba55d6fa30ba81fed204b9" +SRCREV = "9099c8934ebc042b38435eae293cd46e4fd9b883" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index ff80b2e6..243646ac 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 = "1f72424b80ac1b84b4f040f195d74d9f2b646a62" +SRCREV = "27df0d34644ffc553972641abfd3406219c85391" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index ebb69b6f..ea2a8a53 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 = "1e6063f6fc9fa02bd2f12ad9e60cbc2529fc0377" +SRCREV = "04f6ff77ef0c8858629766e191ecc3d4ef056848" # 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 37a0c403..bf9b2a27 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 = "749951c19cbb7d301bed20f24d16dd4e713485c2" +SRCREV = "ba755c28ea0cd35cfa9d8c77ef7f2c61437ad25b" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index dd618b10..5393ad48 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 = "fdb6d8370f9ae8fa148124289317c108399853c3" +SRCREV = "71b5fc5dd10e9edce8db886f6c05b7950b3cca6e" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 7a363175..af6a539b 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 = "fee0795ca96079a8f37473d3aec18757d1e52d24" +SRCREV = "9e26cfa167778f3d9444aedcb23c8476683b3785" BBCLASSEXTEND =+ "native nativesdk" |