diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-08-18 15:54:29 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-08-22 11:08:35 +0000 |
commit | 0f967048d5bd99ffacfb9893b76818293aaaa8a0 (patch) | |
tree | 26fe07810d3a093e5183cb788c5e982fac20ecd1 | |
parent | 39b77b9a9437f471d00269c3fbf2177d07045386 (diff) |
Update Qt5 submodules
Moved some of the addon recipes to be under qt5 folder, so that
update-qt5-modules.sh script will work for those as well.
Using latest revision from meta-qt5 and applied necessary changes
to qt5 recipes.
Change-Id: I802ca2e4ea67bde10c3b065365d25f1e543da181
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
33 files changed, 50 insertions, 34 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend index 326bdec7..ae8e6f42 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend @@ -19,7 +19,7 @@ ## ############################################################################## -SRCREV = "540978288ea0f6ed0b166bb9207f427a4c825ab6" +SRCREV = "17d68c4fc371c32bd58d0a94ac63f0170edaf29e" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qt3d_git.bbappend b/recipes-qt/qt5/qt3d_git.bbappend index f7ae8840..349ef9a7 100644 --- a/recipes-qt/qt5/qt3d_git.bbappend +++ b/recipes-qt/qt5/qt3d_git.bbappend @@ -25,4 +25,4 @@ SRC_URI_append_class-target = " \ file://0001-Remove-qgltf.patch \ " -SRCREV = "2270fae50f8d69858b2df2287342c02a4cd5357c" +SRCREV = "d3889211dc245d44dab25dcc9fbbc4b57e92ac33" diff --git a/recipes-qt/qt5/qtbase-native_git.bbappend b/recipes-qt/qt5/qtbase-native_git.bbappend index 31cc314d..8d86d39c 100644 --- a/recipes-qt/qt5/qtbase-native_git.bbappend +++ b/recipes-qt/qt5/qtbase-native_git.bbappend @@ -19,7 +19,7 @@ ## ############################################################################## -SRCREV = "540978288ea0f6ed0b166bb9207f427a4c825ab6" +SRCREV = "17d68c4fc371c32bd58d0a94ac63f0170edaf29e" FILESEXTRAPATHS_prepend := "${THISDIR}/qtbase:" diff --git a/recipes-qt/qt5/qtbase_git.bbappend b/recipes-qt/qt5/qtbase_git.bbappend index e2c41917..19cd2d6d 100644 --- a/recipes-qt/qt5/qtbase_git.bbappend +++ b/recipes-qt/qt5/qtbase_git.bbappend @@ -19,7 +19,7 @@ ## ############################################################################## -PACKAGECONFIG_GL = "gles2" +PACKAGECONFIG_GL = "gles2 eglfs" PACKAGECONFIG += " \ accessibility \ alsa \ @@ -45,7 +45,7 @@ do_configure_prepend() { install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs } -SRCREV = "540978288ea0f6ed0b166bb9207f427a4c825ab6" +SRCREV = "17d68c4fc371c32bd58d0a94ac63f0170edaf29e" # Temporarily here, until merged upstream PACKAGECONFIG[kms] = "-kms,-no-kms,drm virtual/egl" diff --git a/recipes-qt/qt5/qtcanvas3d_git.bbappend b/recipes-qt/qt5/qtcanvas3d_git.bbappend index 7a161768..95ef942f 100644 --- a/recipes-qt/qt5/qtcanvas3d_git.bbappend +++ b/recipes-qt/qt5/qtcanvas3d_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "72312730a7507f77898df0876b9437c43587e1d1" +SRCREV = "2778071f6c80b5397a183db37114aef881ade855" diff --git a/recipes-qt/qt5-addons/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb index 559beb75..4b7a38ad 100644 --- a/recipes-qt/qt5-addons/qtcharts_git.bb +++ b/recipes-qt/qt5/qtcharts_git.bb @@ -26,6 +26,6 @@ LIC_FILES_CHKSUM = "file://src/charts/qchart.h;md5=a712f087e2146153f45db2e8eb1a3 inherit qt5-module qtquickcompiler require recipes-qt/qt5/qt5-git.inc -SRCREV = "d137ae33ccf01882f80770919b1daa199dec7019" +SRCREV = "c6d72bb6ebd860a38aac2e557bca330b0d5b1926" DEPENDS = "qtbase qtdeclarative qtmultimedia" diff --git a/recipes-qt/qt5/qtconnectivity_git.bbappend b/recipes-qt/qt5/qtconnectivity_git.bbappend index 018157e4..934b40f8 100644 --- a/recipes-qt/qt5/qtconnectivity_git.bbappend +++ b/recipes-qt/qt5/qtconnectivity_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "7393531856058a8a0fe440d3a64728248958ac81" +SRCREV = "f5fe6ce47841be34d4b851725d80133ff6d14fee" diff --git a/recipes-qt/qt5-addons/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb index 9b9f239e..9b9f239e 100644 --- a/recipes-qt/qt5-addons/qtdatavis3d_git.bb +++ b/recipes-qt/qt5/qtdatavis3d_git.bb diff --git a/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb b/recipes-qt/qt5/qtdeclarative-render2d_git.bb index 1c45cb85..1c45cb85 100644 --- a/recipes-qt/qt5-addons/qtdeclarative-render2d_git.bb +++ b/recipes-qt/qt5/qtdeclarative-render2d_git.bb diff --git a/recipes-qt/qt5/qtdeclarative_git.bbappend b/recipes-qt/qt5/qtdeclarative_git.bbappend index 76a1d424..84509383 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bbappend +++ b/recipes-qt/qt5/qtdeclarative_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "9b1231ca3d21ade574a8a7cf3f0805a8b520bcd5" +SRCREV = "b1eeb7cdde17f70e8e9ad3c610d6492f3ca70717" diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend index f7b6d745..f164c73d 100644 --- a/recipes-qt/qt5/qtgraphicaleffects_git.bbappend +++ b/recipes-qt/qt5/qtgraphicaleffects_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "d01a936b6454834e8ead7acc5838ee5c66541a55" +SRCREV = "0b68e91d68902c4d05d0bb8aa045ae76c4e8c9b5" diff --git a/recipes-qt/qt5/qtimageformats_git.bbappend b/recipes-qt/qt5/qtimageformats_git.bbappend index 9a837832..afa85cbb 100644 --- a/recipes-qt/qt5/qtimageformats_git.bbappend +++ b/recipes-qt/qt5/qtimageformats_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "cbf2d7e7696a4a08360c2004dfcbb8be7c1d2edb" +SRCREV = "d7bdc138b89bf0c52ba9ddf22b34d2ccd06b3936" diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend index 8397e50e..3f935477 100644 --- a/recipes-qt/qt5/qtlocation_git.bbappend +++ b/recipes-qt/qt5/qtlocation_git.bbappend @@ -24,4 +24,4 @@ PACKAGECONFIG += "gypsy" EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "2bdeea286037e5ea0d8ba0d2ad59bdf1eaae1054" +SRCREV = "fafc158427e9d54298ce5c3419c1d4b6ec3b946e" diff --git a/recipes-qt/qt5/qtmultimedia_git.bbappend b/recipes-qt/qt5/qtmultimedia_git.bbappend index 818bc01a..ecc7f15f 100644 --- a/recipes-qt/qt5/qtmultimedia_git.bbappend +++ b/recipes-qt/qt5/qtmultimedia_git.bbappend @@ -23,4 +23,4 @@ PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d) ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'gstreamer010', 'gstreamer010', 'gstreamer', d)}" -SRCREV = "711efc552d65f22b262e049c5a046198377519dc" +SRCREV = "c9de25fa342ff8066d49541179c30d0ce45950b4" diff --git a/recipes-qt/qt5-addons/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb index 60187706..60187706 100644 --- a/recipes-qt/qt5-addons/qtquickcompiler_git.bb +++ b/recipes-qt/qt5/qtquickcompiler_git.bb diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb index 26aa40e8..c6dec9f0 100644 --- a/recipes-qt/qt5/qtquickcontrols2_git.bb +++ b/recipes-qt/qt5/qtquickcontrols2_git.bb @@ -24,14 +24,14 @@ require recipes-qt/qt5/qt5-git.inc LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-3.0)" LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv3;md5=8ba7f2099d17d636d5fcc8303bb17587 \ - file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ + file://LICENSE.LGPLv3;md5=a37e6cd7102174853307e03e6edc5f30 \ + file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \ file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ " DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtgraphicaleffects" -SRCREV = "6ea6881ec8847dc99e05534769d6fe6198f56ead" +SRCREV = "e93c73c0aa15cd973e008a04a70a7c69719ad244" FILES_${PN}-qmldesigner += " \ ${OE_QMAKE_PATH_QML}/*/*/*/designer \ diff --git a/recipes-qt/qt5/qtquickcontrols_git.bbappend b/recipes-qt/qt5/qtquickcontrols_git.bbappend index a52513ce..e0b892d5 100644 --- a/recipes-qt/qt5/qtquickcontrols_git.bbappend +++ b/recipes-qt/qt5/qtquickcontrols_git.bbappend @@ -21,4 +21,4 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRCREV = "fcc9c0206433c5c940a0872447899743d1a9996a" +SRCREV = "c0f58d5283ce981b8cfbc43f602a3b6553e26ce2" diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend index dc59a6a1..30e96b23 100644 --- a/recipes-qt/qt5/qtsensors_git.bbappend +++ b/recipes-qt/qt5/qtsensors_git.bbappend @@ -22,4 +22,4 @@ EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator" DEPENDS_emulator += "qtsimulator" -SRCREV = "b08c3e69e3e82014b0f16b1ff94e5edd31d5c2c6" +SRCREV = "8b79fc4ee1c0510c13dc6f1494f37727e3f8c0cf" diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb index cfb710c6..491781c4 100644 --- a/recipes-qt/qt5/qtserialbus_git.bb +++ b/recipes-qt/qt5/qtserialbus_git.bb @@ -24,11 +24,11 @@ require recipes-qt/qt5/qt5-git.inc LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-2.0)" LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ - file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ + file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ + file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \ file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \ " DEPENDS += "qtbase qtserialport" -SRCREV = "ec7b4b226818fa39646ec9c619b9df995952ea9c" +SRCREV = "0c63b3a441437a8bc42770d360a6696bbf11cd2d" diff --git a/recipes-qt/qt5/qtserialport_git.bbappend b/recipes-qt/qt5/qtserialport_git.bbappend index ef91dc4d..7fbdf67c 100644 --- a/recipes-qt/qt5/qtserialport_git.bbappend +++ b/recipes-qt/qt5/qtserialport_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "c1355ae41ee46437e9d6583dc4ea452a82b6b53b" +SRCREV = "b0e3e7469cf5249bb395d044c5344bbe88884553" diff --git a/recipes-qt/qt5/qtsvg_git.bbappend b/recipes-qt/qt5/qtsvg_git.bbappend index c486a2d5..755a49b6 100644 --- a/recipes-qt/qt5/qtsvg_git.bbappend +++ b/recipes-qt/qt5/qtsvg_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "0e69a7c86f1908bc282362ec59f0ccf97d35d63a" +SRCREV = "2d55b4996eaa26c973afdf15f6f703c0a1840a96" diff --git a/recipes-qt/qt5/qttools_git.bbappend b/recipes-qt/qt5/qttools_git.bbappend index 232f920b..4234480f 100644 --- a/recipes-qt/qt5/qttools_git.bbappend +++ b/recipes-qt/qt5/qttools_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "2d838dd06ebacc58c620614719067f6dac5e7418" +SRCREV = "85197ddb8d6da0e5cf74b8d945c076d4db3986a8" diff --git a/recipes-qt/qt5/qttranslations_git.bbappend b/recipes-qt/qt5/qttranslations_git.bbappend index aeac682a..f8021a58 100644 --- a/recipes-qt/qt5/qttranslations_git.bbappend +++ b/recipes-qt/qt5/qttranslations_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "efa6513bbf2515fbe6ab7b365e9597a8900ae279" +SRCREV = "4925f90e9ceb0b4081649d1fc1eec10beb65f722" diff --git a/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb index 85dfcbb9..ef784188 100644 --- a/recipes-qt/qt5-addons/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb @@ -26,7 +26,7 @@ LIC_FILES_CHKSUM = "file://src/virtualkeyboard/plugin.cpp;md5=8913d0b71519756d2e inherit qt5-module qtquickcompiler require recipes-qt/qt5/qt5-git.inc -SRCREV = "8b75b05f8b515efc6f1a6a40214cf61abc4d8a9f" +SRCREV = "68c30e00b0d9850643611d5ba9c29a247ccd44ec" DEPENDS = "qtbase qtdeclarative qtsvg hunspell" diff --git a/recipes-qt/qt5/qtwayland-native_5.7-wip.bb b/recipes-qt/qt5/qtwayland-native_5.7-wip.bb index 455726ac..a83d6dc4 100644 --- a/recipes-qt/qt5/qtwayland-native_5.7-wip.bb +++ b/recipes-qt/qt5/qtwayland-native_5.7-wip.bb @@ -23,6 +23,14 @@ require recipes-qt/qt5/qtwayland-native_git.bb FILESEXTRAPATHS_append := "${COREBASE}/../meta-qt5/recipes-qt/qt5/qtwayland:" +LIC_FILES_CHKSUM = " \ + file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ + file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ +" + SRCREV = "2adae188cb916d5a6ffbee65abf4ee8144de9ec2" PV = "5.7-wip+git${SRCPV}" QT_MODULE_BRANCH = "wip-compositor-api" diff --git a/recipes-qt/qt5/qtwayland-native_git.bbappend b/recipes-qt/qt5/qtwayland-native_git.bbappend index 8849fd8b..793ed1be 100644 --- a/recipes-qt/qt5/qtwayland-native_git.bbappend +++ b/recipes-qt/qt5/qtwayland-native_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "920387296abcead6fea2d801fb2f57c185657c47" +SRCREV = "1bc3b0fdc8d934c1ab69a902054681896b56d672" diff --git a/recipes-qt/qt5/qtwayland_5.7-wip.bb b/recipes-qt/qt5/qtwayland_5.7-wip.bb index 2de879b8..fb59bba3 100644 --- a/recipes-qt/qt5/qtwayland_5.7-wip.bb +++ b/recipes-qt/qt5/qtwayland_5.7-wip.bb @@ -21,6 +21,14 @@ require recipes-qt/qt5/qtwayland_git.bb +LIC_FILES_CHKSUM = " \ + file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \ + file://LICENSE.LGPLv3;md5=b8c75190712063cde04e1f41b6fdad98 \ + file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \ + file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ +" + SRCREV = "0b9967d0f16652b0c77d454923bb7a1423792658" PV = "5.7-wip+git${SRCPV}" QT_MODULE_BRANCH = "wip-compositor-api" diff --git a/recipes-qt/qt5/qtwayland_git.bbappend b/recipes-qt/qt5/qtwayland_git.bbappend index 8849fd8b..793ed1be 100644 --- a/recipes-qt/qt5/qtwayland_git.bbappend +++ b/recipes-qt/qt5/qtwayland_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "920387296abcead6fea2d801fb2f57c185657c47" +SRCREV = "1bc3b0fdc8d934c1ab69a902054681896b56d672" diff --git a/recipes-qt/qt5/qtwebchannel_git.bbappend b/recipes-qt/qt5/qtwebchannel_git.bbappend index 672745ee..7e87e215 100644 --- a/recipes-qt/qt5/qtwebchannel_git.bbappend +++ b/recipes-qt/qt5/qtwebchannel_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "b06c69533baeb2f80897f72ed787b51e122ffafc" +SRCREV = "3b28a6956cb3cab087481312dc82a907b118e0de" diff --git a/recipes-qt/qt5/qtwebengine_git.bbappend b/recipes-qt/qt5/qtwebengine_git.bbappend index a7920fd2..0a094f44 100644 --- a/recipes-qt/qt5/qtwebengine_git.bbappend +++ b/recipes-qt/qt5/qtwebengine_git.bbappend @@ -25,5 +25,5 @@ SRC_URI_append_mx6 = " \ file://0001-Fix-slow-video-with-webengine-on-nitrogen6x.patch \ " -SRCREV_qtwebengine = "69351428413edb7a76ce2ca11634b1797e45e296" -SRCREV_chromium = "dc08e3972d36a63dd477de0de005b3e81a5674d9" +SRCREV_qtwebengine = "b7fde78d7822ed7f2221acfd9db15b3ff579e29d" +SRCREV_chromium = "696c084930b870a5b1fd7f176d4e7ccb3eff416c" diff --git a/recipes-qt/qt5/qtwebsockets_git.bbappend b/recipes-qt/qt5/qtwebsockets_git.bbappend index 8b8c9cdd..274e4a4b 100644 --- a/recipes-qt/qt5/qtwebsockets_git.bbappend +++ b/recipes-qt/qt5/qtwebsockets_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "0637eb3f40440f90eb531561e26f3854463bdbb3" +SRCREV = "ef7b03e3e5e20f89963bae799f7ecb753f332c34" diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bbappend b/recipes-qt/qt5/qtxmlpatterns_git.bbappend index 3150a1b8..8594a95a 100644 --- a/recipes-qt/qt5/qtxmlpatterns_git.bbappend +++ b/recipes-qt/qt5/qtxmlpatterns_git.bbappend @@ -19,4 +19,4 @@ ## ############################################################################## -SRCREV = "23b764d34705d0f858e428e02c910637368b2694" +SRCREV = "074571305e45d30066b199641eb5d0866e3b0a92" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 46fbbead..2fb53494 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -25,7 +25,7 @@ path="sources/meta-openembedded"/> <project name="meta-qt5" remote="qtyocto" - revision="ce9a8d9537e3baa7d485128a3f41451d7dca7770" + revision="70a09d3b12e3168d3e264eb572182d7f41540617" path="sources/meta-qt5"/> <project name="meta-mingw" remote="qtyocto" |