diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2021-04-20 20:56:59 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2021-04-21 07:03:24 +0300 |
commit | d39439e4c8e77f526f546bf913dac9316420f5de (patch) | |
tree | 074a026fae09733b9f143ec5511ab46ff6cd8675 | |
parent | 08664766606736028c520e92a8ac66bab6595138 (diff) |
qt6: update submodulesv6.1.0-rc
Update to latest content in Qt 6.1.0 branch.
Task-number: QTBUG-90009
Change-Id: I26452ac4577b71e16dcd396e5f8f27b75b38bea1
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
-rw-r--r-- | recipes-qt/qt6/qt3d_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qt5compat_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtbase_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtcharts_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtcoap_git.bb | 4 | ||||
-rw-r--r-- | recipes-qt/qt6/qtdatavis3d_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtdeclarative_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtimageformats_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtlottie_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtmqtt_git.bb | 4 | ||||
-rw-r--r-- | recipes-qt/qt6/qtnetworkauth_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtopcua_git.bb | 4 | ||||
-rw-r--r-- | recipes-qt/qt6/qtquick3d_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtquickcontrols2_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtquicktimeline_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtscxml_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtshadertools_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtsvg_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qttools_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qttranslations_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtvirtualkeyboard_git.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt6/qtwayland_git.bb | 2 |
22 files changed, 22 insertions, 28 deletions
diff --git a/recipes-qt/qt6/qt3d_git.bb b/recipes-qt/qt6/qt3d_git.bb index c6add96..4a098d5 100644 --- a/recipes-qt/qt6/qt3d_git.bb +++ b/recipes-qt/qt6/qt3d_git.bb @@ -25,5 +25,5 @@ PACKAGECONFIG[system-assimp] = "-DFEATURE_system_assimp=ON,-DQT_FEATURE_system_a PACKAGECONFIG[qtgamepad] = ",,qtgamepad" SRCREV_FORMAT = "qt3d_assimp" -SRCREV_qt3d = "70909e158ceddc9cc4ff6d16c29e7d5695c8dbc2" +SRCREV_qt3d = "c90fa629576f6eb29ecbad3995d9b0e866aea0bf" SRCREV_assimp = "1620a72e5820d7c680f6f5da10a3481ceb4e53c2" diff --git a/recipes-qt/qt6/qt5compat_git.bb b/recipes-qt/qt6/qt5compat_git.bb index fa68b62..b62e9fe 100644 --- a/recipes-qt/qt6/qt5compat_git.bb +++ b/recipes-qt/qt6/qt5compat_git.bb @@ -17,4 +17,4 @@ DEPENDS += "qtbase" PACKAGECONFIG[iconv] = "-DFEATURE_iconv=ON,-DFEATURE_iconv=OFF,virtual/libiconv" -SRCREV = "6a7a90311ee43e3b505f7fd64f1ed1f5811881e5" +SRCREV = "c159acd0ce1ac30429236e04ff5b85fe0dc775b1" diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index d6a7b9c..0c3b6c4 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -152,4 +152,4 @@ FILES_${PN}-tools += "\ BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "3f7e3983d53c01f057af0335cf9db4e736f1552a" +SRCREV = "c7deb3400faa1d9389137fe63ffbffade8203850" diff --git a/recipes-qt/qt6/qtcharts_git.bb b/recipes-qt/qt6/qtcharts_git.bb index 6994291..7c6c63d 100644 --- a/recipes-qt/qt6/qtcharts_git.bb +++ b/recipes-qt/qt6/qtcharts_git.bb @@ -13,4 +13,4 @@ DEPENDS += "qtbase" PACKAGECONFIG ?= "qml" PACKAGECONFIG[qml] = ",,qtdeclarative" -SRCREV = "87402a314c47a7f61ef248ff7d6732496b366332" +SRCREV = "e495ed809af4da013df4c018487924fd17092054" diff --git a/recipes-qt/qt6/qtcoap_git.bb b/recipes-qt/qt6/qtcoap_git.bb index ee145b4..af34093 100644 --- a/recipes-qt/qt6/qtcoap_git.bb +++ b/recipes-qt/qt6/qtcoap_git.bb @@ -8,10 +8,8 @@ inherit qt6-cmake include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6.inc -QT_MODULE_BRANCH = "6.1" - DEPENDS += "qtbase" PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative" -SRCREV = "837c5b669b4aeadf6dd9e3eeb7705e2fa0a4b37b" +SRCREV = "11d09d16b5f42c383da4642805a1cc5619dd857b" diff --git a/recipes-qt/qt6/qtdatavis3d_git.bb b/recipes-qt/qt6/qtdatavis3d_git.bb index 0994e40..a5347c8 100644 --- a/recipes-qt/qt6/qtdatavis3d_git.bb +++ b/recipes-qt/qt6/qtdatavis3d_git.bb @@ -10,4 +10,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase qtdeclarative" -SRCREV = "5bc59e6f15a228d8f2b3f36e7d51e265ba732ba3" +SRCREV = "c57ad536f135743796685d2338c88ee07e145abe" diff --git a/recipes-qt/qt6/qtdeclarative_git.bb b/recipes-qt/qt6/qtdeclarative_git.bb index c040cd1..460bce4 100644 --- a/recipes-qt/qt6/qtdeclarative_git.bb +++ b/recipes-qt/qt6/qtdeclarative_git.bb @@ -16,4 +16,4 @@ DEPENDS += "qtbase qtdeclarative-native" BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "c2d0b2973037c7656d7b69d28fcc3be0005e3935" +SRCREV = "c113eeb2a48d574921aa0a52e950c8994f03f2f6" diff --git a/recipes-qt/qt6/qtimageformats_git.bb b/recipes-qt/qt6/qtimageformats_git.bb index a228952..9941048 100644 --- a/recipes-qt/qt6/qtimageformats_git.bb +++ b/recipes-qt/qt6/qtimageformats_git.bb @@ -24,4 +24,4 @@ PACKAGECONFIG[mng] = "-DFEATURE_mng=ON,-DFEATURE_mng=OFF,libmng" PACKAGECONFIG[tiff] = "-DFEATURE_tiff=ON,-DFEATURE_libtiff=OFF,tiff" PACKAGECONFIG[webp] = "-DFEATURE_webp=ON,-DFEATURE_webp=OFF,libwebp" -SRCREV = "2bf84fc57f35aa18f81e2f7596552216c7854157" +SRCREV = "8c41ef190d496cd63ba75f9df96b3eae78307069" diff --git a/recipes-qt/qt6/qtlottie_git.bb b/recipes-qt/qt6/qtlottie_git.bb index 36ce3a0..179313a 100644 --- a/recipes-qt/qt6/qtlottie_git.bb +++ b/recipes-qt/qt6/qtlottie_git.bb @@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase qtdeclarative" -SRCREV = "10db9d715439ccf1a81554a1f2786c72d15b30da" +SRCREV = "77e7e6288d70ed5e5d9f0861d9bb5fbd3b1a5814" diff --git a/recipes-qt/qt6/qtmqtt_git.bb b/recipes-qt/qt6/qtmqtt_git.bb index e7f2ced..462d8d5 100644 --- a/recipes-qt/qt6/qtmqtt_git.bb +++ b/recipes-qt/qt6/qtmqtt_git.bb @@ -9,10 +9,8 @@ inherit qt6-cmake include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6.inc -QT_MODULE_BRANCH = "6.1" - DEPENDS += "qtbase" PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtwebsockets" -SRCREV = "7efcbffc0f67d8a739f734868c808072c1c82ce1" +SRCREV = "1eb2a440389c10ed0b7a26b8f9721b6b14870572" diff --git a/recipes-qt/qt6/qtnetworkauth_git.bb b/recipes-qt/qt6/qtnetworkauth_git.bb index 7aa251a..4c5b473 100644 --- a/recipes-qt/qt6/qtnetworkauth_git.bb +++ b/recipes-qt/qt6/qtnetworkauth_git.bb @@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase" -SRCREV = "d2cb87279d07e50b68b4cbf76587c0f9893b08b7" +SRCREV = "3d43f9690f7f55552c5f1c76332ce8aec0248965" diff --git a/recipes-qt/qt6/qtopcua_git.bb b/recipes-qt/qt6/qtopcua_git.bb index 6e365e6..df090ec 100644 --- a/recipes-qt/qt6/qtopcua_git.bb +++ b/recipes-qt/qt6/qtopcua_git.bb @@ -10,8 +10,6 @@ inherit qt6-cmake include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6.inc -QT_MODULE_BRANCH = "6.1" - PACKAGECONFIG ?= "qtdeclarative" PACKAGECONFIG[qtdeclarative] = ",,qtdeclarative" PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,,qtquickcontrols2" @@ -23,4 +21,4 @@ SECURITY_STRINGFORMAT = "" DEPENDS += "qtbase" -SRCREV = "b3e27fc73cf5faf22a9679f03046e09037a738c9" +SRCREV = "192178e396b83608fe29effc49ed288dac4e036d" diff --git a/recipes-qt/qt6/qtquick3d_git.bb b/recipes-qt/qt6/qtquick3d_git.bb index 9439c24..aa1b2f9 100644 --- a/recipes-qt/qt6/qtquick3d_git.bb +++ b/recipes-qt/qt6/qtquick3d_git.bb @@ -25,5 +25,5 @@ FILES_${PN}-qmlplugins += " \ " SRCREV_FORMAT = "qtquick3d_assimp" -SRCREV_qtquick3d = "642b3ff7164358cd491b324c21f77365842c85cf" +SRCREV_qtquick3d = "b51540171742fa435ce061ae3963cd52d60d8618" SRCREV_assimp = "1620a72e5820d7c680f6f5da10a3481ceb4e53c2" diff --git a/recipes-qt/qt6/qtquickcontrols2_git.bb b/recipes-qt/qt6/qtquickcontrols2_git.bb index 76ac622..da9b900 100644 --- a/recipes-qt/qt6/qtquickcontrols2_git.bb +++ b/recipes-qt/qt6/qtquickcontrols2_git.bb @@ -12,4 +12,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS = "qtbase qtdeclarative" -SRCREV = "30ece96a421848cb9a63f59347f1598e9529d08d" +SRCREV = "961a6423a8b233eb33769ed0e841f06ddbc8b135" diff --git a/recipes-qt/qt6/qtquicktimeline_git.bb b/recipes-qt/qt6/qtquicktimeline_git.bb index a3238c3..0992b5a 100644 --- a/recipes-qt/qt6/qtquicktimeline_git.bb +++ b/recipes-qt/qt6/qtquicktimeline_git.bb @@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS = "qtbase qtdeclarative" -SRCREV = "79a4c2db415b846d9805a958300e2ad566da89d5" +SRCREV = "60b21c9e4f68da892027b4840d202243ea53e89f" diff --git a/recipes-qt/qt6/qtscxml_git.bb b/recipes-qt/qt6/qtscxml_git.bb index 71fa975..3654771 100644 --- a/recipes-qt/qt6/qtscxml_git.bb +++ b/recipes-qt/qt6/qtscxml_git.bb @@ -18,4 +18,4 @@ PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native" BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "c342b6cb69dc343189a419c3c48264ed23180b35" +SRCREV = "62c63ec7092629e78536122cc4aee2a526c2ab1f" diff --git a/recipes-qt/qt6/qtshadertools_git.bb b/recipes-qt/qt6/qtshadertools_git.bb index 8939506..f8eee31 100644 --- a/recipes-qt/qt6/qtshadertools_git.bb +++ b/recipes-qt/qt6/qtshadertools_git.bb @@ -12,4 +12,4 @@ DEPENDS = "qtbase qtshadertools-native" BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "dfa274347f3247473d3ef2bd60ed2f3d889d12c6" +SRCREV = "206fb6f62f23818c2af39a57e4c13c58fc4768a5" diff --git a/recipes-qt/qt6/qtsvg_git.bb b/recipes-qt/qt6/qtsvg_git.bb index 019bdaf..ec51999 100644 --- a/recipes-qt/qt6/qtsvg_git.bb +++ b/recipes-qt/qt6/qtsvg_git.bb @@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase" -SRCREV = "cb27084eb76c6ff4c2d63095ef69832cea672ee6" +SRCREV = "87ff76285f18bfdaa8cdebb39b6fbcb6c47c90d6" diff --git a/recipes-qt/qt6/qttools_git.bb b/recipes-qt/qt6/qttools_git.bb index 44bd6ec..395e444 100644 --- a/recipes-qt/qt6/qttools_git.bb +++ b/recipes-qt/qt6/qttools_git.bb @@ -18,4 +18,4 @@ FILES_${PN}-tools += "${QT6_INSTALL_DATADIR}/phrasebooks" BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "a9cb0908bf5532938956f13b31e020860885ed34" +SRCREV = "bbe8eb575a5e25a99d487a7e856958649e5a7463" diff --git a/recipes-qt/qt6/qttranslations_git.bb b/recipes-qt/qt6/qttranslations_git.bb index df55523..9376e8f 100644 --- a/recipes-qt/qt6/qttranslations_git.bb +++ b/recipes-qt/qt6/qttranslations_git.bb @@ -25,4 +25,4 @@ python split_translation_packages () { d.setVar('RRECOMMENDS_' + pn, ' '.join(pkgs)) } -SRCREV = "e8d039895dd9e69e78d1bc61ad847c9cc2f6eb2d" +SRCREV = "0abd6a0b2e8abe008c602d387343efd5658b0aea" diff --git a/recipes-qt/qt6/qtvirtualkeyboard_git.bb b/recipes-qt/qt6/qtvirtualkeyboard_git.bb index 8d815c9..183a6cc 100644 --- a/recipes-qt/qt6/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt6/qtvirtualkeyboard_git.bb @@ -116,4 +116,4 @@ FILES_${PN}-dictionaries = "${QT6_INSTALL_DATADIR}/qtvirtualkeyboard/*/*.dat" DEPENDS += "qtbase qtdeclarative qtsvg qtdeclarative-native" -SRCREV = "38a1c641544f6255d9f0626b2308c56c6a2f5123" +SRCREV = "81f9dd7fc819009cdb6ab4fb4a88746b662dee8d" diff --git a/recipes-qt/qt6/qtwayland_git.bb b/recipes-qt/qt6/qtwayland_git.bb index eb9d22e..ebae7b3 100644 --- a/recipes-qt/qt6/qtwayland_git.bb +++ b/recipes-qt/qt6/qtwayland_git.bb @@ -37,4 +37,4 @@ DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native" BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "109055931a5f77ab6fa3631f66e9fbb3adced381" +SRCREV = "6c51697d09d2ebb2bc58a189a046f16372b3cf1a" |