qt6: update submodulesv6.2.0-beta3

* Update to latest content in Qt 6.2 branch
* qtquickcontrols2: remove recipe & references
  (quickcontrols2 was merged into qtdeclarative
  module, see QTBUG-95173)
* Proposed 6.2.0 beta3 content - one qtdeclarative patch
  added on top of that to be able to build native side
  successfully (accessibility disabled)

Task-number: QTBUG-91012
Change-Id: Ie72f98518ceae98b83ceddb4b97a3772c40a9185
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

35 files changed, 140 insertions, 198 deletions

diff --git a/coin/test-configs.inc b/coin/test-configs.inc
index 0096741..ee6f6c5 100644
--- a/coin/test-configs.inc
+++ b/coin/test-configs.inc
@@ -66,7 +66,6 @@ PACKAGECONFIG_append_pn-qtnetworkauth = " examples"
 PACKAGECONFIG_append_pn-qtopcua = " examples"
 PACKAGECONFIG_append_pn-qtpositioning = " examples"
 PACKAGECONFIG_append_pn-qtquick3d = " examples"
-PACKAGECONFIG_append_pn-qtquickcontrols2 = " examples"
 PACKAGECONFIG_append_pn-qtquickdesigner-components = " examples"
 PACKAGECONFIG_append_pn-qtquicktimeline = " examples"
 PACKAGECONFIG_append_pn-qtremoteobjects = " examples"
diff --git a/recipes-qt/packagegroups/packagegroup-qt6-essentials.bb b/recipes-qt/packagegroups/packagegroup-qt6-essentials.bb
index 447df08..c2c89bb 100644
--- a/recipes-qt/packagegroups/packagegroup-qt6-essentials.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt6-essentials.bb
@@ -10,7 +10,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 RDEPENDS_${PN} += " \
     qtbase \
     qtdeclarative \
-    qtquickcontrols2 \
     qttools \
     qttranslations-qtbase \
     qttranslations-qtdeclarative \
diff --git a/recipes-qt/qt6/qt3d_git.bb b/recipes-qt/qt6/qt3d_git.bb
index fb5b58c..39c2abc 100644
--- a/recipes-qt/qt6/qt3d_git.bb
+++ b/recipes-qt/qt6/qt3d_git.bb
@@ -27,5 +27,5 @@ PACKAGECONFIG[system-assimp] = "-DFEATURE_qt3d_system_assimp=ON,-DQT_FEATURE_qt3
 PACKAGECONFIG[qtgamepad] = ",,qtgamepad"
 
 SRCREV_FORMAT = "qt3d_assimp"
-SRCREV_qt3d = "7223a82e1422254630440bf9137a7d9f277f54b4"
+SRCREV_qt3d = "2b1ce6801810c238c58c3dc4401aff0ba0173c8e"
 SRCREV_assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5"
diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb
index 7186fa1..c42a5cd 100644
--- a/recipes-qt/qt6/qtbase_git.bb
+++ b/recipes-qt/qt6/qtbase_git.bb
@@ -156,4 +156,4 @@ INHIBIT_PACKAGE_STRIP_FILES = "\
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "db07894dae794082122baebf577d952c6978eb8b"
+SRCREV = "ff31815659cf4e2d2ce50795f8bd665fd02f9389"
diff --git a/recipes-qt/qt6/qtcharts_git.bb b/recipes-qt/qt6/qtcharts_git.bb
index 69efb35..7c755ae 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 = "cf49304ee07ee1548550d1a93a5b9bb83a134e43"
+SRCREV = "c6b38dc481c90d8e41a9e64b6c32b57a9b041ea0"
diff --git a/recipes-qt/qt6/qtcoap_git.bb b/recipes-qt/qt6/qtcoap_git.bb
index 62842bf..7682a82 100644
--- a/recipes-qt/qt6/qtcoap_git.bb
+++ b/recipes-qt/qt6/qtcoap_git.bb
@@ -12,4 +12,4 @@ DEPENDS += "qtbase"
 
 PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative"
 
