diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-02-17 15:24:27 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-03-17 13:42:35 +0000 |
commit | 7233a39ed2ae659746dd72b7d433bc8dcc53cbb9 (patch) | |
tree | e1e35a083d67dcc00029fca3925b905f472aa168 | |
parent | 551f670b681294d15f4f36433c8507d99e240fd0 (diff) |
qt5: update submodules
* qtlocation module has a new 3rd party submodule
"mapbox-gl-native" added under src/3rdparty folder.
Change-Id: Ie5b21245bcf61b42b044e8121368d28b96a824f8
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
32 files changed, 39 insertions, 32 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 2aa392e2..98fa67f4 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -114,6 +114,7 @@ do_configure() { -no-opengl \ -no-openssl \ -no-xcb \ + -no-feature-bearermanagement \ -verbose \ -release \ -prefix ${OE_QMAKE_PATH_PREFIX} \ @@ -189,4 +190,4 @@ fakeroot do_generate_qt_environment_file() { addtask generate_qt_environment_file after do_install before do_package -SRCREV = "0c50edbe84914469973a3b10e0170023ccdd66fe" +SRCREV = "1d9270ee42c257e6df104053177653cffa76336e" diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 2e21c6d8..ce7fc506 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 = "7e6d78e2cc647f1fe1a66a9350e6a39574212e72" +SRCREV = "0bb720013d93c34d589c352a53405d8110fa57fe" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 80c4da62..8a4415a6 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -105,4 +105,4 @@ do_install() { install -m 755 ${B}/bin/qfloat16-tables ${D}${OE_QMAKE_PATH_BINS} } -SRCREV = "0c50edbe84914469973a3b10e0170023ccdd66fe" +SRCREV = "1d9270ee42c257e6df104053177653cffa76336e" diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 30bd9984..9c87e211 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -179,4 +179,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps" RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}" -SRCREV = "0c50edbe84914469973a3b10e0170023ccdd66fe" +SRCREV = "1d9270ee42c257e6df104053177653cffa76336e" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb index 597de8a6..92305950 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 = "a693bff7bc33145f918e8e1f160ab26cad551042" +SRCREV = "3ac87eeb59dd7ec0351d76a05dd7cfa22a274e5e" diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index a0f9435e..92a301a5 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 = "1fea2116072f96a86daec092e54fe658651a4034" +SRCREV = "e0ba5ac91dbb1fe3611118239c00ea8d748e5678" diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb index eac9ee71..027e5d14 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bb +++ b/recipes-qt/qt5/qtconnectivity_git.bb @@ -23,4 +23,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "f128dd43319d6a7020f7ee1e018b8f0bbff499ab" +SRCREV = "89cf6da818279b16708d320ae3f5ed434310a347" diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 58d6c8d4..3f8ef3b0 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 = "f03ed59a582d2bf689c866f195224bf659a7bc47" +SRCREV = "743f32ee776220b52e0c37cbbbff5b4c52c475b6" diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 692c6402..fe24da46 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 = "705a2780743a01cb9a1032fca8c1f942b50e5a0a" +SRCREV = "60708ee6227df017269146d2c0cfd4238ec25b9f" BBCLASSEXTEND =+ "native nativesdk" diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb index 3acccfde..b5647edb 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 = "bada2f466aff5faeae6239038cba227ea9636d1f" +SRCREV = "fdce0bd433f4a219a371db4091b18cc48209b04f" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb index 77d65cc5..6d5e3f4f 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bb +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb @@ -19,4 +19,4 @@ DEPENDS += "qtdeclarative" RDEPENDS_${PN}-dev = "" -SRCREV = "574f6c73a967ec9ec497534e35f442ef327c25b3" +SRCREV = "a3a229bd2ace8fc4f874304e60cf1cb74f294d71" diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb index fc2540be..feab7561 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 = "e349e6df7a08b4aa15a63fa5f1dcd0f36d598d53" +SRCREV = "d2306d74850986692c02b70df0d7a6a6e933d0dc" diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 2370f77c..c46f9677 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -20,4 +20,10 @@ PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "93cd42ef606178261e12eeffc88cd4b7d029dbc3" +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 = "11e6a62957433843816b41ad11fada7ca8eab85c" +SRCREV_qtlocation-mapboxgl = "eec42f36aed7e446c03807ec6acc477d654548d7" + +SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl" diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb index 4884953b..19ddfe74 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bb +++ b/recipes-qt/qt5/qtmultimedia_git.bb @@ -33,4 +33,4 @@ SRC_URI += "\ file://0001-qtmultimedia-fix-a-conflicting-declaration.patch \ " -SRCREV = "7e48870c182e66a8408bbcb4c9469d751a777daa" +SRCREV = "b6299347cc5cf4a9e4f79e2a4a8bb389260264df" diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb index e9b6185e..89ee7818 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 = "64faeb0d8003e699a4d09e7dcee1ef6eb10302ad" +SRCREV = "a0783470449a911fce09d6328abfcff17973d421" diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 59864b30..355c24ce 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 = "bb2a6c61777e2500fa00710c8bb752fa7b99f079" +SRCREV = "e7409625f24ed8a32bb303b948bfdf077b74ea77" diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb index d944e674..22c2b5e2 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bb +++ b/recipes-qt/qt5/qtquickcontrols_git.bb @@ -21,4 +21,4 @@ SRC_URI += " \ file://0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch \ " -SRCREV = "ff2c10d287aa9f9726ceee91543f08ab1f9d0b9c" +SRCREV = "0e92d0ae2e21f01769f6768223a411c06b953989" diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 6424237d..37ab92fd 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 = "508514b50737c8b854f1b8932a933ef1a24debbc" +SRCREV = "61d135d1c0ae52a756cf62144210fa73c9ea5526" diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb index cb669004..fc8d71c9 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 = "4b4e81398bdfcda23a9e3c86a297e12b2ff1e9d9" +SRCREV = "5d851f27a3c72e46df0dfdd234fc3a300a2870fb" 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 1e5a1ded..844b4be5 100644 --- a/recipes-qt/qt5/qtsensors_git.bb +++ b/recipes-qt/qt5/qtsensors_git.bb @@ -13,4 +13,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase qtdeclarative" -SRCREV = "993ab0bd1d573f0bbab6e3fcd08d25bc4f32a3d9" +SRCREV = "d7f1d23c1dd954d20e8358ca6b7c3f6720310f50" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index 83c59587..64a5df03 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 = "fa979925d9afa58aab29a57f4289c0b679ac03e9" +SRCREV = "ed1942128078a30ea0436c3f2eb6cd9d60a82a4d" diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb index 44986dff..0a9404b8 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 = "23902340662f1ef6f5dafe68a34b593aed6ea497" +SRCREV = "1340fedecd841765485beffa7c93320c96f21cdc" diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb index 73f0db90..36325adc 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 = "4bd5d6ced07d2d0e643a13e7cebb228c521d2046" +SRCREV = "7cc50e972b7fa546f7cedff2ef19db20af9e36ab" diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 948647ee..775bc08c 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb @@ -30,6 +30,6 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit" EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}" -SRCREV = "2f2b7155b5e4cb56c7dc284e203e8e15147e4b27" +SRCREV = "0285e3ad511882b3cfb87fc06ffbf5775c01437b" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 85665641..a76f5c4b 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -114,4 +114,4 @@ FILES_${PN}-qt = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qt_*.qm \ " -SRCREV = "40e18a92fe3b704735a1fa1512f5b273dedf9102" +SRCREV = "365bfb2ef769241e798b7c222a63ff68348d87c7" diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 0794aa8a..81db306b 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 = "0371486a32a0e39cdc9d04f9d1245b214d269e3c" +SRCREV = "18f37cf7410beb698855a38a1af458d51d64e3fe" diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb index 21ba5e84..f9f1e5d9 100644 --- a/recipes-qt/qt5/qtwayland_git.bb +++ b/recipes-qt/qt5/qtwayland_git.bb @@ -41,7 +41,7 @@ PACKAGECONFIG[libhybris-egl-server] = "-feature-libhybris-egl-server,-no-feature EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -SRCREV = "e26696524ceb58f4fe0cb7202d873240b6a9478d" +SRCREV = "e9fb11653a504b86478ef8f4513a6c23045a4fa2" # From https://bugreports.qt.io/browse/QTBUG-57767 SRC_URI += "file://0001-fix-build-without-xkbcommon-evdev.patch" diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb index b7827add..a38387c7 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bb +++ b/recipes-qt/qt5/qtwebchannel_git.bb @@ -17,4 +17,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtdeclarative qtwebsockets" -SRCREV = "1cbc05a6568db5e0ff094f8e09723c607ade88af" +SRCREV = "196097bfc84d297199ea591fc19e714c88796e8e" diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index 0fdfac8a..1ceaffd2 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb @@ -87,4 +87,4 @@ PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-db RUBY_SYS = "${@ '${BUILD_SYS}'.replace('i486', 'i386').replace('i586', 'i386').replace('i686', 'i386') }" export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby:${STAGING_LIBDIR_NATIVE}/ruby/${RUBY_SYS}" -SRCREV = "37f9c3ea771ce340e1d0e474930798a3c188055b" +SRCREV = "0b30e4490f7500ade1868fb33cea8705418c90bb" diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb index 87a26e13..a567f15f 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 = "a0aec91b676e2b79b8e66091d55d9e128bf2a1d0" +SRCREV = "1af97a5f04d4d7d0dbf9954397e2374a791d717b" diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb index 5058cfc4..ac8d1350 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 = "b45429fd7eeaf598d78f76a670a892c7d0d02f11" +SRCREV = "5ecce026f65b2fb320379e49e70f772ad2bbba69" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb index 703dd147..b1018720 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 = "fabf557bb8390a94ff4b5d8688a91ffe4abd17ec" +SRCREV = "8f340ee4baddd6f9a43ecb1754c563372b561ce3" BBCLASSEXTEND =+ "native nativesdk" |