-SRCREV = "984d064d08ab531aad127ba66ec03c912a6379ab"
+SRCREV = "276d31870820228e405fde22e7b4d97d1304b7a9"
diff --git a/recipes-qt/qt6/qtconnectivity_git.bb b/recipes-qt/qt6/qtconnectivity_git.bb
index 4bc8c38..ae5664e 100644
--- a/recipes-qt/qt6/qtconnectivity_git.bb
+++ b/recipes-qt/qt6/qtconnectivity_git.bb
@@ -20,4 +20,4 @@ DEPENDS += "qtbase qtdeclarative"
 PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}"
 PACKAGECONFIG[bluez] = "-DFEATURE_bluez=ON,-DFEATURE_bluez=OFF,bluez5"
 
-SRCREV = "63508b1ac9b53ecfb8606b742dc6a9a119eba8de"
+SRCREV = "31750b0b2fce4a9fd24704285d877bf92a56f321"
diff --git a/recipes-qt/qt6/qtdatavis3d_git.bb b/recipes-qt/qt6/qtdatavis3d_git.bb
index a981300..c6b9c0d 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 = "0d3113a7c02bfeb166c1e626b6a62fb6fb4ba89b"
+SRCREV = "2c547a9472688e1d2ccb29dc2f913fc67c956e6d"
diff --git a/recipes-qt/qt6/qtdeclarative/0001-Fix-build-without-accessibility.patch b/recipes-qt/qt6/qtdeclarative/0001-Fix-build-without-accessibility.patch
new file mode 100644
index 0000000..a6b271f
--- /dev/null
+++ b/recipes-qt/qt6/qtdeclarative/0001-Fix-build-without-accessibility.patch
@@ -0,0 +1,104 @@
+From 366d509afdb2e6384a9cd5a6e3c0bfe9f9239107 Mon Sep 17 00:00:00 2001
+From: Mitch Curtis <mitch.curtis@qt.io>
+Date: Fri, 13 Aug 2021 11:07:57 +0200
+Subject: [PATCH] Fix build without accessibility
+
+Amends 4b1acb290dc8869d0d2d1250dc1ed415d6b6e202 and friends.
+
+Pick-to: 6.2
+Change-Id: Ida44dd5e1865673878601da97685fd1aa19c40c3
+---
+ src/quicknativestyle/qstyle/qquickstylehelper.cpp | 3 ++-
+ src/quicknativestyle/qstyle/qquickstylehelper_p.h | 4 ++++
+ src/quicktemplates2/CMakeLists.txt                | 6 +++++-
+ src/quicktemplates2/qtquicktemplates2global.cpp   | 5 +++++
+ 4 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/src/quicknativestyle/qstyle/qquickstylehelper.cpp b/src/quicknativestyle/qstyle/qquickstylehelper.cpp
+index ebc82864f9..fdc60b6468 100644
+--- a/src/quicknativestyle/qstyle/qquickstylehelper.cpp
++++ b/src/quicknativestyle/qstyle/qquickstylehelper.cpp
+@@ -114,6 +114,7 @@ qreal dpiScaled(qreal value, const QStyleOption *option)
+     return dpiScaled(value, dpi(option));
+ }
+ 
++#if QT_CONFIG(accessibility)
+ bool isInstanceOf(QObject *obj, QAccessible::Role role)
+ {
+     bool match = false;
+@@ -134,7 +135,7 @@ bool hasAncestor(QObject *obj, QAccessible::Role role)
+     }
+     return found;
+ }
+-
++#endif
+ 
+ int calcBigLineSize(int radius)
+ {
+diff --git a/src/quicknativestyle/qstyle/qquickstylehelper_p.h b/src/quicknativestyle/qstyle/qquickstylehelper_p.h
+index 757d647d36..d2a9636be9 100644
+--- a/src/quicknativestyle/qstyle/qquickstylehelper_p.h
++++ b/src/quicknativestyle/qstyle/qquickstylehelper_p.h
+@@ -39,7 +39,9 @@
+ #include <QtGui/qpaintdevice.h>
+ #include <QtGui/qpolygon.h>
+ #include <QtCore/qstringbuilder.h>
++#if QT_CONFIG(accessibility)
+ #include <QtGui/qaccessible.h>
++#endif
+ 
+ #ifndef QSTYLEHELPER_P_H
+ #define QSTYLEHELPER_P_H
+@@ -84,8 +86,10 @@ namespace QStyleHelper
+                      int left = 0, int top = 0, int right = 0,
+                      int bottom = 0);
+ 
++#if QT_CONFIG(accessibility)
+     bool isInstanceOf(QObject *obj, QAccessible::Role role);
+     bool hasAncestor(QObject *obj, QAccessible::Role role);
++#endif
+     QColor backgroundColor(const QPalette &pal);
+ 
+     enum WidgetSizePolicy { SizeLarge = 0, SizeSmall = 1, SizeMini = 2, SizeDefault = -1 };
+diff --git a/src/quicktemplates2/CMakeLists.txt b/src/quicktemplates2/CMakeLists.txt
+index 80b05013ad..3ddb994cc1 100644
+--- a/src/quicktemplates2/CMakeLists.txt
++++ b/src/quicktemplates2/CMakeLists.txt
+@@ -12,7 +12,6 @@ qt_internal_add_qml_module(QuickTemplates2
+     NO_PLUGIN_OPTIONAL
+     NO_GENERATE_PLUGIN_SOURCE
+     SOURCES
+-        accessible/qaccessiblequickpage.cpp accessible/qaccessiblequickpage_p.h
+         qquickabstractbutton.cpp qquickabstractbutton_p.h
+         qquickabstractbutton_p_p.h
+         qquickaction.cpp qquickaction_p.h
+@@ -144,6 +143,11 @@ qt_internal_extend_target(QuickTemplates2 CONDITION TARGET Qt::QmlModels
+         Qt::QmlModelsPrivate
+ )
+ 
++qt_internal_extend_target(QuickTemplates2 CONDITION QT_FEATURE_accessibility
++    SOURCES
++        accessible/qaccessiblequickpage.cpp accessible/qaccessiblequickpage_p.h
++)
++
+ qt_internal_extend_target(QuickTemplates2 CONDITION QT_FEATURE_quick_tableview
+     SOURCES
+         qquickheaderview.cpp qquickheaderview_p.h
+diff --git a/src/quicktemplates2/qtquicktemplates2global.cpp b/src/quicktemplates2/qtquicktemplates2global.cpp
+index 5d7816b411..52a426ff70 100644
+--- a/src/quicktemplates2/qtquicktemplates2global.cpp
++++ b/src/quicktemplates2/qtquicktemplates2global.cpp
+@@ -36,8 +36,13 @@
+ ** $QT_END_LICENSE$
+ **
+ ****************************************************************************/
++
++#include "qtquicktemplates2global_p.h"
++
++#if QT_CONFIG(accessibility)
+ #include "qquickpage_p.h"
+ #include "accessible/qaccessiblequickpage_p.h"
++#endif
+ 
+ QT_BEGIN_NAMESPACE
+ 
diff --git a/recipes-qt/qt6/qtdeclarative_git.bb b/recipes-qt/qt6/qtdeclarative_git.bb
index 07f3e30..8300005 100644
--- a/recipes-qt/qt6/qtdeclarative_git.bb
+++ b/recipes-qt/qt6/qtdeclarative_git.bb
@@ -12,8 +12,12 @@ inherit qt6-cmake
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
+SRC_URI += "\
+    file://0001-Fix-build-without-accessibility.patch \
+"
+
 DEPENDS += "qtbase qtshadertools qtshadertools-native qtdeclarative-native"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "e47556661b0208f6201e2eb1d9d61094586cd845"
+SRCREV = "533a262e0b332b72481929420914d527f2a83599"
diff --git a/recipes-qt/qt6/qtimageformats_git.bb b/recipes-qt/qt6/qtimageformats_git.bb
index 8f99fb1..9ff4b06 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 = "867f0f9c7c7745f21f651b6565b42e74da8eeee8"
+SRCREV = "f660b31facf8b84a7ef312b5931e48d8ac3f54e8"
diff --git a/recipes-qt/qt6/qtlottie_git.bb b/recipes-qt/qt6/qtlottie_git.bb
index 8646c0a..a9675b3 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 = "1f1878818ae0065034c34a50dabe2d6eacbda980"
+SRCREV = "8981d114316e447603a91f534cb29cb67606576f"
diff --git a/recipes-qt/qt6/qtmqtt_git.bb b/recipes-qt/qt6/qtmqtt_git.bb
index 7c3e3d1..3f089e4 100644
--- a/recipes-qt/qt6/qtmqtt_git.bb
+++ b/recipes-qt/qt6/qtmqtt_git.bb
@@ -13,4 +13,4 @@ DEPENDS += "qtbase"
 
 PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtwebsockets"
 
-SRCREV = "85f7ad791c284576aa5bd7e96c5f2311f252a8b0"
+SRCREV = "42b4328e04ed5753da0289ecd00611bb58a087ca"
diff --git a/recipes-qt/qt6/qtmultimedia/0001-Use-private-permission-API.patch b/recipes-qt/qt6/qtmultimedia/0001-Use-private-permission-API.patch
deleted file mode 100644
index c2c998a..0000000
--- a/recipes-qt/qt6/qtmultimedia/0001-Use-private-permission-API.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From 7054093fdb8ae9c56fd6488be71af2c5cc4e0c4e Mon Sep 17 00:00:00 2001
-From: Assam Boudjelthia <assam.boudjelthia@qt.io>
-Date: Mon, 26 Jul 2021 14:53:13 +0300
-Subject: [PATCH] Use private permission API
-
-The public permission API is being postponed until 6.3, for now,
-we can use the private API.
-
-Change-Id: Idbcbe06996f8334bd7d5b4cab86132c35fdc0862
-Reviewed-by: Lars Knoll <lars.knoll@qt.io>
----
- examples/multimedia/video/qmlvideo/main.cpp       |  8 --------
- examples/multimedia/video/qmlvideofx/main.cpp     |  8 --------
- .../android/audio/qandroidaudiosource.cpp         |  7 ++++---
- .../android/common/qandroidmultimediautils.cpp    | 15 ++++++++-------
- 4 files changed, 12 insertions(+), 26 deletions(-)
-
-diff --git a/examples/multimedia/video/qmlvideo/main.cpp b/examples/multimedia/video/qmlvideo/main.cpp
-index ea5d41033..e288c0ae4 100644
---- a/examples/multimedia/video/qmlvideo/main.cpp
-+++ b/examples/multimedia/video/qmlvideo/main.cpp
-@@ -73,14 +73,6 @@ int main(int argc, char *argv[])
-     PerformanceMonitor::qmlRegisterTypes();
- #endif
- 
--#if QT_VERSION >= QT_VERSION_CHECK(6, 2, 0)
--    auto permission = QPermission::WriteStorage;
--    if (QCoreApplication::requestPermission(permission).result() != QPermission::Authorized) {
--        qWarning() << "Couldn't get 'WriteStorage' permission!";
--        return -1;
--    }
--#endif
--
-     QString source1, source2;
-     qreal volume = 0.5;
-     QStringList args = app.arguments();
-diff --git a/examples/multimedia/video/qmlvideofx/main.cpp b/examples/multimedia/video/qmlvideofx/main.cpp
-index 6be3623ef..814c85368 100644
---- a/examples/multimedia/video/qmlvideofx/main.cpp
-+++ b/examples/multimedia/video/qmlvideofx/main.cpp
-@@ -69,14 +69,6 @@ int main(int argc, char *argv[])
-     PerformanceMonitor::qmlRegisterTypes();
- #endif
- 
--#if QT_VERSION >= QT_VERSION_CHECK(6, 2, 0)
--    auto permission = QPermission::WriteStorage;
--    if (QCoreApplication::requestPermission(permission).result() != QPermission::Authorized) {
--        qWarning() << "Couldn't get 'WriteStorage' permission!";
--        return -1;
--    }
--#endif
--
-     QUrl fileName;
-     qreal volume = 0.5;
-     QStringList args = app.arguments();
-diff --git a/src/multimedia/platform/android/audio/qandroidaudiosource.cpp b/src/multimedia/platform/android/audio/qandroidaudiosource.cpp
-index e898f8369..c7eaf57ad 100644
---- a/src/multimedia/platform/android/audio/qandroidaudiosource.cpp
-+++ b/src/multimedia/platform/android/audio/qandroidaudiosource.cpp
-@@ -41,6 +41,7 @@
- 
- #include "qopenslesengine_p.h"
- #include <private/qaudiohelpers_p.h>
-+#include <QtCore/private/qandroidextras_p.h>
- #include <qbuffer.h>
- #include <qdebug.h>
- 
-@@ -61,12 +62,12 @@ static bool hasRecordingPermission()
-     if (QNativeInterface::QAndroidApplication::sdkVersion() < 23)
-         return true;
- 
--    const QPermission::PermissionType key(QPermission::Microphone);
-+    const QtAndroidPrivate::PermissionType key(QtAndroidPrivate::Microphone);
-     // Permission already granted?
--    if (QCoreApplication::checkPermission(key).result() == QPermission::Authorized)
-+    if (QtAndroidPrivate::checkPermission(key).result() == QtAndroidPrivate::Authorized)
-         return true;
- 
--    if (QCoreApplication::requestPermission(key).result() != QPermission::Authorized) {
-+    if (QtAndroidPrivate::requestPermission(key).result() != QtAndroidPrivate::Authorized) {
-         qDebug("Microphone permission denied by user!");
-         return false;
-     }
-diff --git a/src/multimedia/platform/android/common/qandroidmultimediautils.cpp b/src/multimedia/platform/android/common/qandroidmultimediautils.cpp
-index 79c01a68f..51c08006f 100644
---- a/src/multimedia/platform/android/common/qandroidmultimediautils.cpp
-+++ b/src/multimedia/platform/android/common/qandroidmultimediautils.cpp
-@@ -42,6 +42,7 @@
- 
- #include <qlist.h>
- #include <QtCore/qcoreapplication.h>
-+#include <QtCore/private/qandroidextras_p.h>
- 
- QT_BEGIN_NAMESPACE
- 
-@@ -108,16 +109,16 @@ AndroidCamera::ImageFormat qt_androidImageFormatFromPixelFormat(QVideoFrameForma
-     }
- }
- 
--static bool androidRequestPermission(QPermission::PermissionType key)
-+static bool androidRequestPermission(QtAndroidPrivate::PermissionType key)
- {
-     if (QNativeInterface::QAndroidApplication::sdkVersion() < 23)
-         return true;
- 
-     // Permission already granted?
--    if (QCoreApplication::checkPermission(key).result() == QPermission::Authorized)
-+    if (QtAndroidPrivate::checkPermission(key).result() == QtAndroidPrivate::Authorized)
-         return true;
- 
--    if (QCoreApplication::requestPermission(key).result() != QPermission::Authorized)
-+    if (QtAndroidPrivate::requestPermission(key).result() != QtAndroidPrivate::Authorized)
-         return false;
- 
-     return true;
-@@ -125,7 +126,7 @@ static bool androidRequestPermission(QPermission::PermissionType key)
- 
- bool qt_androidRequestCameraPermission()
- {
--    if (!androidRequestPermission(QPermission::Camera)) {
-+    if (!androidRequestPermission(QtAndroidPrivate::Camera)) {
-         qCDebug(qtAndroidMediaPlugin, "Camera permission denied by user!");
-         return false;
-     }
-@@ -135,7 +136,7 @@ bool qt_androidRequestCameraPermission()
- 
- bool qt_androidRequestRecordingPermission()
- {
--    if (!androidRequestPermission(QPermission::Microphone)) {
-+    if (!androidRequestPermission(QtAndroidPrivate::Microphone)) {
-         qCDebug(qtAndroidMediaPlugin, "Microphone permission denied by user!");
-         return false;
-     }
-@@ -145,8 +146,8 @@ bool qt_androidRequestRecordingPermission()
- 
- bool qt_androidRequestWriteStoragePermission()
- {
--    if (!androidRequestPermission(QPermission::WriteStorage)) {
--        qCDebug(qtAndroidMediaPlugin, "WriteStorage permission denied by user!");
-+    if (!androidRequestPermission(QtAndroidPrivate::Storage)) {
-+        qCDebug(qtAndroidMediaPlugin, "Storage permission denied by user!");
-         return false;
-     }
- 
diff --git a/recipes-qt/qt6/qtmultimedia_git.bb b/recipes-qt/qt6/qtmultimedia_git.bb
index 82d200c..365af7a 100644
--- a/recipes-qt/qt6/qtmultimedia_git.bb
+++ b/recipes-qt/qt6/qtmultimedia_git.bb
@@ -12,8 +12,6 @@ inherit qt6-cmake
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
-SRC_URI += "file://0001-Use-private-permission-API.patch"
-
 DEPENDS += "qtbase qtshadertools qtshadertools-native"
 
 PACKAGECONFIG ?= "gstreamer qml"
@@ -24,4 +22,4 @@ PACKAGECONFIG[qml] = ",,qtdeclarative"
 
 EXTRA_OECMAKE += "-DFEATURE_gpu_vivante=OFF"
 
-SRCREV = "ae315bc2017151232a9e1ce22104a9b179f82d0f"
+SRCREV = "1f8bc05b30e7a3bcf3c721a95915e5adb691db61"
diff --git a/recipes-qt/qt6/qtnetworkauth_git.bb b/recipes-qt/qt6/qtnetworkauth_git.bb
index b434c7c..cc981d8 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 = "66cf62bda44e1193d703123dc2e13cfabe580625"
+SRCREV = "da418e4a2923b301ec7d6497bde1e4a5f50090ba"
diff --git a/recipes-qt/qt6/qtopcua_git.bb b/recipes-qt/qt6/qtopcua_git.bb
index 20058a5..186ed92 100644
--- a/recipes-qt/qt6/qtopcua_git.bb
+++ b/recipes-qt/qt6/qtopcua_git.bb
@@ -12,7 +12,6 @@ include recipes-qt/qt6/qt6.inc
 
 PACKAGECONFIG ?= "qml"
 PACKAGECONFIG[qml] = ",,qtdeclarative"
-PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,,qtquickcontrols2"
 
 # src/3rdparty/open62541.pri adds -Wno-format, causing following error
 # because -Wformat-security cannot be used together with -Wno-format
@@ -21,4 +20,4 @@ SECURITY_STRINGFORMAT = ""
 
 DEPENDS += "qtbase"
 
-SRCREV = "10fa39de598cd3cb85efff5b109e7bac1867fb70"
+SRCREV = "deed4dc1daabab36d2fe1f0211325480c7a0337e"
diff --git a/recipes-qt/qt6/qtpositioning_git.bb b/recipes-qt/qt6/qtpositioning_git.bb
index 7910b01..2387913 100644
--- a/recipes-qt/qt6/qtpositioning_git.bb
+++ b/recipes-qt/qt6/qtpositioning_git.bb
@@ -17,7 +17,6 @@ QT_MODULE = "qtlocation"
 DEPENDS += "qtbase"
 
 PACKAGECONFIG ?= "nmea qml"
-PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative,qtquickcontrols2"
 PACKAGECONFIG[geoclue] = ",,,geoclue"
 PACKAGECONFIG[gypsy] = "-DFEATURE_gypsy=ON,-DFEATURE_gypsy=OFF,gconf gypsy"
 PACKAGECONFIG[nmea] = ",,qtserialport"
diff --git a/recipes-qt/qt6/qtquick3d_git.bb b/recipes-qt/qt6/qtquick3d_git.bb
index 43042f9..e9724c4 100644
--- a/recipes-qt/qt6/qtquick3d_git.bb
+++ b/recipes-qt/qt6/qtquick3d_git.bb
@@ -26,5 +26,5 @@ FILES_${PN}-qmlplugins += " \
 "
 
 SRCREV_FORMAT = "qtquick3d_assimp"
-SRCREV_qtquick3d = "0b1ee37de2e77b8aced835afdd35b3873f3adea6"
+SRCREV_qtquick3d = "f51cd5ee7ea0d0c44b5cbd27ce7c565a0d738835"
 SRCREV_assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5"
diff --git a/recipes-qt/qt6/qtquickcontrols2_git.bb b/recipes-qt/qt6/qtquickcontrols2_git.bb
deleted file mode 100644
index c188a22..0000000
--- a/recipes-qt/qt6/qtquickcontrols2_git.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-LICENSE = "GFDL-1.3 & BSD & ( LGPL-3.0 | GPL-3.0 ) | The-Qt-Company-Commercial"
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
-    file://LICENSE.LGPLv3;md5=382747d0119037529ec2b98b24038eb0 \
-    file://LICENSE.GPLv3;md5=dce746aa5261707df6d6999ab9958d8b \
-"
-
-inherit qt6-cmake
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6.inc
-
-DEPENDS = "qtbase qtdeclarative"
-
-SRCREV = "838312559daf13847646a2a42c6ff5e0d532037f"
diff --git a/recipes-qt/qt6/qtquickdesigner-components_git.bb b/recipes-qt/qt6/qtquickdesigner-components_git.bb
index 05ab6cb..a64b2cc 100644
--- a/recipes-qt/qt6/qtquickdesigner-components_git.bb
+++ b/recipes-qt/qt6/qtquickdesigner-components_git.bb
@@ -11,6 +11,6 @@ include recipes-qt/qt6/qt6.inc
 QT_GIT_PROJECT = "qt-labs"
 QT_MODULE_BRANCH = "dev"
 
-DEPENDS += "qtbase qtdeclarative qtquickcontrols2"
+DEPENDS += "qtbase qtdeclarative"
 
-SRCREV = "73b955890b76275724dcfe29cd610da80e1c28fc"
+SRCREV = "fe8530506fae821a0c783775a9d0ea3c6bf62e9a"
diff --git a/recipes-qt/qt6/qtquicktimeline_git.bb b/recipes-qt/qt6/qtquicktimeline_git.bb
index 5ca7431..96b077c 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 = "ec79c02bfb0f6548d19d89e6de630d221659d7d7"
+SRCREV = "371c96ef68cb2e5ea513ab8c21d3e3640e9f0501"
diff --git a/recipes-qt/qt6/qtremoteobjects_git.bb b/recipes-qt/qt6/qtremoteobjects_git.bb
index 3743420..9d300db 100644
--- a/recipes-qt/qt6/qtremoteobjects_git.bb
+++ b/recipes-qt/qt6/qtremoteobjects_git.bb
@@ -13,6 +13,6 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qtdeclarative qtremoteobjects-native"
 
-SRCREV = "feab5e77b1725f2b4f07448c6df450d455ab0c20"
+SRCREV = "52f137b1927835331a0cfac1cad753cb5ca36804"
 
 BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt6/qtscxml_git.bb b/recipes-qt/qt6/qtscxml_git.bb
index 1a0d907..3803474 100644
--- a/recipes-qt/qt6/qtscxml_git.bb
+++ b/recipes-qt/qt6/qtscxml_git.bb
@@ -17,4 +17,4 @@ PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "329d16643e92ebd0f901ee1ebb9be3ce1420c2dc"
+SRCREV = "699d09ac6d5af50dca978729a0f66c9e9c03ef01"
diff --git a/recipes-qt/qt6/qtsensors_git.bb b/recipes-qt/qt6/qtsensors_git.bb
index de8dd96..ed1218c 100644
--- a/recipes-qt/qt6/qtsensors_git.bb
+++ b/recipes-qt/qt6/qtsensors_git.bb
@@ -14,4 +14,4 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qtdeclarative"
 
-SRCREV = "2116d8e45158fea8cb0ceeb581aa4a9e1368581e"
+SRCREV = "6be83170a63384fb6b641f603620d1a7e41be7ef"
diff --git a/recipes-qt/qt6/qtserialbus_git.bb b/recipes-qt/qt6/qtserialbus_git.bb
index 85deb28..1163d4a 100644
--- a/recipes-qt/qt6/qtserialbus_git.bb
+++ b/recipes-qt/qt6/qtserialbus_git.bb
@@ -15,4 +15,4 @@ DEPENDS += "qtbase qtserialport qtserialbus-native"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "80a3034453d80b43a512606bae8fac1033a32eb4"
+SRCREV = "cb0d73060d480578ca99b931c0a12da67b8eed2c"
diff --git a/recipes-qt/qt6/qtserialport_git.bb b/recipes-qt/qt6/qtserialport_git.bb
index 2a78bb2..f9e9490 100644
--- a/recipes-qt/qt6/qtserialport_git.bb
+++ b/recipes-qt/qt6/qtserialport_git.bb
@@ -16,4 +16,4 @@ DEPENDS += "qtbase"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "0c2faf46e705a8c3d05c0ce67bfe40d39e4f0e2f"
+SRCREV = "603be25dee602bbe4834034e119314acdcce4b23"
diff --git a/recipes-qt/qt6/qtshadertools_git.bb b/recipes-qt/qt6/qtshadertools_git.bb
index 86c5083..5ec20ca 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 = "a6e94bbcd462333ecbe6074d82c10035f108dd49"
+SRCREV = "98c8d3dd718fe3e4f0f55d4f5ecc09a4f96c18e1"
diff --git a/recipes-qt/qt6/qtsvg_git.bb b/recipes-qt/qt6/qtsvg_git.bb
index ea9ecb1..21a8d3a 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 = "847405427ac3738ab5f1abe93868323ca8b198c3"
+SRCREV = "53e76609ac7e63fff0706cb3f258517a328a2871"
diff --git a/recipes-qt/qt6/qttools_git.bb b/recipes-qt/qt6/qttools_git.bb
index b7d237d..64aceef 100644
--- a/recipes-qt/qt6/qttools_git.bb
+++ b/recipes-qt/qt6/qttools_git.bb
@@ -25,6 +25,6 @@ BBCLASSEXTEND = "native nativesdk"
 
 SRCREV_FORMAT = "qttools_qlitehtml_litehtml"
 
-SRCREV_qttools = "06b134fb13972e0bab7cf2e7f7c38d7c35010ec0"
-SRCREV_qlitehtml = "6af5648d1208ed5760d74bd060c74ffa2bcfef6b"
-SRCREV_litehtml = "2c033bff0ba2d93e5d58303523800d03c21903d4"
+SRCREV_qttools = "03eb387498b57a09fb7272db186133cc20524afa"
+SRCREV_qlitehtml = "908670c5b68d3bcf4712019a028079b8b2042dd4"
+SRCREV_litehtml = "db7f59d5886fd50f84d48720c79dc2e6152efa83"
diff --git a/recipes-qt/qt6/qttranslations_git.bb b/recipes-qt/qt6/qttranslations_git.bb
index a7b66c2..e1b074b 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 = "043e399347a32e8d7c8ac05c21a859452a5b168c"
+SRCREV = "e5a524371af4b7dedaa65ea78450fa1851f42988"
diff --git a/recipes-qt/qt6/qtvirtualkeyboard_git.bb b/recipes-qt/qt6/qtvirtualkeyboard_git.bb
index 5bba5bc..5dfada7 100644
--- a/recipes-qt/qt6/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt6/qtvirtualkeyboard_git.bb
@@ -62,7 +62,6 @@ VKB_LANGUAGES ?= "\
 
 PACKAGECONFIG ?= "${VKB_LANGUAGES} ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'desktop', '', d)}"
 
-PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtquickcontrols2"
 PACKAGECONFIG[desktop] = "-DFEATURE_vkb_desktop=ON,-DFEATURE_vkb_desktop=OFF"
 PACKAGECONFIG[arrow-keynavigation] = "-DFEATURE_vkb_arrow_keynavigation=ON,-DFEATURE_vkb_arrow_keynavigation=OFF"
 PACKAGECONFIG[hunspell] = "-DFEATURE_hunspell=ON,-DFEATURE_hunspell=OFF,hunspell"
@@ -116,4 +115,4 @@ FILES_${PN}-dictionaries = "${QT6_INSTALL_DATADIR}/qtvirtualkeyboard/*/*.dat"
 
 DEPENDS += "qtbase qtdeclarative qtsvg qtdeclarative-native"
 
-SRCREV = "839e0c77e62296fbee6f72944eb653442656fe2b"
+SRCREV = "6227e700f4c0baa7edbeb5417abef65e5e76e1a8"
diff --git a/recipes-qt/qt6/qtwayland_git.bb b/recipes-qt/qt6/qtwayland_git.bb
index b4fec62..230ba94 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 = "15cf298aef2c8704c0e4988e784a244bce4b1492"
+SRCREV = "5a7e27830a93ee2aa275138945633041ee3af280"
diff --git a/recipes-qt/qt6/qtwebchannel_git.bb b/recipes-qt/qt6/qtwebchannel_git.bb
index 91cb267..0a9639a 100644
--- a/recipes-qt/qt6/qtwebchannel_git.bb
+++ b/recipes-qt/qt6/qtwebchannel_git.bb
@@ -18,4 +18,4 @@ PACKAGECONFIG ?= "qml"
 PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtwebsockets"
 PACKAGECONFIG[qml] = ",,qtdeclarative"
 
-SRCREV = "61e6c1f18b1054ecc9ea4cbb44860dbc7ce5f68e"
+SRCREV = "a8130b116d72139c85d2390d45ee7a6452d2f5ee"
diff --git a/recipes-qt/qt6/qtwebsockets_git.bb b/recipes-qt/qt6/qtwebsockets_git.bb
index 19c7037..33426ed 100644
--- a/recipes-qt/qt6/qtwebsockets_git.bb
+++ b/recipes-qt/qt6/qtwebsockets_git.bb
@@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qtdeclarative"
 
-SRCREV = "a8986352fbd5e414737875337e59cbd57449b1c8"
+SRCREV = "01d746025776b449f3c63126e9a90926c57b9209"