From 83d79903350fa969a1b381ed7045e893935e3ddb Mon Sep 17 00:00:00 2001
From: ericLemanissier <eric.lemanissier@gmail.com>
Date: Tue, 16 Apr 2024 08:24:11 +0200
Subject: [PATCH 1/9] qt: don't enable disabled options

fixes conan-io/conan-center-index#23567
---
 recipes/qt/5.x.x/conanfile.py | 8 +++++---
 recipes/qt/6.x.x/conanfile.py | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/recipes/qt/5.x.x/conanfile.py b/recipes/qt/5.x.x/conanfile.py
index f45348ca816a3..a0d7d351199c0 100644
--- a/recipes/qt/5.x.x/conanfile.py
+++ b/recipes/qt/5.x.x/conanfile.py
@@ -257,9 +257,11 @@ def configure(self):
 
         def _enablemodule(mod):
             if mod != "qtbase":
-                setattr(self.options, mod, True)
-            for req in submodules_tree[mod]["depends"]:
-                _enablemodule(req)
+                if getattr(self.options, mod) not in [True, False]:
+                    setattr(self.options, mod, True)
+                if getattr(self.options, mod):
+                    for req in submodules_tree[mod]["depends"]:
+                        _enablemodule(req)
 
         for module in self._submodules:
             if self.options.get_safe(module):
diff --git a/recipes/qt/6.x.x/conanfile.py b/recipes/qt/6.x.x/conanfile.py
index 4a2fb7512fa85..a603bfd3c41fa 100644
--- a/recipes/qt/6.x.x/conanfile.py
+++ b/recipes/qt/6.x.x/conanfile.py
@@ -214,9 +214,11 @@ def configure(self):
 
         def _enablemodule(mod):
             if mod != "qtbase":
-                setattr(self.options, mod, True)
-                for req in self._get_module_tree[mod]["depends"]:
-                    _enablemodule(req)
+                if getattr(self.options, mod) not in [True, False]:
+                    setattr(self.options, mod, True)
+                if getattr(self.options, mod):
+                    for req in self._get_module_tree[mod]["depends"]:
+                        _enablemodule(req)
 
         # enable all modules which are
         # - required by a module explicitely enabled by the consumer

From fcdc54b431a6af421d29c9b127b468bfdaa4dccd Mon Sep 17 00:00:00 2001
From: ericLemanissier <ericLemanissier@users.noreply.github.com>
Date: Wed, 17 Apr 2024 18:04:21 +0200
Subject: [PATCH 2/9] remove old versions

---
 recipes/qt/5.x.x/conandata.yml                | 107 ------
 .../qt/5.x.x/patches/337f28c9ab-5.15.8.patch  |  39 --
 ....7-fix-macos-cpp-lib-memory-resource.patch |  43 ---
 recipes/qt/5.x.x/qtmodules5.15.10.conf        | 326 -----------------
 recipes/qt/5.x.x/qtmodules5.15.9.conf         | 326 -----------------
 recipes/qt/6.x.x/conandata.yml                | 116 ------
 recipes/qt/6.x.x/conanfile.py                 |   5 +-
 recipes/qt/6.x.x/patches/32fa63f.patch        |  28 --
 .../fix-long-path-on-windows_6.6.0.patch      |  16 -
 .../fix-long-path-on-windows_6.6.1.patch      |  16 -
 recipes/qt/6.x.x/qtmodules6.3.2.conf          | 305 ----------------
 recipes/qt/6.x.x/qtmodules6.6.0.conf          | 338 ------------------
 recipes/qt/6.x.x/qtmodules6.6.1.conf          | 338 ------------------
 recipes/qt/6.x.x/qtmodules6.6.2.conf          | 338 ------------------
 recipes/qt/config.yml                         |  12 -
 15 files changed, 1 insertion(+), 2352 deletions(-)
 delete mode 100644 recipes/qt/5.x.x/patches/337f28c9ab-5.15.8.patch
 delete mode 100644 recipes/qt/5.x.x/patches/5.15.7-fix-macos-cpp-lib-memory-resource.patch
 delete mode 100644 recipes/qt/5.x.x/qtmodules5.15.10.conf
 delete mode 100644 recipes/qt/5.x.x/qtmodules5.15.9.conf
 delete mode 100644 recipes/qt/6.x.x/patches/32fa63f.patch
 delete mode 100644 recipes/qt/6.x.x/patches/fix-long-path-on-windows_6.6.0.patch
 delete mode 100644 recipes/qt/6.x.x/patches/fix-long-path-on-windows_6.6.1.patch
 delete mode 100644 recipes/qt/6.x.x/qtmodules6.3.2.conf
 delete mode 100644 recipes/qt/6.x.x/qtmodules6.6.0.conf
 delete mode 100644 recipes/qt/6.x.x/qtmodules6.6.1.conf
 delete mode 100644 recipes/qt/6.x.x/qtmodules6.6.2.conf

diff --git a/recipes/qt/5.x.x/conandata.yml b/recipes/qt/5.x.x/conandata.yml
index a8c2e2c8e2a71..187c3833e0f37 100644
--- a/recipes/qt/5.x.x/conandata.yml
+++ b/recipes/qt/5.x.x/conandata.yml
@@ -52,47 +52,6 @@ sources:
       - "https://ftp.jaist.ac.jp/pub/qtproject/archive/qt/5.15/5.15.11/single/qt-everywhere-opensource-src-5.15.11.tar.xz"
       - "https://ftp.yz.yamagata-u.ac.jp/pub/qtproject/archive/qt/5.15/5.15.11/single/qt-everywhere-opensource-src-5.15.11.tar.xz"
     sha256: "7426b1eaab52ed169ce53804bdd05dfe364f761468f888a0f15a308dc1dc2951"
-  "5.15.10":
-    url:
-      - "https://download.qt.io/official_releases/qt/5.15/5.15.10/single/qt-everywhere-opensource-src-5.15.10.tar.xz"
-      - "https://download.qt.io/archive/qt/5.15/5.15.10/single/qt-everywhere-opensource-src-5.15.10.tar.xz"
-      - "https://mirrors.ukfast.co.uk/sites/qt.io/archive/qt/5.15/5.15.10/single/qt-everywhere-opensource-src-5.15.10.tar.xz"
-      - "https://ftp1.nluug.nl/languages/qt/archive/qt/5.15/5.15.10/single/qt-everywhere-opensource-src-5.15.10.tar.xz"
-      - "https://ftp2.nluug.nl/languages/qt/archive/qt/5.15/5.15.10/single/qt-everywhere-opensource-src-5.15.10.tar.xz"
-      - "https://mirror.netcologne.de/qtproject/archive/qt/5.15/5.15.10/single/qt-everywhere-opensource-src-5.15.10.tar.xz"
-      - "https://qt-mirror.dannhauer.de/archive/qt/5.15/5.15.10/single/qt-everywhere-opensource-src-5.15.10.tar.xz"
-      - "https://ftp.fau.de/qtproject/archive/qt/5.15/5.15.10/single/qt-everywhere-opensource-src-5.15.10.tar.xz"
-      - "https://mirrors.dotsrc.org/qtproject/archive/qt/5.15/5.15.10/single/qt-everywhere-opensource-src-5.15.10.tar.xz"
-      - "https://ftp.acc.umu.se/mirror/qt.io/qtproject/archive/qt/5.15/5.15.10/single/qt-everywhere-opensource-src-5.15.10.tar.xz"
-      - "https://master.qt.io/archive/qt/5.15/5.15.10/single/qt-everywhere-opensource-src-5.15.10.tar.xz"
-      - "https://www.nic.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/5.15/5.15.10/single/qt-everywhere-opensource-src-5.15.10.tar.xz"
-      - "https://mirror.web4africa.ng/qt/archive/qt/5.15/5.15.10/single/qt-everywhere-opensource-src-5.15.10.tar.xz"
-      - "https://qtproject.mirror.liquidtelecom.com/archive/qt/5.15/5.15.10/single/qt-everywhere-opensource-src-5.15.10.tar.xz"
-      - "https://qt.mirror.constant.com/archive/qt/5.15/5.15.10/single/qt-everywhere-opensource-src-5.15.10.tar.xz"
-      - "https://mirrors.ustc.edu.cn/qtproject/archive/qt/5.15/5.15.10/single/qt-everywhere-opensource-src-5.15.10.tar.xz"
-      - "https://mirrors.sjtug.sjtu.edu.cn/qt/archive/qt/5.15/5.15.10/single/qt-everywhere-opensource-src-5.15.10.tar.xz"
-      - "https://ftp.jaist.ac.jp/pub/qtproject/archive/qt/5.15/5.15.10/single/qt-everywhere-opensource-src-5.15.10.tar.xz"
-      - "https://ftp.yz.yamagata-u.ac.jp/pub/qtproject/archive/qt/5.15/5.15.10/single/qt-everywhere-opensource-src-5.15.10.tar.xz"
-    sha256: "b545cb83c60934adc9a6bbd27e2af79e5013de77d46f5b9f5bb2a3c762bf55ca"
-  "5.15.9":
-    url:
-      - "https://download.qt.io/official_releases/qt/5.15/5.15.9/single/qt-everywhere-opensource-src-5.15.9.tar.xz"
-      - "https://download.qt.io/archive/qt/5.15/5.15.9/single/qt-everywhere-opensource-src-5.15.9.tar.xz"
-      - "https://mirrors.ukfast.co.uk/sites/qt.io/archive/qt/5.15/5.15.9/single/qt-everywhere-opensource-src-5.15.9.tar.xz"
-      - "https://ftp1.nluug.nl/languages/qt/archive/qt/5.15/5.15.9/single/qt-everywhere-opensource-src-5.15.9.tar.xz"
-      - "https://ftp2.nluug.nl/languages/qt/archive/qt/5.15/5.15.9/single/qt-everywhere-opensource-src-5.15.9.tar.xz"
-      - "https://mirror.netcologne.de/qtproject/archive/qt/5.15/5.15.9/single/qt-everywhere-opensource-src-5.15.9.tar.xz"
-      - "https://qt-mirror.dannhauer.de/archive/qt/5.15/5.15.9/single/qt-everywhere-opensource-src-5.15.9.tar.xz"
-      - "https://ftp.fau.de/qtproject/archive/qt/5.15/5.15.9/single/qt-everywhere-opensource-src-5.15.9.tar.xz"
-      - "https://mirrors.dotsrc.org/qtproject/archive/qt/5.15/5.15.9/single/qt-everywhere-opensource-src-5.15.9.tar.xz"
-      - "https://ftp.acc.umu.se/mirror/qt.io/qtproject/archive/qt/5.15/5.15.9/single/qt-everywhere-opensource-src-5.15.9.tar.xz"
-      - "https://master.qt.io/archive/qt/5.15/5.15.9/single/qt-everywhere-opensource-src-5.15.9.tar.xz"
-      - "https://www.nic.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/5.15/5.15.9/single/qt-everywhere-opensource-src-5.15.9.tar.xz"
-      - "https://qt.mirror.constant.com/archive/qt/5.15/5.15.9/single/qt-everywhere-opensource-src-5.15.9.tar.xz"
-      - "https://mirrors.sjtug.sjtu.edu.cn/qt/archive/qt/5.15/5.15.9/single/qt-everywhere-opensource-src-5.15.9.tar.xz"
-      - "https://ftp.jaist.ac.jp/pub/qtproject/archive/qt/5.15/5.15.9/single/qt-everywhere-opensource-src-5.15.9.tar.xz"
-      - "https://ftp.yz.yamagata-u.ac.jp/pub/qtproject/archive/qt/5.15/5.15.9/single/qt-everywhere-opensource-src-5.15.9.tar.xz"
-    sha256: "26d5f36134db03abe4a6db794c7570d729c92a3fc1b0bf9b1c8f86d0573cd02f"
 patches:
   "5.15.13":
     - "base_path": "qt5/qtbase"
@@ -178,69 +137,3 @@ patches:
       patch_description: "Fix usage of memory_resource with apple-clang>=15 and deployment target of macOS < 14"
       patch_type: "portability"
       patch_source: "https://codereview.qt-project.org/c/qt/qtbase/+/482392"
-  "5.15.10":
-    - "base_path": "qt5/qtbase"
-      "patch_file": "patches/aa2a39dea5.diff"
-    - "base_path": "qt5/qtwebengine"
-      "patch_file": "patches/c72097e.diff"
-    - "base_path": "qt5/qttools"
-      "patch_file": "patches/fix-macdeployqt.diff"
-    - "base_path": "qt5/qtwebengine/src/3rdparty/chromium/v8"
-      "patch_file": "patches/chromium-v8-missing-constexpr.patch"
-    - "base_path": "qt5/qtwebengine/src/3rdparty"
-      "patch_file": "patches/chromium-skia-missing-iterator-include.patch"
-    - "base_path": "qt5/qtwebengine/src/3rdparty/chromium/third_party/skia"
-      "patch_file": "patches/skia-cd397f3.diff"
-    - "base_path": "qt5/qtwebengine/src/3rdparty"
-      "patch_file": "patches/0001-Find-fontconfig-using-pkg-config.patch"
-    - "base_path": "qt5/qtbase"
-      "patch_file": "patches/337f28c9ab-5.15.8.patch"
-    - "base_path": "qt5/qtbase"
-      "patch_file": "patches/android-backtrace.diff"
-    - "base_path": "qt5/qtbase"
-      "patch_file": "patches/android-openssl.diff"
-    - "base_path": "qt5/qtbase"
-      "patch_file": "patches/android-new-ndk.diff"
-    - patch_file: "patches/5.15.8-fix-qmake-default-libdirs-apple-clang-15.patch"
-      base_path: "qt5/qtbase"
-      patch_description: "Fix qmake build with apple-clang>=15"
-      patch_type: "portability"
-      patch_source: "https://codereview.qt-project.org/c/qt/qtbase/+/503916"
-    - patch_file: "patches/5.15.10-fix-macos-cpp-lib-memory-resource.patch"
-      base_path: "qt5/qtbase"
-      patch_description: "Fix usage of memory_resource with apple-clang>=15 and deployment target of macOS < 14"
-      patch_type: "portability"
-      patch_source: "https://codereview.qt-project.org/c/qt/qtbase/+/482392"
-  "5.15.9":
-    - "base_path": "qt5/qtbase"
-      "patch_file": "patches/aa2a39dea5.diff"
-    - "base_path": "qt5/qtwebengine"
-      "patch_file": "patches/c72097e.diff"
-    - "base_path": "qt5/qttools"
-      "patch_file": "patches/fix-macdeployqt.diff"
-    - "base_path": "qt5/qtwebengine/src/3rdparty/chromium/v8"
-      "patch_file": "patches/chromium-v8-missing-constexpr.patch"
-    - "base_path": "qt5/qtwebengine/src/3rdparty"
-      "patch_file": "patches/chromium-skia-missing-iterator-include.patch"
-    - "base_path": "qt5/qtwebengine/src/3rdparty/chromium/third_party/skia"
-      "patch_file": "patches/skia-cd397f3.diff"
-    - "base_path": "qt5/qtwebengine/src/3rdparty"
-      "patch_file": "patches/0001-Find-fontconfig-using-pkg-config.patch"
-    - "base_path": "qt5/qtbase"
-      "patch_file": "patches/337f28c9ab-5.15.8.patch"
-    - "base_path": "qt5/qtbase"
-      "patch_file": "patches/android-backtrace.diff"
-    - "base_path": "qt5/qtbase"
-      "patch_file": "patches/android-openssl.diff"
-    - "base_path": "qt5/qtbase"
-      "patch_file": "patches/android-new-ndk.diff"
-    - patch_file: "patches/5.15.8-fix-qmake-default-libdirs-apple-clang-15.patch"
-      base_path: "qt5/qtbase"
-      patch_description: "Fix build with apple-clang 15"
-      patch_type: "portability"
-      patch_source: "https://codereview.qt-project.org/c/qt/qtbase/+/503916"
-    - patch_file: "patches/5.15.7-fix-macos-cpp-lib-memory-resource.patch"
-      base_path: "qt5/qtbase"
-      patch_description: "Fix usage of memory_resource with apple-clang>=15 and deployment target of macOS < 14"
-      patch_type: "portability"
-      patch_source: "https://codereview.qt-project.org/c/qt/qtbase/+/482392"
diff --git a/recipes/qt/5.x.x/patches/337f28c9ab-5.15.8.patch b/recipes/qt/5.x.x/patches/337f28c9ab-5.15.8.patch
deleted file mode 100644
index 053e6afa62e83..0000000000000
--- a/recipes/qt/5.x.x/patches/337f28c9ab-5.15.8.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 337f28c9abb12f28538cfe2f49e5afc460578b32 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
-Date: Tue, 5 Jul 2022 15:38:33 +0200
-Subject: Darwin: Replace deprecated symbol kIOMasterPortDefault with
- equivalent
-
-We can't use the replacement kIOMainPortDefault yet, as it's not
-available in operating system versions we still support, but the
-kIOMasterPortDefault documentation explicitly says that passing
-NULL as a port argument indicates "use the default".
-
-As the underlying type of a mach_port_t is potentially either
-a pointer or an unsigned int, we initialize the default to 0.
-
-Pick-to: 6.2 6.3 6.4 5.15
-Change-Id: I288aa94b8f2fbda47fd1cbaf329799db7ab988a0
-Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
----
- src/corelib/global/qglobal.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-(limited to 'src/corelib/global/qglobal.cpp')
-
-diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
-index 738e39658f..c894471ad6 100644
---- a/src/corelib/global/qglobal.cpp
-+++ b/src/corelib/global/qglobal.cpp
-@@ -3077,7 +3077,8 @@ QByteArray QSysInfo::machineUniqueId()
- {
- #if defined(Q_OS_DARWIN) && __has_include(<IOKit/IOKitLib.h>)
-     char uuid[UuidStringLen + 1];
--    io_service_t service = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("IOPlatformExpertDevice"));
-+    static const mach_port_t defaultPort = 0; // Effectively kIOMasterPortDefault/kIOMainPortDefault
-+    io_service_t service = IOServiceGetMatchingService(defaultPort, IOServiceMatching("IOPlatformExpertDevice"));
-     QCFString stringRef = (CFStringRef)IORegistryEntryCreateCFProperty(service, CFSTR(kIOPlatformUUIDKey), kCFAllocatorDefault, 0);
-     CFStringGetCString(stringRef, uuid, sizeof(uuid), kCFStringEncodingMacRoman);
-     return QByteArray(uuid);
--- 
-cgit v1.2.1
diff --git a/recipes/qt/5.x.x/patches/5.15.7-fix-macos-cpp-lib-memory-resource.patch b/recipes/qt/5.x.x/patches/5.15.7-fix-macos-cpp-lib-memory-resource.patch
deleted file mode 100644
index 2eb73ac2b79b5..0000000000000
--- a/recipes/qt/5.x.x/patches/5.15.7-fix-macos-cpp-lib-memory-resource.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/src/corelib/global/qcompilerdetection.h
-+++ b/src/corelib/global/qcompilerdetection.h
-@@ -1041,16 +1041,22 @@
- #   endif // !_HAS_CONSTEXPR
- #  endif // !__GLIBCXX__ && !_LIBCPP_VERSION
- # endif // Q_OS_QNX
--# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC) && defined(__GNUC_LIBSTD__) \
--    && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)
-+# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC)
-+#  if defined(__GNUC_LIBSTD__) && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)
- // Apple has not updated libstdc++ since 2007, which means it does not have
- // <initializer_list> or std::move. Let's disable these features
--#  undef Q_COMPILER_INITIALIZER_LISTS
--#  undef Q_COMPILER_RVALUE_REFS
--#  undef Q_COMPILER_REF_QUALIFIERS
-+#   undef Q_COMPILER_INITIALIZER_LISTS
-+#   undef Q_COMPILER_RVALUE_REFS
-+#   undef Q_COMPILER_REF_QUALIFIERS
- // Also disable <atomic>, since it's clearly not there
--#  undef Q_COMPILER_ATOMICS
--# endif
-+#   undef Q_COMPILER_ATOMICS
-+#  endif
-+#  if defined(__cpp_lib_memory_resource) \
-+    && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED)  && __MAC_OS_X_VERSION_MIN_REQUIRED  < 140000) \
-+     || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 170000))
-+#   undef __cpp_lib_memory_resource // Only supported on macOS 14 and iOS 17
-+#  endif
-+# endif // (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC)
- # if defined(Q_CC_CLANG) && defined(Q_CC_INTEL) && Q_CC_INTEL >= 1500
- // ICC 15.x and 16.0 have their own implementation of std::atomic, which is activated when in Clang mode
- // (probably because libc++'s <atomic> on OS X failed to compile), but they're missing some
---- a/src/corelib/tools/qduplicatetracker_p.h
-+++ b/src/corelib/tools/qduplicatetracker_p.h
-@@ -52,7 +52,7 @@
- 
- #include <qglobal.h>
- 
--#if QT_HAS_INCLUDE(<memory_resource>) && __cplusplus > 201402L
-+#if defined(__cpp_lib_memory_resource) && __cplusplus > 201402L
- #  include <unordered_set>
- #  include <memory_resource>
- #else
diff --git a/recipes/qt/5.x.x/qtmodules5.15.10.conf b/recipes/qt/5.x.x/qtmodules5.15.10.conf
deleted file mode 100644
index 452233655f279..0000000000000
--- a/recipes/qt/5.x.x/qtmodules5.15.10.conf
+++ /dev/null
@@ -1,326 +0,0 @@
-[submodule "qtbase"]
-	path = qtbase
-	url = ../qtbase.git
-	branch = 5.15
-	status = essential
-[submodule "qtsvg"]
-	depends = qtbase
-	path = qtsvg
-	url = ../qtsvg.git
-	branch = 5.15
-	status = addon
-[submodule "qtdeclarative"]
-	depends = qtbase
-	recommends = qtsvg
-	path = qtdeclarative
-	url = ../qtdeclarative.git
-	branch = 5.15
-	status = essential
-[submodule "qtactiveqt"]
-	depends = qtbase
-	path = qtactiveqt
-	url = ../qtactiveqt.git
-	branch = 5.15
-	status = addon
-[submodule "qtscript"]
-	depends = qtbase
-	recommends = qttools
-	path = qtscript
-	url = ../qtscript.git
-	branch = 5.15
-	status = deprecated
-[submodule "qtmultimedia"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtmultimedia
-	url = ../qtmultimedia.git
-	branch = 5.15
-	status = essential
-[submodule "qttools"]
-	depends = qtbase
-	recommends = qtdeclarative qtactiveqt
-	path = qttools
-	url = ../qttools.git
-	branch = 5.15
-	status = essential
-[submodule "qtxmlpatterns"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtxmlpatterns
-	url = ../qtxmlpatterns.git
-	branch = 5.15
-	status = deprecated
-[submodule "qttranslations"]
-	depends = qttools
-	path = qttranslations
-	url = ../qttranslations.git
-	branch = 5.15
-	status = essential
-	priority = 30
-[submodule "qtdoc"]
-	depends = qtdeclarative qttools
-	recommends = qtmultimedia qtquickcontrols qtquickcontrols2
-	path = qtdoc
-	url = ../qtdoc.git
-	branch = 5.15
-	status = essential
-	priority = 40
-[submodule "qtrepotools"]
-	path = qtrepotools
-	url = ../qtrepotools.git
-	branch = master
-	status = essential
-	project = -
-[submodule "qtqa"]
-	depends = qtbase
-	path = qtqa
-	url = ../qtqa.git
-	branch = master
-	status = essential
-	priority = 50
-[submodule "qtlocation"]
-	depends = qtbase
-	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
-	path = qtlocation
-	url = ../qtlocation.git
-	branch = 5.15
-	status = addon
-[submodule "qtsensors"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtsensors
-	url = ../qtsensors.git
-	branch = 5.15
-	status = addon
-[submodule "qtsystems"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtsystems
-	url = ../qtsystems.git
-	branch = dev
-	status = ignore
-[submodule "qtfeedback"]
-	depends = qtdeclarative
-	recommends = qtmultimedia
-	path = qtfeedback
-	url = ../qtfeedback.git
-	branch = master
-	status = ignore
-[submodule "qtdocgallery"]
-	depends = qtdeclarative
-	path = qtdocgallery
-	url = ../qtdocgallery.git
-	branch = master
-	status = ignore
-[submodule "qtpim"]
-	depends = qtdeclarative
-	path = qtpim
-	url = ../qtpim.git
-	branch = dev
-	status = ignore
-[submodule "qtconnectivity"]
-	depends = qtbase
-	recommends = qtdeclarative qtandroidextras
-	path = qtconnectivity
-	url = ../qtconnectivity.git
-	branch = 5.15
-	status = addon
-[submodule "qtwayland"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtwayland
-	url = ../qtwayland.git
-	branch = 5.15
-	status = addon
-[submodule "qt3d"]
-	depends = qtbase
-	recommends = qtdeclarative qtimageformats qtgamepad
-	path = qt3d
-	url = ../qt3d.git
-	branch = 5.15
-	status = addon
-[submodule "qtimageformats"]
-	depends = qtbase
-	path = qtimageformats
-	url = ../qtimageformats.git
-	branch = 5.15
-	status = addon
-[submodule "qtgraphicaleffects"]
-	depends = qtdeclarative
-	path = qtgraphicaleffects
-	url = ../qtgraphicaleffects.git
-	branch = 5.15
-	status = essential
-[submodule "qtquickcontrols"]
-	depends = qtdeclarative
-	recommends = qtgraphicaleffects
-	path = qtquickcontrols
-	url = ../qtquickcontrols.git
-	branch = 5.15
-	status = addon
-[submodule "qtserialbus"]
-	depends = qtbase
-	recommends = qtserialport
-	path = qtserialbus
-	url = ../qtserialbus.git
-	branch = 5.15
-	status = addon
-[submodule "qtserialport"]
-	depends = qtbase
-	path = qtserialport
-	url = ../qtserialport.git
-	branch = 5.15
-	status = addon
-[submodule "qtx11extras"]
-	depends = qtbase
-	path = qtx11extras
-	url = ../qtx11extras.git
-	branch = 5.15
-	status = addon
-[submodule "qtmacextras"]
-	depends = qtbase
-	path = qtmacextras
-	url = ../qtmacextras.git
-	branch = 5.15
-	status = addon
-[submodule "qtwinextras"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtwinextras
-	url = ../qtwinextras.git
-	branch = 5.15
-	status = addon
-[submodule "qtandroidextras"]
-	depends = qtbase
-	path = qtandroidextras
-	url = ../qtandroidextras.git
-	branch = 5.15
-	status = addon
-[submodule "qtwebsockets"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtwebsockets
-	url = ../qtwebsockets.git
-	branch = 5.15
-	status = addon
-[submodule "qtwebchannel"]
-	depends = qtbase
-	recommends = qtdeclarative qtwebsockets
-	path = qtwebchannel
-	url = ../qtwebchannel.git
-	branch = 5.15
-	status = addon
-[submodule "qtwebengine"]
-	depends = qtdeclarative
-	recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
-	path = qtwebengine
-	url = ../qtwebengine.git
-	branch = 5.15
-	status = addon
-	priority = 10
-[submodule "qtcanvas3d"]
-	depends = qtdeclarative
-	path = qtcanvas3d
-	url = ../qtcanvas3d.git
-	branch = dev
-	status = ignore
-[submodule "qtwebview"]
-	depends = qtdeclarative
-	recommends = qtwebengine
-	path = qtwebview
-	url = ../qtwebview.git
-	branch = 5.15
-	status = addon
-[submodule "qtquickcontrols2"]
-	depends = qtgraphicaleffects
-	recommends = qtimageformats
-	path = qtquickcontrols2
-	url = ../qtquickcontrols2.git
-	branch = 5.15
-	status = essential
-[submodule "qtpurchasing"]
-	depends = qtbase
-	recommends = qtdeclarative qtandroidextras
-	path = qtpurchasing
-	url = ../qtpurchasing.git
-	branch = 5.15
-	status = addon
-[submodule "qtcharts"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtcharts
-	url = ../qtcharts.git
-	branch = 5.15
-	status = addon
-[submodule "qtdatavis3d"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtdatavis3d
-	url = ../qtdatavis3d.git
-	branch = 5.15
-	status = addon
-[submodule "qtvirtualkeyboard"]
-	depends = qtbase qtdeclarative qtsvg
-	recommends = qtmultimedia qtquickcontrols
-	path = qtvirtualkeyboard
-	url = ../qtvirtualkeyboard.git
-	branch = 5.15
-	status = addon
-[submodule "qtgamepad"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtgamepad
-	url = ../qtgamepad.git
-	branch = 5.15
-	status = addon
-[submodule "qtscxml"]
-	depends = qtbase qtdeclarative
-	path = qtscxml
-	url = ../qtscxml.git
-	branch = 5.15
-	status = addon
-[submodule "qtspeech"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtspeech
-	url = ../qtspeech.git
-	branch = 5.15
-	status = addon
-[submodule "qtnetworkauth"]
-	depends = qtbase
-	path = qtnetworkauth
-	url = ../qtnetworkauth.git
-	branch = 5.15
-	status = addon
-[submodule "qtremoteobjects"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtremoteobjects
-	url = ../qtremoteobjects.git
-	branch = 5.15
-	status = addon
-[submodule "qtwebglplugin"]
-	depends = qtbase qtwebsockets
-	recommends = qtdeclarative
-	path = qtwebglplugin
-	url = ../qtwebglplugin.git
-	branch = 5.15
-	status = addon
-[submodule "qtlottie"]
-	depends = qtbase qtdeclarative
-	path = qtlottie
-	url = ../qtlottie.git
-	branch = 5.15
-	status = addon
-[submodule "qtquicktimeline"]
-	depends = qtbase qtdeclarative
-	path = qtquicktimeline
-	url = ../qtquicktimeline
-	branch = 5.15
-	status = addon
-[submodule "qtquick3d"]
-	depends = qtbase qtdeclarative
-	path = qtquick3d
-	url = ../qtquick3d.git
-	branch = 5.15
-	status = addon
diff --git a/recipes/qt/5.x.x/qtmodules5.15.9.conf b/recipes/qt/5.x.x/qtmodules5.15.9.conf
deleted file mode 100644
index 452233655f279..0000000000000
--- a/recipes/qt/5.x.x/qtmodules5.15.9.conf
+++ /dev/null
@@ -1,326 +0,0 @@
-[submodule "qtbase"]
-	path = qtbase
-	url = ../qtbase.git
-	branch = 5.15
-	status = essential
-[submodule "qtsvg"]
-	depends = qtbase
-	path = qtsvg
-	url = ../qtsvg.git
-	branch = 5.15
-	status = addon
-[submodule "qtdeclarative"]
-	depends = qtbase
-	recommends = qtsvg
-	path = qtdeclarative
-	url = ../qtdeclarative.git
-	branch = 5.15
-	status = essential
-[submodule "qtactiveqt"]
-	depends = qtbase
-	path = qtactiveqt
-	url = ../qtactiveqt.git
-	branch = 5.15
-	status = addon
-[submodule "qtscript"]
-	depends = qtbase
-	recommends = qttools
-	path = qtscript
-	url = ../qtscript.git
-	branch = 5.15
-	status = deprecated
-[submodule "qtmultimedia"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtmultimedia
-	url = ../qtmultimedia.git
-	branch = 5.15
-	status = essential
-[submodule "qttools"]
-	depends = qtbase
-	recommends = qtdeclarative qtactiveqt
-	path = qttools
-	url = ../qttools.git
-	branch = 5.15
-	status = essential
-[submodule "qtxmlpatterns"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtxmlpatterns
-	url = ../qtxmlpatterns.git
-	branch = 5.15
-	status = deprecated
-[submodule "qttranslations"]
-	depends = qttools
-	path = qttranslations
-	url = ../qttranslations.git
-	branch = 5.15
-	status = essential
-	priority = 30
-[submodule "qtdoc"]
-	depends = qtdeclarative qttools
-	recommends = qtmultimedia qtquickcontrols qtquickcontrols2
-	path = qtdoc
-	url = ../qtdoc.git
-	branch = 5.15
-	status = essential
-	priority = 40
-[submodule "qtrepotools"]
-	path = qtrepotools
-	url = ../qtrepotools.git
-	branch = master
-	status = essential
-	project = -
-[submodule "qtqa"]
-	depends = qtbase
-	path = qtqa
-	url = ../qtqa.git
-	branch = master
-	status = essential
-	priority = 50
-[submodule "qtlocation"]
-	depends = qtbase
-	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
-	path = qtlocation
-	url = ../qtlocation.git
-	branch = 5.15
-	status = addon
-[submodule "qtsensors"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtsensors
-	url = ../qtsensors.git
-	branch = 5.15
-	status = addon
-[submodule "qtsystems"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtsystems
-	url = ../qtsystems.git
-	branch = dev
-	status = ignore
-[submodule "qtfeedback"]
-	depends = qtdeclarative
-	recommends = qtmultimedia
-	path = qtfeedback
-	url = ../qtfeedback.git
-	branch = master
-	status = ignore
-[submodule "qtdocgallery"]
-	depends = qtdeclarative
-	path = qtdocgallery
-	url = ../qtdocgallery.git
-	branch = master
-	status = ignore
-[submodule "qtpim"]
-	depends = qtdeclarative
-	path = qtpim
-	url = ../qtpim.git
-	branch = dev
-	status = ignore
-[submodule "qtconnectivity"]
-	depends = qtbase
-	recommends = qtdeclarative qtandroidextras
-	path = qtconnectivity
-	url = ../qtconnectivity.git
-	branch = 5.15
-	status = addon
-[submodule "qtwayland"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtwayland
-	url = ../qtwayland.git
-	branch = 5.15
-	status = addon
-[submodule "qt3d"]
-	depends = qtbase
-	recommends = qtdeclarative qtimageformats qtgamepad
-	path = qt3d
-	url = ../qt3d.git
-	branch = 5.15
-	status = addon
-[submodule "qtimageformats"]
-	depends = qtbase
-	path = qtimageformats
-	url = ../qtimageformats.git
-	branch = 5.15
-	status = addon
-[submodule "qtgraphicaleffects"]
-	depends = qtdeclarative
-	path = qtgraphicaleffects
-	url = ../qtgraphicaleffects.git
-	branch = 5.15
-	status = essential
-[submodule "qtquickcontrols"]
-	depends = qtdeclarative
-	recommends = qtgraphicaleffects
-	path = qtquickcontrols
-	url = ../qtquickcontrols.git
-	branch = 5.15
-	status = addon
-[submodule "qtserialbus"]
-	depends = qtbase
-	recommends = qtserialport
-	path = qtserialbus
-	url = ../qtserialbus.git
-	branch = 5.15
-	status = addon
-[submodule "qtserialport"]
-	depends = qtbase
-	path = qtserialport
-	url = ../qtserialport.git
-	branch = 5.15
-	status = addon
-[submodule "qtx11extras"]
-	depends = qtbase
-	path = qtx11extras
-	url = ../qtx11extras.git
-	branch = 5.15
-	status = addon
-[submodule "qtmacextras"]
-	depends = qtbase
-	path = qtmacextras
-	url = ../qtmacextras.git
-	branch = 5.15
-	status = addon
-[submodule "qtwinextras"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtwinextras
-	url = ../qtwinextras.git
-	branch = 5.15
-	status = addon
-[submodule "qtandroidextras"]
-	depends = qtbase
-	path = qtandroidextras
-	url = ../qtandroidextras.git
-	branch = 5.15
-	status = addon
-[submodule "qtwebsockets"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtwebsockets
-	url = ../qtwebsockets.git
-	branch = 5.15
-	status = addon
-[submodule "qtwebchannel"]
-	depends = qtbase
-	recommends = qtdeclarative qtwebsockets
-	path = qtwebchannel
-	url = ../qtwebchannel.git
-	branch = 5.15
-	status = addon
-[submodule "qtwebengine"]
-	depends = qtdeclarative
-	recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
-	path = qtwebengine
-	url = ../qtwebengine.git
-	branch = 5.15
-	status = addon
-	priority = 10
-[submodule "qtcanvas3d"]
-	depends = qtdeclarative
-	path = qtcanvas3d
-	url = ../qtcanvas3d.git
-	branch = dev
-	status = ignore
-[submodule "qtwebview"]
-	depends = qtdeclarative
-	recommends = qtwebengine
-	path = qtwebview
-	url = ../qtwebview.git
-	branch = 5.15
-	status = addon
-[submodule "qtquickcontrols2"]
-	depends = qtgraphicaleffects
-	recommends = qtimageformats
-	path = qtquickcontrols2
-	url = ../qtquickcontrols2.git
-	branch = 5.15
-	status = essential
-[submodule "qtpurchasing"]
-	depends = qtbase
-	recommends = qtdeclarative qtandroidextras
-	path = qtpurchasing
-	url = ../qtpurchasing.git
-	branch = 5.15
-	status = addon
-[submodule "qtcharts"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtcharts
-	url = ../qtcharts.git
-	branch = 5.15
-	status = addon
-[submodule "qtdatavis3d"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtdatavis3d
-	url = ../qtdatavis3d.git
-	branch = 5.15
-	status = addon
-[submodule "qtvirtualkeyboard"]
-	depends = qtbase qtdeclarative qtsvg
-	recommends = qtmultimedia qtquickcontrols
-	path = qtvirtualkeyboard
-	url = ../qtvirtualkeyboard.git
-	branch = 5.15
-	status = addon
-[submodule "qtgamepad"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtgamepad
-	url = ../qtgamepad.git
-	branch = 5.15
-	status = addon
-[submodule "qtscxml"]
-	depends = qtbase qtdeclarative
-	path = qtscxml
-	url = ../qtscxml.git
-	branch = 5.15
-	status = addon
-[submodule "qtspeech"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtspeech
-	url = ../qtspeech.git
-	branch = 5.15
-	status = addon
-[submodule "qtnetworkauth"]
-	depends = qtbase
-	path = qtnetworkauth
-	url = ../qtnetworkauth.git
-	branch = 5.15
-	status = addon
-[submodule "qtremoteobjects"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtremoteobjects
-	url = ../qtremoteobjects.git
-	branch = 5.15
-	status = addon
-[submodule "qtwebglplugin"]
-	depends = qtbase qtwebsockets
-	recommends = qtdeclarative
-	path = qtwebglplugin
-	url = ../qtwebglplugin.git
-	branch = 5.15
-	status = addon
-[submodule "qtlottie"]
-	depends = qtbase qtdeclarative
-	path = qtlottie
-	url = ../qtlottie.git
-	branch = 5.15
-	status = addon
-[submodule "qtquicktimeline"]
-	depends = qtbase qtdeclarative
-	path = qtquicktimeline
-	url = ../qtquicktimeline
-	branch = 5.15
-	status = addon
-[submodule "qtquick3d"]
-	depends = qtbase qtdeclarative
-	path = qtquick3d
-	url = ../qtquick3d.git
-	branch = 5.15
-	status = addon
diff --git a/recipes/qt/6.x.x/conandata.yml b/recipes/qt/6.x.x/conandata.yml
index 4481994aa27ca..79fb313f1755b 100644
--- a/recipes/qt/6.x.x/conandata.yml
+++ b/recipes/qt/6.x.x/conandata.yml
@@ -37,55 +37,6 @@ sources:
       - "https://ftp.jaist.ac.jp/pub/qtproject/archive/qt/6.6/6.6.3/single/qt-everywhere-src-6.6.3.tar.xz"
       - "https://ftp.yz.yamagata-u.ac.jp/pub/qtproject/archive/qt/6.6/6.6.3/single/qt-everywhere-src-6.6.3.tar.xz"
     sha256: "69d0348fef415da98aa890a34651e9cfb232f1bffcee289b7b4e21386bf36104"
-  "6.6.2":
-    url:
-      - "https://download.qt.io/official_releases/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
-      - "https://download.qt.io/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
-      - "https://mirrors.20i.com/pub/qt.io/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
-      - "https://mirrors.ukfast.co.uk/sites/qt.io/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
-      - "https://ftp.nluug.nl/languages/qt/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
-      - "https://mirror.netcologne.de/qtproject/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
-      - "https://qt-mirror.dannhauer.de/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
-      - "https://ftp.fau.de/qtproject/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
-      - "https://mirrors.dotsrc.org/qtproject/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
-      - "https://ftp.acc.umu.se/mirror/qt.io/qtproject/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
-      - "https://www.nic.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
-      - "https://qtproject.mirror.liquidtelecom.com/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
-      - "https://qt.mirror.constant.com/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
-      - "https://mirrors.sau.edu.cn/qt/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
-      - "https://mirrors.cloud.tencent.com/qt/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
-      - "https://mirrors.ustc.edu.cn/qtproject/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
-      - "https://mirrors.sjtug.sjtu.edu.cn/qt/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
-      - "https://ftp.jaist.ac.jp/pub/qtproject/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
-      - "https://ftp.yz.yamagata-u.ac.jp/pub/qtproject/archive/qt/6.6/6.6.2/single/qt-everywhere-src-6.6.2.tar.xz"
-    sha256: "3c1e42b3073ade1f7adbf06863c01e2c59521b7cc2349df2f74ecd7ebfcb922d"
-  "6.6.1":
-    url:
-      - "https://download.qt.io/official_releases/qt/6.6/6.6.1/single/qt-everywhere-src-6.6.1.tar.xz"
-      - "https://download.qt.io/archive/qt/6.6/6.6.1/single/qt-everywhere-src-6.6.1.tar.xz"
-      - "https://mirrors.sjtug.sjtu.edu.cn/qt/archive/qt/6.6/6.6.1/single/qt-everywhere-src-6.6.1.tar.xz"
-    sha256: "dd3668f65645fe270bc615d748bd4dc048bd17b9dc297025106e6ecc419ab95d"
-  "6.6.0":
-    url:
-      - "https://download.qt.io/official_releases/qt/6.6/6.6.0/single/qt-everywhere-src-6.6.0.tar.xz"
-      - "https://download.qt.io/archive/qt/6.6/6.6.0/single/qt-everywhere-src-6.6.0.tar.xz"
-      - "https://qt.mirror.constant.com/archive/qt/6.6/6.6.0/single/qt-everywhere-src-6.6.0.tar.xz"
-      - "https://mirrors.ukfast.co.uk/sites/qt.io/archive/qt/6.6/6.6.0/single/qt-everywhere-src-6.6.0.tar.xz"
-      - "https://mirrors.20i.com/pub/qt.io/archive/qt/6.6/6.6.0/single/qt-everywhere-src-6.6.0.tar.xz"
-      - "https://ftp.nluug.nl/languages/qt/archive/qt/6.6/6.6.0/single/qt-everywhere-src-6.6.0.tar.xz"
-      - "https://mirror.netcologne.de/qtproject/archive/qt/6.6/6.6.0/single/qt-everywhere-src-6.6.0.tar.xz"
-      - "https://mirror.web4africa.ng/qt/archive/qt/6.6/6.6.0/single/qt-everywhere-src-6.6.0.tar.xz"
-      - "https://qt-mirror.dannhauer.de/archive/qt/6.6/6.6.0/single/qt-everywhere-src-6.6.0.tar.xz"
-      - "https://ftp.fau.de/qtproject/archive/qt/6.6/6.6.0/single/qt-everywhere-src-6.6.0.tar.xz"
-      - "https://mirrors.dotsrc.org/qtproject/archive/qt/6.6/6.6.0/single/qt-everywhere-src-6.6.0.tar.xz"
-      - "https://ftp.icm.edu.pl/packages/qt/archive/qt/6.6/6.6.0/single/qt-everywhere-src-6.6.0.tar.xz"
-      - "https://ftp.acc.umu.se/mirror/qt.io/qtproject/archive/qt/6.6/6.6.0/single/qt-everywhere-src-6.6.0.tar.xz"
-      - "https://www.nic.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.6/6.6.0/single/qt-everywhere-src-6.6.0.tar.xz"
-      - "https://qtproject.mirror.liquidtelecom.com/archive/qt/6.6/6.6.0/single/qt-everywhere-src-6.6.0.tar.xz"
-      - "https://mirrors.sjtug.sjtu.edu.cn/qt/archive/qt/6.6/6.6.0/single/qt-everywhere-src-6.6.0.tar.xz"
-      - "https://ftp.jaist.ac.jp/pub/qtproject/archive/qt/6.6/6.6.0/single/qt-everywhere-src-6.6.0.tar.xz"
-      - "https://ftp.yz.yamagata-u.ac.jp/pub/qtproject/archive/qt/6.6/6.6.0/single/qt-everywhere-src-6.6.0.tar.xz"
-    sha256: "652538fcb5d175d8f8176c84c847b79177c87847b7273dccaec1897d80b50002"
   "6.5.3":
     url:
       - "https://download.qt.io/official_releases/qt/6.5/6.5.3/single/qt-everywhere-src-6.5.3.tar.xz"
@@ -114,14 +65,6 @@ sources:
       - "https://ftp.fau.de/qtproject/archive/qt/6.4/6.4.2/single/qt-everywhere-src-6.4.2.tar.xz"
       - "https://mirrors.ustc.edu.cn/qtproject/archive/qt/6.4/6.4.2/single/qt-everywhere-src-6.4.2.tar.xz"
     sha256: "689f53e6652da82fccf7c2ab58066787487339f28d1ec66a8765ad357f4976be"
-  "6.3.2":
-    url:
-      - "https://download.qt.io/archive/qt/6.3/6.3.2/single/qt-everywhere-src-6.3.2.tar.xz"
-      - "https://qt-mirror.dannhauer.de/archive/qt/6.3/6.3.2/single/qt-everywhere-src-6.3.2.tar.xz"
-      - "https://www.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/6.3/6.3.2/single/qt-everywhere-src-6.3.2.tar.xz"
-      - "https://ftp.fau.de/qtproject/archive/qt/6.3/6.3.2/single/qt-everywhere-src-6.3.2.tar.xz"
-      - "https://mirrors.ustc.edu.cn/qtproject/archive/qt/6.3/6.3.2/single/qt-everywhere-src-6.3.2.tar.xz"
-    sha256: "b90524f686224a0e5a945c1d65307e16a375348dbe275c9ac11de171fe31374a"
 patches:
   "6.7.0":
     - "base_path": "qtwebengine"
@@ -135,44 +78,6 @@ patches:
       "patch_file": "patches/c72097e_6.6.0.diff"
       "patch_source": "https://codereview.qt-project.org/c/yocto/meta-qt5/+/192172"
       "patch_type": "bugfix"
-  "6.6.2":
-    - "base_path": "qtwebengine"
-      "patch_description": "Workaround for too long .rps file name"
-      "patch_file": "patches/c72097e_6.6.0.diff"
-      "patch_source": "https://codereview.qt-project.org/c/yocto/meta-qt5/+/192172"
-      "patch_type": "bugfix"
-  "6.6.1":
-    - "base_path": "qtwebengine"
-      "patch_description": "Workaround for too long .rps file name"
-      "patch_file": "patches/c72097e_6.6.0.diff"
-      "patch_type": "bugfix"
-      "patch_source": "https://codereview.qt-project.org/c/yocto/meta-qt5/+/192172"
-    - "base_path": "qtbase"
-      "patch_description": "Fix build error with lambda on GCC 9.2"
-      "patch_file": "patches/32fa63f.patch"
-      "patch_type": "bugfix"
-      "patch_source": "https://bugreports.qt.io/browse/QTBUG-112920"
-    - "base_path": "qtbase"
-      "patch_description": "Use absolute path in the generated header files to avoid relative path longer than 250 characters (not supported on by msvc compiler)"
-      "patch_file": "patches/fix-long-path-on-windows_6.6.1.patch"
-      "patch_type": "bugfix"
-      "patch_source": "https://code.qt.io/cgit/qt/qtbase.git/commit/?id=b4246a5c28472de3c4b6a85a3daf4a1d578894ab"
-  "6.6.0":
-    - "base_path": "qtwebengine"
-      "patch_description": "Workaround for too long .rps file name"
-      "patch_file": "patches/c72097e_6.6.0.diff"
-      "patch_type": "bugfix"
-      "patch_source": "https://codereview.qt-project.org/c/yocto/meta-qt5/+/192172"
-    - "base_path": "qtbase"
-      "patch_description": "Fix build error with lambda on GCC 9.2"
-      "patch_file": "patches/32fa63f.patch"
-      "patch_type": "bugfix"
-      "patch_source": "https://bugreports.qt.io/browse/QTBUG-112920"
-    - "base_path": "qtbase"
-      "patch_description": "Use absolute path in the generated header files to avoid relative path longer than 250 characters (not supported on by msvc compiler)"
-      "patch_file": "patches/fix-long-path-on-windows_6.6.0.patch"
-      "patch_type": "bugfix"
-      "patch_source": "https://code.qt.io/cgit/qt/qtbase.git/commit/?id=b4246a5c28472de3c4b6a85a3daf4a1d578894ab"
   "6.5.3":
     - "base_path": "qtwebengine"
       "patch_description": "Workaround for too long .rps file name"
@@ -210,24 +115,3 @@ patches:
       patch_description: "CMake: Fix build with CMake 3.28 on macOS"
       patch_source: "https://github.com/qt/qtbase/commit/0efea8020c1d221635aaa0a71529edb392cfe3cc"
       patch_type: "bugfix"
-  "6.3.2":
-    - base_path: "qtbase/cmake"
-      patch_description: "Fix pri helpers"
-      patch_file: "patches/qt6-pri-helpers-fix.diff"
-      patch_type: "bugfix"
-      patch_source: "https://bugreports.qt.io/browse/QTBUG-95569"
-    - patch_file: "patches/c72097e.diff"
-      base_path: "qtwebengine"
-      patch_description: "Workaround for too long .rps file name"
-      patch_type: "bugfix"
-      patch_source: "https://codereview.qt-project.org/c/yocto/meta-qt5/+/192172"
-    - patch_file: "patches/d13958d.diff"
-      base_path: "qtbase"
-      patch_description: "Fix PCRE2 detection"
-      patch_source: "https://codereview.qt-project.org/c/qt/qtbase/+/445885"
-      patch_type: "bugfix"
-    - patch_file: "patches/fix_cmake3.28.patch"
-      base_path: "qtbase"
-      patch_description: "CMake: Fix build with CMake 3.28 on macOS"
-      patch_source: "https://github.com/qt/qtbase/commit/0efea8020c1d221635aaa0a71529edb392cfe3cc"
-      patch_type: "bugfix"
diff --git a/recipes/qt/6.x.x/conanfile.py b/recipes/qt/6.x.x/conanfile.py
index a603bfd3c41fa..7ebd60de80d5c 100644
--- a/recipes/qt/6.x.x/conanfile.py
+++ b/recipes/qt/6.x.x/conanfile.py
@@ -263,7 +263,7 @@ def validate(self):
         elif Version(self.settings.compiler.version) < minimum_version:
             raise ConanInvalidConfiguration("C++17 support required, which your compiler does not support.")
 
-        if Version(self.version) >= "6.4.0" and self.settings.compiler == "apple-clang" and Version(self.settings.compiler.version) < "12":
+        if self.settings.compiler == "apple-clang" and Version(self.settings.compiler.version) < "12":
             raise ConanInvalidConfiguration("apple-clang >= 12 required by qt >= 6.4.0")
 
         if Version(self.version) >= "6.6.1" and self.settings.compiler == "apple-clang" and Version(self.settings.compiler.version) < "13.1":
@@ -677,9 +677,6 @@ def source(self):
         replace_in_file(self, os.path.join(self.source_folder, "qtbase", "configure.cmake"),
             "set_property(TARGET ZLIB::ZLIB PROPERTY IMPORTED_GLOBAL TRUE)",
             "")
-        if Version(self.version) <= "6.4.0":
-            # use official variable name https://cmake.org/cmake/help/latest/module/FindFontconfig.html
-            replace_in_file(self, os.path.join(self.source_folder, "qtbase", "src", "gui", "configure.cmake"), "FONTCONFIG_FOUND", "Fontconfig_FOUND")
 
         replace_in_file(self,
                         os.path.join(self.source_folder, "qtbase", "cmake", "QtAutoDetect.cmake" if Version(self.version) < "6.6.2" else "QtAutoDetectHelpers.cmake"),
diff --git a/recipes/qt/6.x.x/patches/32fa63f.patch b/recipes/qt/6.x.x/patches/32fa63f.patch
deleted file mode 100644
index 733b0c131f1f5..0000000000000
--- a/recipes/qt/6.x.x/patches/32fa63f.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b404930e122013e76ba8fe165f3432288c051438 Mon Sep 17 00:00:00 2001
-From: shjiu <shanheng.jiu@qt.io>
-Date: Fri, 17 Nov 2023 09:41:31 +0900
-Subject: [PATCH] Fix build error with lambda on GCC 9.2
-
-This patch is specific to the return type of updatePtrSimd function as boolean to avoid the bug of GCC 9.2.
-
-Fixes: QTBUG-112920
-Pick-to: 6.7 6.6 6.5
-Change-Id: I21cb1f6dda34448b2290ab72ec280b6b2a3732c9
-Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
----
- src/corelib/text/qstring.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp
-index 2dc415584f3..d9e89f8e5bb 100644
---- a/src/corelib/text/qstring.cpp
-+++ b/src/corelib/text/qstring.cpp
-@@ -471,7 +471,7 @@ static bool simdTestMask(const char *&ptr, const char *end, quint32 maskval)
-     if constexpr (UseSse4_1) {
- #  ifndef Q_OS_QNX              // compiler fails in the code below
-         __m128i mask;
--        auto updatePtrSimd = [&](__m128i data) {
-+        auto updatePtrSimd = [&](__m128i data) -> bool {
-             __m128i masked = _mm_and_si128(mask, data);
-             __m128i comparison = _mm_cmpeq_epi16(masked, _mm_setzero_si128());
-             uint result = _mm_movemask_epi8(comparison);
diff --git a/recipes/qt/6.x.x/patches/fix-long-path-on-windows_6.6.0.patch b/recipes/qt/6.x.x/patches/fix-long-path-on-windows_6.6.0.patch
deleted file mode 100644
index 2dd2a1e5feed3..0000000000000
--- a/recipes/qt/6.x.x/patches/fix-long-path-on-windows_6.6.0.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/src/tools/syncqt/main.cpp
-+++ b/src/tools/syncqt/main.cpp
-@@ -875,12 +875,7 @@
-
-         bool headerFileExists = std::filesystem::exists(headerFile);
-
--        std::filesystem::path headerFileRootName =
--                std::filesystem::weakly_canonical(headerFile, ec).root_name();
--        std::string aliasedFilepath = !ec && headerFileRootName == m_outputRootName
--                ? std::filesystem::relative(headerFile, outputDir).generic_string()
--                : headerFile.generic_string();
--        ec.clear();
-+        std::string aliasedFilepath = headerFile.generic_string();
-
-         std::string aliasPath = outputDir + '/' + m_currentFilename;
- 
diff --git a/recipes/qt/6.x.x/patches/fix-long-path-on-windows_6.6.1.patch b/recipes/qt/6.x.x/patches/fix-long-path-on-windows_6.6.1.patch
deleted file mode 100644
index 67967d9240077..0000000000000
--- a/recipes/qt/6.x.x/patches/fix-long-path-on-windows_6.6.1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/src/tools/syncqt/main.cpp
-+++ b/src/tools/syncqt/main.cpp
-@@ -866,12 +866,7 @@
-
-         bool headerFileExists = std::filesystem::exists(headerFile);
-
--        std::filesystem::path headerFileRootName =
--                std::filesystem::weakly_canonical(headerFile, ec).root_name();
--        std::string aliasedFilepath = !ec && headerFileRootName == m_outputRootName
--                ? std::filesystem::relative(headerFile, outputDir).generic_string()
--                : headerFile.generic_string();
--        ec.clear();
-+        std::string aliasedFilepath = headerFile.generic_string();
-
-         std::string aliasPath = outputDir + '/' + m_currentFilename;
- 
diff --git a/recipes/qt/6.x.x/qtmodules6.3.2.conf b/recipes/qt/6.x.x/qtmodules6.3.2.conf
deleted file mode 100644
index b0e0878e68e97..0000000000000
--- a/recipes/qt/6.x.x/qtmodules6.3.2.conf
+++ /dev/null
@@ -1,305 +0,0 @@
-[submodule "qtbase"]
-	path = qtbase
-	url = ../qtbase.git
-	branch = 6.3.2
-	status = essential
-[submodule "qtsvg"]
-	depends = qtbase
-	path = qtsvg
-	url = ../qtsvg.git
-	branch = 6.3.2
-	status = addon
-[submodule "qtdeclarative"]
-	depends = qtbase
-	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
-	path = qtdeclarative
-	url = ../qtdeclarative.git
-	branch = 6.3.2
-	status = essential
-[submodule "qtactiveqt"]
-	depends = qtbase
-	path = qtactiveqt
-	url = ../qtactiveqt.git
-	branch = 6.3.2
-	status = addon
-[submodule "qtmultimedia"]
-	depends = qtbase qtshadertools
-	recommends = qtdeclarative
-	path = qtmultimedia
-	url = ../qtmultimedia.git
-	branch = 6.3.2
-	status = addon
-[submodule "qttools"]
-	depends = qtbase
-	recommends = qtdeclarative qtactiveqt
-	path = qttools
-	url = ../qttools.git
-	branch = 6.3.2
-	status = essential
-[submodule "qtxmlpatterns"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtxmlpatterns
-	url = ../qtxmlpatterns.git
-	branch = 6.3
-	status = ignore
-[submodule "qttranslations"]
-	depends = qttools
-	path = qttranslations
-	url = ../qttranslations.git
-	branch = 6.3.2
-	status = essential
-	priority = 30
-[submodule "qtdoc"]
-	depends = qtdeclarative qttools
-	recommends = qtmultimedia
-	path = qtdoc
-	url = ../qtdoc.git
-	branch = 6.3.2
-	status = essential
-	priority = 40
-[submodule "qtrepotools"]
-	path = qtrepotools
-	url = ../qtrepotools.git
-	branch = master
-	status = essential
-	project = -
-[submodule "qtqa"]
-	depends = qtbase
-	path = qtqa
-	url = ../qtqa.git
-	branch = dev
-	status = essential
-	priority = 50
-[submodule "qtlocation"]
-	depends = qtbase qtpositioning
-	recommends = qtdeclarative
-	path = qtlocation
-	url = ../qtlocation.git
-	branch = 6.3
-	status = ignore
-[submodule "qtpositioning"]
-	depends = qtbase
-	recommends = qtdeclarative qtserialport
-	path = qtpositioning
-	url = ../qtpositioning.git
-	branch = 6.3.2
-	status = addon
-[submodule "qtsensors"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtsensors
-	url = ../qtsensors.git
-	branch = 6.3.2
-	status = addon
-[submodule "qtsystems"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtsystems
-	url = ../qtsystems.git
-	branch = dev
-	status = ignore
-[submodule "qtfeedback"]
-	depends = qtdeclarative
-	recommends = qtmultimedia
-	path = qtfeedback
-	url = ../qtfeedback.git
-	branch = master
-	status = ignore
-[submodule "qtpim"]
-	depends = qtdeclarative
-	path = qtpim
-	url = ../qtpim.git
-	branch = dev
-	status = ignore
-[submodule "qtconnectivity"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtconnectivity
-	url = ../qtconnectivity.git
-	branch = 6.3.2
-	status = addon
-[submodule "qtwayland"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtwayland
-	url = ../qtwayland.git
-	branch = 6.3.2
-	status = addon
-[submodule "qt3d"]
-	depends = qtbase
-	recommends = qtdeclarative qtshadertools
-	path = qt3d
-	url = ../qt3d.git
-	branch = 6.3.2
-	status = addon
-[submodule "qtimageformats"]
-	depends = qtbase
-	path = qtimageformats
-	url = ../qtimageformats.git
-	branch = 6.3.2
-	status = addon
-[submodule "qtserialbus"]
-	depends = qtbase
-	recommends = qtserialport
-	path = qtserialbus
-	url = ../qtserialbus.git
-	branch = 6.3.2
-	status = addon
-[submodule "qtserialport"]
-	depends = qtbase
-	path = qtserialport
-	url = ../qtserialport.git
-	branch = 6.3.2
-	status = addon
-[submodule "qtwebsockets"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtwebsockets
-	url = ../qtwebsockets.git
-	branch = 6.3.2
-	status = addon
-[submodule "qtwebchannel"]
-	depends = qtbase
-	recommends = qtdeclarative qtwebsockets
-	path = qtwebchannel
-	url = ../qtwebchannel.git
-	branch = 6.3.2
-	status = addon
-[submodule "qtwebengine"]
-	depends = qtdeclarative
-	recommends = qtwebchannel qttools qtpositioning
-	path = qtwebengine
-	url = ../qtwebengine.git
-	branch = 6.3.2
-	status = addon
-	priority = 10
-[submodule "qtcanvas3d"]
-	depends = qtdeclarative
-	path = qtcanvas3d
-	url = ../qtcanvas3d.git
-	branch = 6.3
-	status = ignore
-[submodule "qtwebview"]
-	depends = qtdeclarative
-	recommends = qtwebengine
-	path = qtwebview
-	url = ../qtwebview.git
-	branch = 6.3.2
-	status = addon
-[submodule "qtcharts"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtcharts
-	url = ../qtcharts.git
-	branch = 6.3.2
-	status = addon
-[submodule "qtdatavis3d"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtdatavis3d
-	url = ../qtdatavis3d.git
-	branch = 6.3.2
-	status = addon
-[submodule "qtvirtualkeyboard"]
-	depends = qtbase qtdeclarative qtsvg
-	recommends = qtmultimedia
-	path = qtvirtualkeyboard
-	url = ../qtvirtualkeyboard.git
-	branch = 6.3.2
-	status = addon
-[submodule "qtgamepad"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtgamepad
-	url = ../qtgamepad.git
-	branch = 6.3
-	status = ignore
-[submodule "qtscxml"]
-	depends = qtbase qtdeclarative
-	path = qtscxml
-	url = ../qtscxml.git
-	branch = 6.3.2
-	status = addon
-[submodule "qtspeech"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtspeech
-	url = ../qtspeech.git
-	branch = 6.3.2
-	status = ignore
-[submodule "qtnetworkauth"]
-	depends = qtbase
-	path = qtnetworkauth
-	url = ../qtnetworkauth.git
-	branch = 6.3.2
-	status = addon
-[submodule "qtremoteobjects"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtremoteobjects
-	url = ../qtremoteobjects.git
-	branch = 6.3.2
-	status = addon
-[submodule "qtwebglplugin"]
-	depends = qtbase qtwebsockets
-	recommends = qtdeclarative
-	path = qtwebglplugin
-	url = ../qtwebglplugin.git
-	branch = 6.3
-	status = ignore
-[submodule "qtlottie"]
-	depends = qtbase qtdeclarative
-	path = qtlottie
-	url = ../qtlottie.git
-	branch = 6.3.2
-	status = addon
-[submodule "qtquicktimeline"]
-	depends = qtbase qtdeclarative
-	path = qtquicktimeline
-	url = ../qtquicktimeline
-	branch = 6.3.2
-	status = addon
-[submodule "qtquick3d"]
-	depends = qtbase qtdeclarative qtshadertools
-	recommends = qtquicktimeline
-	path = qtquick3d
-	url = ../qtquick3d.git
-	branch = 6.3.2
-	status = addon
-[submodule "qtshadertools"]
-	depends = qtbase
-	path = qtshadertools
-	url = ../qtshadertools.git
-	branch = 6.3.2
-	status = addon
-[submodule "qt5compat"]
-	depends = qtbase qtdeclarative
-	path = qt5compat
-	url = ../qt5compat.git
-	branch = 6.3.2
-	status = deprecated
-[submodule "qtcoap"]
-	depends = qtbase
-	path = qtcoap
-	url = ../qtcoap.git
-	branch = 6.3.2
-	status = addon
-[submodule "qtmqtt"]
-	depends = qtbase qtdeclarative
-	path = qtmqtt
-	url = ../qtmqtt.git
-	branch = 6.3.2
-	status = addon
-[submodule "qtopcua"]
-	depends = qtbase qtdeclarative
-	path = qtopcua
-	url = ../qtopcua.git
-	branch = 6.3.2
-	status = addon
-[submodule "qtlanguageserver"]
-	depends = qtbase
-	path = qtlanguageserver
-	url = ../qtlanguageserver.git
-	branch = 6.3.2
-	status = preview
diff --git a/recipes/qt/6.x.x/qtmodules6.6.0.conf b/recipes/qt/6.x.x/qtmodules6.6.0.conf
deleted file mode 100644
index e3853727b0712..0000000000000
--- a/recipes/qt/6.x.x/qtmodules6.6.0.conf
+++ /dev/null
@@ -1,338 +0,0 @@
-[submodule "qtbase"]
-	path = qtbase
-	url = ../qtbase.git
-	branch = 6.6.0
-	status = essential
-[submodule "qtsvg"]
-	depends = qtbase
-	path = qtsvg
-	url = ../qtsvg.git
-	branch = 6.6.0
-	status = addon
-[submodule "qtdeclarative"]
-	depends = qtbase
-	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
-	path = qtdeclarative
-	url = ../qtdeclarative.git
-	branch = 6.6.0
-	status = essential
-[submodule "qtactiveqt"]
-	depends = qtbase
-	path = qtactiveqt
-	url = ../qtactiveqt.git
-	branch = 6.6.0
-	status = addon
-[submodule "qtmultimedia"]
-	depends = qtbase qtshadertools
-	recommends = qtdeclarative qtquick3d
-	path = qtmultimedia
-	url = ../qtmultimedia.git
-	branch = 6.6.0
-	status = addon
-[submodule "qttools"]
-	depends = qtbase
-	recommends = qtdeclarative qtactiveqt
-	path = qttools
-	url = ../qttools.git
-	branch = 6.6.0
-	status = essential
-[submodule "qtxmlpatterns"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtxmlpatterns
-	url = ../qtxmlpatterns.git
-	branch = dev
-	status = ignore
-[submodule "qttranslations"]
-	depends = qttools
-	path = qttranslations
-	url = ../qttranslations.git
-	branch = 6.6.0
-	status = essential
-	priority = 30
-[submodule "qtdoc"]
-	depends = qtdeclarative qttools
-	recommends = qtmultimedia qtshadertools qtwebengine
-	path = qtdoc
-	url = ../qtdoc.git
-	branch = 6.6.0
-	status = essential
-	priority = 40
-[submodule "qtrepotools"]
-	path = qtrepotools
-	url = ../qtrepotools.git
-	branch = master
-	status = essential
-	project = -
-[submodule "qtqa"]
-	depends = qtbase
-	path = qtqa
-	url = ../qtqa.git
-	branch = dev
-	status = essential
-	priority = 50
-[submodule "qtlocation"]
-	depends = qtbase qtpositioning
-	recommends = qtdeclarative
-	path = qtlocation
-	url = ../qtlocation.git
-	branch = 6.6.0
-	status = preview
-[submodule "qtpositioning"]
-	depends = qtbase
-	recommends = qtdeclarative qtserialport
-	path = qtpositioning
-	url = ../qtpositioning.git
-	branch = 6.6.0
-	status = addon
-[submodule "qtsensors"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtsensors
-	url = ../qtsensors.git
-	branch = 6.6.0
-	status = addon
-[submodule "qtsystems"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtsystems
-	url = ../qtsystems.git
-	branch = dev
-	status = ignore
-[submodule "qtfeedback"]
-	depends = qtdeclarative
-	recommends = qtmultimedia
-	path = qtfeedback
-	url = ../qtfeedback.git
-	branch = master
-	status = ignore
-[submodule "qtpim"]
-	depends = qtdeclarative
-	path = qtpim
-	url = ../qtpim.git
-	branch = dev
-	status = ignore
-[submodule "qtconnectivity"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtconnectivity
-	url = ../qtconnectivity.git
-	branch = 6.6.0
-	status = addon
-[submodule "qtwayland"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtwayland
-	url = ../qtwayland.git
-	branch = 6.6.0
-	status = addon
-[submodule "qt3d"]
-	depends = qtbase
-	recommends = qtdeclarative qtshadertools qtmultimedia
-	path = qt3d
-	url = ../qt3d.git
-	branch = 6.6.0
-	status = addon
-[submodule "qtimageformats"]
-	depends = qtbase
-	path = qtimageformats
-	url = ../qtimageformats.git
-	branch = 6.6.0
-	status = addon
-[submodule "qtserialbus"]
-	depends = qtbase
-	recommends = qtserialport
-	path = qtserialbus
-	url = ../qtserialbus.git
-	branch = 6.6.0
-	status = addon
-[submodule "qtserialport"]
-	depends = qtbase
-	path = qtserialport
-	url = ../qtserialport.git
-	branch = 6.6.0
-	status = addon
-[submodule "qtwebsockets"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtwebsockets
-	url = ../qtwebsockets.git
-	branch = 6.6.0
-	status = addon
-[submodule "qtwebchannel"]
-	depends = qtbase
-	recommends = qtdeclarative qtwebsockets
-	path = qtwebchannel
-	url = ../qtwebchannel.git
-	branch = 6.6.0
-	status = addon
-[submodule "qtwebengine"]
-	depends = qtdeclarative
-	recommends = qtwebchannel qttools qtpositioning
-	path = qtwebengine
-	url = ../qtwebengine.git
-	branch = 6.6.0
-	status = addon
-	priority = 10
-[submodule "qtcanvas3d"]
-	depends = qtdeclarative
-	path = qtcanvas3d
-	url = ../qtcanvas3d.git
-	branch = dev
-	status = ignore
-[submodule "qtwebview"]
-	depends = qtdeclarative
-	recommends = qtwebengine
-	path = qtwebview
-	url = ../qtwebview.git
-	branch = 6.6.0
-	status = addon
-[submodule "qtcharts"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtcharts
-	url = ../qtcharts.git
-	branch = 6.6.0
-	status = addon
-[submodule "qtdatavis3d"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtdatavis3d
-	url = ../qtdatavis3d.git
-	branch = 6.6.0
-	status = addon
-[submodule "qtvirtualkeyboard"]
-	depends = qtbase qtdeclarative qtsvg
-	recommends = qtmultimedia
-	path = qtvirtualkeyboard
-	url = ../qtvirtualkeyboard.git
-	branch = 6.6.0
-	status = addon
-[submodule "qtgamepad"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtgamepad
-	url = ../qtgamepad.git
-	branch = dev
-	status = ignore
-[submodule "qtscxml"]
-	depends = qtbase qtdeclarative
-	path = qtscxml
-	url = ../qtscxml.git
-	branch = 6.6.0
-	status = addon
-[submodule "qtspeech"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtspeech
-	url = ../qtspeech.git
-	branch = 6.6.0
-	status = addon
-[submodule "qtnetworkauth"]
-	depends = qtbase
-	path = qtnetworkauth
-	url = ../qtnetworkauth.git
-	branch = 6.6.0
-	status = addon
-[submodule "qtremoteobjects"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtremoteobjects
-	url = ../qtremoteobjects.git
-	branch = 6.6.0
-	status = addon
-[submodule "qtwebglplugin"]
-	depends = qtbase qtwebsockets
-	recommends = qtdeclarative
-	path = qtwebglplugin
-	url = ../qtwebglplugin.git
-	branch = dev
-	status = ignore
-[submodule "qtlottie"]
-	depends = qtbase qtdeclarative
-	path = qtlottie
-	url = ../qtlottie.git
-	branch = 6.6.0
-	status = addon
-[submodule "qtquicktimeline"]
-	depends = qtbase qtdeclarative
-	path = qtquicktimeline
-	url = ../qtquicktimeline
-	branch = 6.6.0
-	status = addon
-[submodule "qtquick3d"]
-	depends = qtbase qtdeclarative qtshadertools
-	recommends = qtquicktimeline
-	path = qtquick3d
-	url = ../qtquick3d.git
-	branch = 6.6.0
-	status = addon
-[submodule "qtshadertools"]
-	depends = qtbase
-	path = qtshadertools
-	url = ../qtshadertools.git
-	branch = 6.6.0
-	status = addon
-[submodule "qt5compat"]
-	depends = qtbase qtdeclarative
-	path = qt5compat
-	url = ../qt5compat.git
-	branch = 6.6.0
-	status = deprecated
-[submodule "qtcoap"]
-	depends = qtbase
-	path = qtcoap
-	url = ../qtcoap.git
-	branch = 6.6.0
-	status = addon
-[submodule "qtmqtt"]
-	depends = qtbase qtdeclarative
-	path = qtmqtt
-	url = ../qtmqtt.git
-	branch = 6.6.0
-	status = addon
-[submodule "qtopcua"]
-	depends = qtbase qtdeclarative
-	path = qtopcua
-	url = ../qtopcua.git
-	branch = 6.6.0
-	status = addon
-[submodule "qtlanguageserver"]
-	depends = qtbase
-	path = qtlanguageserver
-	url = ../qtlanguageserver.git
-	branch = 6.6.0
-	status = preview
-[submodule "qthttpserver"]
-	depends = qtbase
-	recommends = qtwebsockets
-	path = qthttpserver
-	url = ../qthttpserver.git
-	branch = 6.6.0
-	status = preview
-[submodule "qtquick3dphysics"]
-	depends = qtbase qtdeclarative qtquick3d qtshadertools
-	path = qtquick3dphysics
-	url = ../qtquick3dphysics.git
-	branch = 6.6.0
-	status = addon
-[submodule "qtgrpc"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtgrpc
-	url = ../qtgrpc.git
-	branch = 6.6.0
-	status = preview
-[submodule "qtquickeffectmaker"]
-	depends = qtbase qtdeclarative qtshadertools
-	recommends = qtquick3d
-	path = qtquickeffectmaker
-	url = ../qtquickeffectmaker.git
-	branch = 6.6.0
-	status = addon
-[submodule "qtgraphs"]
-	depends = qtbase qtdeclarative qtquick3d
-	path = qtgraphs
-	url = ../qtgraphs.git
-	branch = 6.6.0
-	status = preview
diff --git a/recipes/qt/6.x.x/qtmodules6.6.1.conf b/recipes/qt/6.x.x/qtmodules6.6.1.conf
deleted file mode 100644
index 3d1fa112d7390..0000000000000
--- a/recipes/qt/6.x.x/qtmodules6.6.1.conf
+++ /dev/null
@@ -1,338 +0,0 @@
-[submodule "qtbase"]
-	path = qtbase
-	url = ../qtbase.git
-	branch = 6.6.1
-	status = essential
-[submodule "qtsvg"]
-	depends = qtbase
-	path = qtsvg
-	url = ../qtsvg.git
-	branch = 6.6.1
-	status = addon
-[submodule "qtdeclarative"]
-	depends = qtbase
-	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
-	path = qtdeclarative
-	url = ../qtdeclarative.git
-	branch = 6.6.1
-	status = essential
-[submodule "qtactiveqt"]
-	depends = qtbase
-	path = qtactiveqt
-	url = ../qtactiveqt.git
-	branch = 6.6.1
-	status = addon
-[submodule "qtmultimedia"]
-	depends = qtbase qtshadertools
-	recommends = qtdeclarative qtquick3d
-	path = qtmultimedia
-	url = ../qtmultimedia.git
-	branch = 6.6.1
-	status = addon
-[submodule "qttools"]
-	depends = qtbase
-	recommends = qtdeclarative qtactiveqt
-	path = qttools
-	url = ../qttools.git
-	branch = 6.6.1
-	status = essential
-[submodule "qtxmlpatterns"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtxmlpatterns
-	url = ../qtxmlpatterns.git
-	branch = dev
-	status = ignore
-[submodule "qttranslations"]
-	depends = qttools
-	path = qttranslations
-	url = ../qttranslations.git
-	branch = 6.6.1
-	status = essential
-	priority = 30
-[submodule "qtdoc"]
-	depends = qtdeclarative qttools
-	recommends = qtmultimedia qtshadertools qtwebengine
-	path = qtdoc
-	url = ../qtdoc.git
-	branch = 6.6.1
-	status = essential
-	priority = 40
-[submodule "qtrepotools"]
-	path = qtrepotools
-	url = ../qtrepotools.git
-	branch = master
-	status = essential
-	project = -
-[submodule "qtqa"]
-	depends = qtbase
-	path = qtqa
-	url = ../qtqa.git
-	branch = dev
-	status = essential
-	priority = 50
-[submodule "qtlocation"]
-	depends = qtbase qtpositioning
-	recommends = qtdeclarative
-	path = qtlocation
-	url = ../qtlocation.git
-	branch = 6.6.1
-	status = preview
-[submodule "qtpositioning"]
-	depends = qtbase
-	recommends = qtdeclarative qtserialport
-	path = qtpositioning
-	url = ../qtpositioning.git
-	branch = 6.6.1
-	status = addon
-[submodule "qtsensors"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtsensors
-	url = ../qtsensors.git
-	branch = 6.6.1
-	status = addon
-[submodule "qtsystems"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtsystems
-	url = ../qtsystems.git
-	branch = dev
-	status = ignore
-[submodule "qtfeedback"]
-	depends = qtdeclarative
-	recommends = qtmultimedia
-	path = qtfeedback
-	url = ../qtfeedback.git
-	branch = master
-	status = ignore
-[submodule "qtpim"]
-	depends = qtdeclarative
-	path = qtpim
-	url = ../qtpim.git
-	branch = dev
-	status = ignore
-[submodule "qtconnectivity"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtconnectivity
-	url = ../qtconnectivity.git
-	branch = 6.6.1
-	status = addon
-[submodule "qtwayland"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtwayland
-	url = ../qtwayland.git
-	branch = 6.6.1
-	status = addon
-[submodule "qt3d"]
-	depends = qtbase
-	recommends = qtdeclarative qtshadertools qtmultimedia
-	path = qt3d
-	url = ../qt3d.git
-	branch = 6.6.1
-	status = addon
-[submodule "qtimageformats"]
-	depends = qtbase
-	path = qtimageformats
-	url = ../qtimageformats.git
-	branch = 6.6.1
-	status = addon
-[submodule "qtserialbus"]
-	depends = qtbase
-	recommends = qtserialport
-	path = qtserialbus
-	url = ../qtserialbus.git
-	branch = 6.6.1
-	status = addon
-[submodule "qtserialport"]
-	depends = qtbase
-	path = qtserialport
-	url = ../qtserialport.git
-	branch = 6.6.1
-	status = addon
-[submodule "qtwebsockets"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtwebsockets
-	url = ../qtwebsockets.git
-	branch = 6.6.1
-	status = addon
-[submodule "qtwebchannel"]
-	depends = qtbase
-	recommends = qtdeclarative qtwebsockets
-	path = qtwebchannel
-	url = ../qtwebchannel.git
-	branch = 6.6.1
-	status = addon
-[submodule "qtwebengine"]
-	depends = qtdeclarative
-	recommends = qtwebchannel qttools qtpositioning
-	path = qtwebengine
-	url = ../qtwebengine.git
-	branch = 6.6.1
-	status = addon
-	priority = 10
-[submodule "qtcanvas3d"]
-	depends = qtdeclarative
-	path = qtcanvas3d
-	url = ../qtcanvas3d.git
-	branch = dev
-	status = ignore
-[submodule "qtwebview"]
-	depends = qtdeclarative
-	recommends = qtwebengine
-	path = qtwebview
-	url = ../qtwebview.git
-	branch = 6.6.1
-	status = addon
-[submodule "qtcharts"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtcharts
-	url = ../qtcharts.git
-	branch = 6.6.1
-	status = addon
-[submodule "qtdatavis3d"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtdatavis3d
-	url = ../qtdatavis3d.git
-	branch = 6.6.1
-	status = addon
-[submodule "qtvirtualkeyboard"]
-	depends = qtbase qtdeclarative qtsvg
-	recommends = qtmultimedia
-	path = qtvirtualkeyboard
-	url = ../qtvirtualkeyboard.git
-	branch = 6.6.1
-	status = addon
-[submodule "qtgamepad"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtgamepad
-	url = ../qtgamepad.git
-	branch = dev
-	status = ignore
-[submodule "qtscxml"]
-	depends = qtbase qtdeclarative
-	path = qtscxml
-	url = ../qtscxml.git
-	branch = 6.6.1
-	status = addon
-[submodule "qtspeech"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtspeech
-	url = ../qtspeech.git
-	branch = 6.6.1
-	status = addon
-[submodule "qtnetworkauth"]
-	depends = qtbase
-	path = qtnetworkauth
-	url = ../qtnetworkauth.git
-	branch = 6.6.1
-	status = addon
-[submodule "qtremoteobjects"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtremoteobjects
-	url = ../qtremoteobjects.git
-	branch = 6.6.1
-	status = addon
-[submodule "qtwebglplugin"]
-	depends = qtbase qtwebsockets
-	recommends = qtdeclarative
-	path = qtwebglplugin
-	url = ../qtwebglplugin.git
-	branch = dev
-	status = ignore
-[submodule "qtlottie"]
-	depends = qtbase qtdeclarative
-	path = qtlottie
-	url = ../qtlottie.git
-	branch = 6.6.1
-	status = addon
-[submodule "qtquicktimeline"]
-	depends = qtbase qtdeclarative
-	path = qtquicktimeline
-	url = ../qtquicktimeline
-	branch = 6.6.1
-	status = addon
-[submodule "qtquick3d"]
-	depends = qtbase qtdeclarative qtshadertools
-	recommends = qtquicktimeline
-	path = qtquick3d
-	url = ../qtquick3d.git
-	branch = 6.6.1
-	status = addon
-[submodule "qtshadertools"]
-	depends = qtbase
-	path = qtshadertools
-	url = ../qtshadertools.git
-	branch = 6.6.1
-	status = addon
-[submodule "qt5compat"]
-	depends = qtbase qtdeclarative
-	path = qt5compat
-	url = ../qt5compat.git
-	branch = 6.6.1
-	status = deprecated
-[submodule "qtcoap"]
-	depends = qtbase
-	path = qtcoap
-	url = ../qtcoap.git
-	branch = 6.6.1
-	status = addon
-[submodule "qtmqtt"]
-	depends = qtbase qtdeclarative
-	path = qtmqtt
-	url = ../qtmqtt.git
-	branch = 6.6.1
-	status = addon
-[submodule "qtopcua"]
-	depends = qtbase qtdeclarative
-	path = qtopcua
-	url = ../qtopcua.git
-	branch = 6.6.1
-	status = addon
-[submodule "qtlanguageserver"]
-	depends = qtbase
-	path = qtlanguageserver
-	url = ../qtlanguageserver.git
-	branch = 6.6.1
-	status = preview
-[submodule "qthttpserver"]
-	depends = qtbase
-	recommends = qtwebsockets
-	path = qthttpserver
-	url = ../qthttpserver.git
-	branch = 6.6.1
-	status = preview
-[submodule "qtquick3dphysics"]
-	depends = qtbase qtdeclarative qtquick3d qtshadertools
-	path = qtquick3dphysics
-	url = ../qtquick3dphysics.git
-	branch = 6.6.1
-	status = addon
-[submodule "qtgrpc"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtgrpc
-	url = ../qtgrpc.git
-	branch = 6.6.1
-	status = preview
-[submodule "qtquickeffectmaker"]
-	depends = qtbase qtdeclarative qtshadertools
-	recommends = qtquick3d
-	path = qtquickeffectmaker
-	url = ../qtquickeffectmaker.git
-	branch = 6.6.1
-	status = addon
-[submodule "qtgraphs"]
-	depends = qtbase qtdeclarative qtquick3d
-	path = qtgraphs
-	url = ../qtgraphs.git
-	branch = 6.6.1
-	status = preview
diff --git a/recipes/qt/6.x.x/qtmodules6.6.2.conf b/recipes/qt/6.x.x/qtmodules6.6.2.conf
deleted file mode 100644
index 1ad0f474e5053..0000000000000
--- a/recipes/qt/6.x.x/qtmodules6.6.2.conf
+++ /dev/null
@@ -1,338 +0,0 @@
-[submodule "qtbase"]
-	path = qtbase
-	url = ../qtbase.git
-	branch = 6.6.2
-	status = essential
-[submodule "qtsvg"]
-	depends = qtbase
-	path = qtsvg
-	url = ../qtsvg.git
-	branch = 6.6.2
-	status = addon
-[submodule "qtdeclarative"]
-	depends = qtbase
-	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
-	path = qtdeclarative
-	url = ../qtdeclarative.git
-	branch = 6.6.2
-	status = essential
-[submodule "qtactiveqt"]
-	depends = qtbase
-	path = qtactiveqt
-	url = ../qtactiveqt.git
-	branch = 6.6.2
-	status = addon
-[submodule "qtmultimedia"]
-	depends = qtbase qtshadertools
-	recommends = qtdeclarative qtquick3d
-	path = qtmultimedia
-	url = ../qtmultimedia.git
-	branch = 6.6.2
-	status = addon
-[submodule "qttools"]
-	depends = qtbase
-	recommends = qtdeclarative qtactiveqt
-	path = qttools
-	url = ../qttools.git
-	branch = 6.6.2
-	status = essential
-[submodule "qtxmlpatterns"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtxmlpatterns
-	url = ../qtxmlpatterns.git
-	branch = dev
-	status = ignore
-[submodule "qttranslations"]
-	depends = qttools
-	path = qttranslations
-	url = ../qttranslations.git
-	branch = 6.6.2
-	status = essential
-	priority = 30
-[submodule "qtdoc"]
-	depends = qtdeclarative qttools
-	recommends = qtmultimedia qtshadertools qtwebengine
-	path = qtdoc
-	url = ../qtdoc.git
-	branch = 6.6.2
-	status = essential
-	priority = 40
-[submodule "qtrepotools"]
-	path = qtrepotools
-	url = ../qtrepotools.git
-	branch = master
-	status = essential
-	project = -
-[submodule "qtqa"]
-	depends = qtbase
-	path = qtqa
-	url = ../qtqa.git
-	branch = dev
-	status = essential
-	priority = 50
-[submodule "qtlocation"]
-	depends = qtbase qtpositioning
-	recommends = qtdeclarative
-	path = qtlocation
-	url = ../qtlocation.git
-	branch = 6.6.2
-	status = preview
-[submodule "qtpositioning"]
-	depends = qtbase
-	recommends = qtdeclarative qtserialport
-	path = qtpositioning
-	url = ../qtpositioning.git
-	branch = 6.6.2
-	status = addon
-[submodule "qtsensors"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtsensors
-	url = ../qtsensors.git
-	branch = 6.6.2
-	status = addon
-[submodule "qtsystems"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtsystems
-	url = ../qtsystems.git
-	branch = dev
-	status = ignore
-[submodule "qtfeedback"]
-	depends = qtdeclarative
-	recommends = qtmultimedia
-	path = qtfeedback
-	url = ../qtfeedback.git
-	branch = master
-	status = ignore
-[submodule "qtpim"]
-	depends = qtdeclarative
-	path = qtpim
-	url = ../qtpim.git
-	branch = dev
-	status = ignore
-[submodule "qtconnectivity"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtconnectivity
-	url = ../qtconnectivity.git
-	branch = 6.6.2
-	status = addon
-[submodule "qtwayland"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtwayland
-	url = ../qtwayland.git
-	branch = 6.6.2
-	status = addon
-[submodule "qt3d"]
-	depends = qtbase
-	recommends = qtdeclarative qtshadertools qtmultimedia
-	path = qt3d
-	url = ../qt3d.git
-	branch = 6.6.2
-	status = addon
-[submodule "qtimageformats"]
-	depends = qtbase
-	path = qtimageformats
-	url = ../qtimageformats.git
-	branch = 6.6.2
-	status = addon
-[submodule "qtserialbus"]
-	depends = qtbase
-	recommends = qtserialport
-	path = qtserialbus
-	url = ../qtserialbus.git
-	branch = 6.6.2
-	status = addon
-[submodule "qtserialport"]
-	depends = qtbase
-	path = qtserialport
-	url = ../qtserialport.git
-	branch = 6.6.2
-	status = addon
-[submodule "qtwebsockets"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtwebsockets
-	url = ../qtwebsockets.git
-	branch = 6.6.2
-	status = addon
-[submodule "qtwebchannel"]
-	depends = qtbase
-	recommends = qtdeclarative qtwebsockets
-	path = qtwebchannel
-	url = ../qtwebchannel.git
-	branch = 6.6.2
-	status = addon
-[submodule "qtwebengine"]
-	depends = qtdeclarative
-	recommends = qtwebchannel qttools qtpositioning
-	path = qtwebengine
-	url = ../qtwebengine.git
-	branch = 6.6.2
-	status = addon
-	priority = 10
-[submodule "qtcanvas3d"]
-	depends = qtdeclarative
-	path = qtcanvas3d
-	url = ../qtcanvas3d.git
-	branch = dev
-	status = ignore
-[submodule "qtwebview"]
-	depends = qtdeclarative
-	recommends = qtwebengine
-	path = qtwebview
-	url = ../qtwebview.git
-	branch = 6.6.2
-	status = addon
-[submodule "qtcharts"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtcharts
-	url = ../qtcharts.git
-	branch = 6.6.2
-	status = addon
-[submodule "qtdatavis3d"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtdatavis3d
-	url = ../qtdatavis3d.git
-	branch = 6.6.2
-	status = addon
-[submodule "qtvirtualkeyboard"]
-	depends = qtbase qtdeclarative qtsvg
-	recommends = qtmultimedia
-	path = qtvirtualkeyboard
-	url = ../qtvirtualkeyboard.git
-	branch = 6.6.2
-	status = addon
-[submodule "qtgamepad"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtgamepad
-	url = ../qtgamepad.git
-	branch = dev
-	status = ignore
-[submodule "qtscxml"]
-	depends = qtbase qtdeclarative
-	path = qtscxml
-	url = ../qtscxml.git
-	branch = 6.6.2
-	status = addon
-[submodule "qtspeech"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtspeech
-	url = ../qtspeech.git
-	branch = 6.6.2
-	status = addon
-[submodule "qtnetworkauth"]
-	depends = qtbase
-	path = qtnetworkauth
-	url = ../qtnetworkauth.git
-	branch = 6.6.2
-	status = addon
-[submodule "qtremoteobjects"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtremoteobjects
-	url = ../qtremoteobjects.git
-	branch = 6.6.2
-	status = addon
-[submodule "qtwebglplugin"]
-	depends = qtbase qtwebsockets
-	recommends = qtdeclarative
-	path = qtwebglplugin
-	url = ../qtwebglplugin.git
-	branch = dev
-	status = ignore
-[submodule "qtlottie"]
-	depends = qtbase qtdeclarative
-	path = qtlottie
-	url = ../qtlottie.git
-	branch = 6.6.2
-	status = addon
-[submodule "qtquicktimeline"]
-	depends = qtbase qtdeclarative
-	path = qtquicktimeline
-	url = ../qtquicktimeline
-	branch = 6.6.2
-	status = addon
-[submodule "qtquick3d"]
-	depends = qtbase qtdeclarative qtshadertools
-	recommends = qtquicktimeline
-	path = qtquick3d
-	url = ../qtquick3d.git
-	branch = 6.6.2
-	status = addon
-[submodule "qtshadertools"]
-	depends = qtbase
-	path = qtshadertools
-	url = ../qtshadertools.git
-	branch = 6.6.2
-	status = addon
-[submodule "qt5compat"]
-	depends = qtbase qtdeclarative
-	path = qt5compat
-	url = ../qt5compat.git
-	branch = 6.6.2
-	status = deprecated
-[submodule "qtcoap"]
-	depends = qtbase
-	path = qtcoap
-	url = ../qtcoap.git
-	branch = 6.6.2
-	status = addon
-[submodule "qtmqtt"]
-	depends = qtbase qtdeclarative
-	path = qtmqtt
-	url = ../qtmqtt.git
-	branch = 6.6.2
-	status = addon
-[submodule "qtopcua"]
-	depends = qtbase qtdeclarative
-	path = qtopcua
-	url = ../qtopcua.git
-	branch = 6.6.2
-	status = addon
-[submodule "qtlanguageserver"]
-	depends = qtbase
-	path = qtlanguageserver
-	url = ../qtlanguageserver.git
-	branch = 6.6.2
-	status = preview
-[submodule "qthttpserver"]
-	depends = qtbase
-	recommends = qtwebsockets
-	path = qthttpserver
-	url = ../qthttpserver.git
-	branch = 6.6.2
-	status = preview
-[submodule "qtquick3dphysics"]
-	depends = qtbase qtdeclarative qtquick3d qtshadertools
-	path = qtquick3dphysics
-	url = ../qtquick3dphysics.git
-	branch = 6.6.2
-	status = addon
-[submodule "qtgrpc"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtgrpc
-	url = ../qtgrpc.git
-	branch = 6.6.2
-	status = preview
-[submodule "qtquickeffectmaker"]
-	depends = qtbase qtdeclarative qtshadertools
-	recommends = qtquick3d
-	path = qtquickeffectmaker
-	url = ../qtquickeffectmaker.git
-	branch = 6.6.2
-	status = addon
-[submodule "qtgraphs"]
-	depends = qtbase qtdeclarative qtquick3d
-	path = qtgraphs
-	url = ../qtgraphs.git
-	branch = 6.6.2
-	status = preview
diff --git a/recipes/qt/config.yml b/recipes/qt/config.yml
index 238dd7a439c7d..b696134b2fcad 100644
--- a/recipes/qt/config.yml
+++ b/recipes/qt/config.yml
@@ -3,25 +3,13 @@ versions:
     folder: 6.x.x
   "6.6.3":
     folder: 6.x.x
-  "6.6.2":
-    folder: 6.x.x
-  "6.6.1":
-    folder: 6.x.x
-  "6.6.0":
-    folder: 6.x.x
   "6.5.3":
     folder: 6.x.x
   "6.4.2":
     folder: 6.x.x
-  "6.3.2":
-    folder: 6.x.x
   "5.15.13":
     folder: 5.x.x
   "5.15.12":
     folder: 5.x.x
   "5.15.11":
     folder: 5.x.x
-  "5.15.10":
-    folder: 5.x.x
-  "5.15.9":
-    folder: 5.x.x

From 4c10f03044109a025de4efb34f11dae4a903396a Mon Sep 17 00:00:00 2001
From: ericLemanissier <ericLemanissier@users.noreply.github.com>
Date: Tue, 16 Apr 2024 11:15:51 +0000
Subject: [PATCH 3/9] qt: force use of bundled xcb-xinput

xenial does not have xcb-xinput
---
 recipes/qt/5.x.x/conanfile.py | 2 ++
 recipes/qt/6.x.x/conanfile.py | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/recipes/qt/5.x.x/conanfile.py b/recipes/qt/5.x.x/conanfile.py
index a0d7d351199c0..8712d0f5041f0 100644
--- a/recipes/qt/5.x.x/conanfile.py
+++ b/recipes/qt/5.x.x/conanfile.py
@@ -699,6 +699,8 @@ def build(self):
 
         args.append("-feature-gssapi" if self.options.get_safe("with_gssapi", False) else "-no-feature-gssapi")
 
+        args.append("-bundled-xcb-xinput")
+
         for opt, conf_arg in [
                               ("with_doubleconversion", "doubleconversion"),
                               ("with_freetype", "freetype"),
diff --git a/recipes/qt/6.x.x/conanfile.py b/recipes/qt/6.x.x/conanfile.py
index 7ebd60de80d5c..1bbb1e785ca0f 100644
--- a/recipes/qt/6.x.x/conanfile.py
+++ b/recipes/qt/6.x.x/conanfile.py
@@ -580,6 +580,8 @@ def generate(self):
 
         for feature in str(self.options.disabled_features).split():
             tc.variables[f"FEATURE_{feature}"] = "OFF"
+        
+        tc.variables["INPUT_bundled_xcb_xinput"] = "yes"
 
         if self.settings.os == "Macos":
             tc.variables["FEATURE_framework"] = "OFF"

From 9d25bf5ded23604482a7382661552b9864acaf3e Mon Sep 17 00:00:00 2001
From: ericLemanissier <ericLemanissier@users.noreply.github.com>
Date: Wed, 17 Apr 2024 10:58:01 +0200
Subject: [PATCH 4/9] fix components name

---
 recipes/qt/5.x.x/conanfile.py |  6 +++---
 recipes/qt/6.x.x/conanfile.py | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/recipes/qt/5.x.x/conanfile.py b/recipes/qt/5.x.x/conanfile.py
index 8712d0f5041f0..4ba3aa07994b3 100644
--- a/recipes/qt/5.x.x/conanfile.py
+++ b/recipes/qt/5.x.x/conanfile.py
@@ -1186,11 +1186,11 @@ def _create_plugin(pluginname, libname, plugintype, requires):
                     cocoa_reqs.append("PrintSupport")
                 _create_plugin("QCocoaIntegrationPlugin", "qcocoa", "platforms", cocoa_reqs)
                 _create_plugin("QMacStylePlugin", "qmacstyle", "styles", cocoa_reqs)
-                self.cpp_info.components["QCocoaIntegrationPlugin"].frameworks = ["AppKit", "Carbon", "CoreServices", "CoreVideo",
+                self.cpp_info.components["qtQCocoaIntegrationPlugin"].frameworks = ["AppKit", "Carbon", "CoreServices", "CoreVideo",
                     "IOKit", "IOSurface", "Metal", "QuartzCore"]
             elif self.settings.os in ["iOS", "tvOS"]:
                 _create_plugin("QIOSIntegrationPlugin", "qios", "platforms", ["ClipboardSupport", "FontDatabaseSupport", "GraphicsSupport"])
-                self.cpp_info.components["QIOSIntegrationPlugin"].frameworks = ["AudioToolbox", "Foundation", "Metal",
+                self.cpp_info.components["qtQIOSIntegrationPlugin"].frameworks = ["AudioToolbox", "Foundation", "Metal",
                     "MobileCoreServices", "OpenGLES", "QuartzCore", "UIKit"]
             elif self.settings.os == "watchOS":
                 _create_plugin("QMinimalIntegrationPlugin", "qminimal", "platforms", ["EventDispatcherSupport", "FontDatabaseSupport"])
@@ -1312,7 +1312,7 @@ def _create_plugin(pluginname, libname, plugintype, requires):
                                       "nss::nss", "libdrm::libdrm", "egl::egl"])
             _create_module("WebEngineCore", webenginereqs)
             if self.settings.os != "Windows":
-                self.cpp_info.components["WebEngineCore"].system_libs.append("resolv")
+                self.cpp_info.components["qtWebEngineCore"].system_libs.append("resolv")
             _create_module("WebEngine", ["WebEngineCore"])
             _create_module("WebEngineWidgets", ["WebEngineCore", "Quick", "PrintSupport", "Widgets", "Gui", "Network"])
 
diff --git a/recipes/qt/6.x.x/conanfile.py b/recipes/qt/6.x.x/conanfile.py
index 1bbb1e785ca0f..775b8e0091386 100644
--- a/recipes/qt/6.x.x/conanfile.py
+++ b/recipes/qt/6.x.x/conanfile.py
@@ -1136,18 +1136,18 @@ def _create_plugin(pluginname, libname, plugintype, requires):
                     self.cpp_info.components["qtGui"].frameworks += ["AppKit", "Carbon"]
                     _create_plugin("QCocoaIntegrationPlugin", "qcocoa", "platforms", ["Core", "Gui"])
                     # https://github.com/qt/qtbase/blob/v6.6.1/src/plugins/platforms/cocoa/CMakeLists.txt#L51-L58
-                    self.cpp_info.components["QCocoaIntegrationPlugin"].frameworks = [
+                    self.cpp_info.components["qtQCocoaIntegrationPlugin"].frameworks = [
                         "AppKit", "Carbon", "CoreServices", "CoreVideo", "IOKit", "IOSurface", "Metal", "QuartzCore"
                     ]
                 elif self.settings.os in ["iOS", "tvOS"]:
                     _create_plugin("QIOSIntegrationPlugin", "qios", "platforms", [])
                     # https://github.com/qt/qtbase/blob/v6.6.1/src/plugins/platforms/ios/CMakeLists.txt#L32-L37
-                    self.cpp_info.components["QIOSIntegrationPlugin"].frameworks = [
+                    self.cpp_info.components["qtQIOSIntegrationPlugin"].frameworks = [
                         "AudioToolbox", "Foundation", "Metal", "QuartzCore", "UIKit", "CoreGraphics"
                     ]
                     if self.settings.os != "tvOS":
                         # https://github.com/qt/qtbase/blob/v6.6.1/src/plugins/platforms/ios/CMakeLists.txt#L66-L68
-                        self.cpp_info.components["QIOSIntegrationPlugin"].frameworks += [
+                        self.cpp_info.components["qtQIOSIntegrationPlugin"].frameworks += [
                             "AssetsLibrary", "UniformTypeIdentifiers", "Photos",
                         ]
                 elif self.settings.os == "watchOS":
@@ -1175,9 +1175,9 @@ def _create_plugin(pluginname, libname, plugintype, requires):
         if self.options.with_odbc:
             _create_plugin("QODBCDriverPlugin", "qsqlodbc", "sqldrivers", [])
             if self.settings.os != "Windows":
-                self.cpp_info.components["QODBCDriverPlugin"].requires.append("odbc::odbc")
+                self.cpp_info.components["qtQODBCDriverPlugin"].requires.append("odbc::odbc")
             else:
-                self.cpp_info.components["QODBCDriverPlugin"].system_libs.append("odbc32")
+                self.cpp_info.components["qtQODBCDriverPlugin"].system_libs.append("odbc32")
         networkReqs = []
         if self.options.openssl:
             networkReqs.append("openssl::openssl")

From a4c8f72f570184b5febd7ce2b8693181d997d7c2 Mon Sep 17 00:00:00 2001
From: ericLemanissier <ericLemanissier@users.noreply.github.com>
Date: Fri, 19 Apr 2024 14:05:36 +0200
Subject: [PATCH 5/9] use rm_safe

---
 recipes/qt/5.x.x/conanfile.py | 26 +++++++++++++-------------
 recipes/qt/6.x.x/conanfile.py | 20 ++++++++++----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/recipes/qt/5.x.x/conanfile.py b/recipes/qt/5.x.x/conanfile.py
index 4ba3aa07994b3..2a930fa8b3335 100644
--- a/recipes/qt/5.x.x/conanfile.py
+++ b/recipes/qt/5.x.x/conanfile.py
@@ -214,18 +214,18 @@ def configure(self):
         #         self.options.with_libiconv = False # QTBUG-84708
 
         if not self.options.gui:
-            del self.options.opengl
-            del self.options.with_vulkan
-            del self.options.with_freetype
-            del self.options.with_fontconfig
-            del self.options.with_harfbuzz
-            del self.options.with_libjpeg
-            del self.options.with_libpng
-            del self.options.with_md4c
-            del self.options.with_x11
+            self.options.rm_safe("opengl")
+            self.options.rm_safe("with_vulkan")
+            self.options.rm_safe("with_freetype")
+            self.options.rm_safe("with_fontconfig")
+            self.options.rm_safe("with_harfbuzz")
+            self.options.rm_safe("with_libjpeg")
+            self.options.rm_safe("with_libpng")
+            self.options.rm_safe("with_md4c")
+            self.options.rm_safe("with_x11")
 
         if not self.options.with_dbus:
-            del self.options.with_atspi
+            self.options.rm_safe("with_atspi")
 
         if self.options.multiconfiguration:
             del self.settings.build_type
@@ -279,9 +279,9 @@ def _enablemodule(mod):
 
         if not self.options.qtmultimedia:
             self.options.rm_safe("with_libalsa")
-            del self.options.with_openal
-            del self.options.with_gstreamer
-            del self.options.with_pulseaudio
+            self.options.rm_safe("with_openal")
+            self.options.rm_safe("with_gstreamer")
+            self.options.rm_safe("with_pulseaudio")
 
         if self.settings.os in ("FreeBSD", "Linux"):
             if self.options.qtwebengine:
diff --git a/recipes/qt/6.x.x/conanfile.py b/recipes/qt/6.x.x/conanfile.py
index 775b8e0091386..5e42cf9cd360f 100644
--- a/recipes/qt/6.x.x/conanfile.py
+++ b/recipes/qt/6.x.x/conanfile.py
@@ -198,14 +198,14 @@ def _minimum_compilers_version(self):
 
     def configure(self):
         if not self.options.gui:
-            del self.options.opengl
-            del self.options.with_vulkan
-            del self.options.with_freetype
+            self.options.rm_safe("opengl")
+            self.options.rm_safe("with_vulkan")
+            self.options.rm_safe("with_freetype")
             self.options.rm_safe("with_fontconfig")
-            del self.options.with_harfbuzz
-            del self.options.with_libjpeg
-            del self.options.with_libpng
-            del self.options.with_md4c
+            self.options.rm_safe("with_harfbuzz")
+            self.options.rm_safe("with_libjpeg")
+            self.options.rm_safe("with_libpng")
+            self.options.rm_safe("with_md4c")
             self.options.rm_safe("with_x11")
             self.options.rm_safe("with_egl")
 
@@ -240,9 +240,9 @@ def _enablemodule(mod):
 
         if not self.options.get_safe("qtmultimedia"):
             self.options.rm_safe("with_libalsa")
-            del self.options.with_openal
-            del self.options.with_gstreamer
-            del self.options.with_pulseaudio
+            self.options.rm_safe("with_openal")
+            self.options.rm_safe("with_gstreamer")
+            self.options.rm_safe("with_pulseaudio")
 
         if self.settings.os in ("FreeBSD", "Linux"):
             if self.options.get_safe("qtwebengine"):

From c7210de28c73160e6993fca4ca25762fcea7b699 Mon Sep 17 00:00:00 2001
From: ericLemanissier <ericLemanissier@users.noreply.github.com>
Date: Mon, 22 Apr 2024 10:40:30 +0200
Subject: [PATCH 6/9] GUI does not link to freetype and fontconfig

cf https://github.com/qt/qtbase/blob/v5.15.13-lts-lgpl/src/gui/gui.pro
only FontDatabaseSupport links to freetype
found by @ledocc
---
 recipes/qt/5.x.x/conanfile.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/recipes/qt/5.x.x/conanfile.py b/recipes/qt/5.x.x/conanfile.py
index 2a930fa8b3335..b1776d7a20301 100644
--- a/recipes/qt/5.x.x/conanfile.py
+++ b/recipes/qt/5.x.x/conanfile.py
@@ -1094,12 +1094,8 @@ def _create_plugin(pluginname, libname, plugintype, requires):
             gui_reqs = []
             if self.options.with_dbus:
                 gui_reqs.append("DBus")
-            if self.options.with_freetype:
-                gui_reqs.append("freetype::freetype")
             if self.options.with_libpng:
                 gui_reqs.append("libpng::libpng")
-            if self.options.get_safe("with_fontconfig", False):
-                gui_reqs.append("fontconfig::fontconfig")
             if self.settings.os in ["Linux", "FreeBSD"]:
                 if self.options.qtwayland or self.options.get_safe("with_x11", False):
                     gui_reqs.append("xkbcommon::xkbcommon")
@@ -1214,6 +1210,8 @@ def _create_plugin(pluginname, libname, plugintype, requires):
                     xcb_qpa_reqs.append("VulkanSupport")
                 if self.options.get_safe("with_x11", False):
                     _create_module("XcbQpa", xcb_qpa_reqs, has_include_dir=False)
+                    if self.options.get_safe("with_fontconfig", False):
+                        self.cpp_info.components["qtXcbQpa"].requires.append("fontconfig::fontconfig")
                     _create_plugin("QXcbIntegrationPlugin", "qxcb", "platforms", ["Core", "Gui", "XcbQpa"])
 
         if self.options.with_sqlite3:

From 0e99804764b17dc2800ee90aff9914c1fb1f040a Mon Sep 17 00:00:00 2001
From: ericLemanissier <ericLemanissier@users.noreply.github.com>
Date: Mon, 22 Apr 2024 11:25:31 +0200
Subject: [PATCH 7/9] fix libalsa usage

libalsa is only used by MultimediaGstTools and QAlsaPlugin
---
 recipes/qt/5.x.x/conanfile.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/recipes/qt/5.x.x/conanfile.py b/recipes/qt/5.x.x/conanfile.py
index b1776d7a20301..984e296c2934a 100644
--- a/recipes/qt/5.x.x/conanfile.py
+++ b/recipes/qt/5.x.x/conanfile.py
@@ -1376,8 +1376,6 @@ def _create_plugin(pluginname, libname, plugintype, requires):
 
         if self.options.qtmultimedia:
             multimedia_reqs = ["Network", "Gui"]
-            if self.options.get_safe("with_libalsa", False):
-                multimedia_reqs.append("libalsa::libalsa")
             if self.options.with_openal:
                 multimedia_reqs.append("openal-soft::openal-soft")
             if self.options.get_safe("with_pulseaudio", False):
@@ -1389,12 +1387,15 @@ def _create_plugin(pluginname, libname, plugintype, requires):
             _create_plugin("QM3uPlaylistPlugin", "qtmultimedia_m3u", "playlistformats", [])
             if self.options.with_gstreamer:
                 _create_module("MultimediaGstTools", ["Multimedia", "MultimediaWidgets", "Gui", "gst-plugins-base::gst-plugins-base"])
+                if self.options.get_safe("with_libalsa", False):
+                    self.cpp_info.components["qtMultimediaGstTools"].requires.append("libalsa::libalsa")
                 _create_plugin("QGstreamerAudioDecoderServicePlugin", "gstaudiodecoder", "mediaservice", [])
                 _create_plugin("QGstreamerCaptureServicePlugin", "gstmediacapture", "mediaservice", [])
                 _create_plugin("QGstreamerPlayerServicePlugin", "gstmediaplayer", "mediaservice", [])
             if self.settings.os == "Linux":
                 _create_plugin("CameraBinServicePlugin", "gstcamerabin", "mediaservice", [])
-                _create_plugin("QAlsaPlugin", "qtaudio_alsa", "audio", [])
+                if self.options.get_safe("with_libalsa", False):
+                    _create_plugin("QAlsaPlugin", "qtaudio_alsa", "audio", ["libalsa::libalsa"])
             if self.settings.os == "Windows":
                 _create_plugin("AudioCaptureServicePlugin", "qtmedia_audioengine", "mediaservice", [])
                 _create_plugin("DSServicePlugin", "dsengine", "mediaservice", [])

From 0ed03e4dcf0c7a7a592567fa7ef42eef1404169e Mon Sep 17 00:00:00 2001
From: ericLemanissier <ericLemanissier@users.noreply.github.com>
Date: Mon, 22 Apr 2024 12:02:28 +0200
Subject: [PATCH 8/9] fix gstreamer too

---
 recipes/qt/5.x.x/conanfile.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes/qt/5.x.x/conanfile.py b/recipes/qt/5.x.x/conanfile.py
index 984e296c2934a..bb70bc830e88a 100644
--- a/recipes/qt/5.x.x/conanfile.py
+++ b/recipes/qt/5.x.x/conanfile.py
@@ -1389,11 +1389,11 @@ def _create_plugin(pluginname, libname, plugintype, requires):
                 _create_module("MultimediaGstTools", ["Multimedia", "MultimediaWidgets", "Gui", "gst-plugins-base::gst-plugins-base"])
                 if self.options.get_safe("with_libalsa", False):
                     self.cpp_info.components["qtMultimediaGstTools"].requires.append("libalsa::libalsa")
-                _create_plugin("QGstreamerAudioDecoderServicePlugin", "gstaudiodecoder", "mediaservice", [])
-                _create_plugin("QGstreamerCaptureServicePlugin", "gstmediacapture", "mediaservice", [])
-                _create_plugin("QGstreamerPlayerServicePlugin", "gstmediaplayer", "mediaservice", [])
+                _create_plugin("QGstreamerAudioDecoderServicePlugin", "gstaudiodecoder", "mediaservice", ["gst-plugins-base::gst-plugins-base"])
+                _create_plugin("QGstreamerCaptureServicePlugin", "gstmediacapture", "mediaservice", ["gst-plugins-base::gst-plugins-base"])
+                _create_plugin("QGstreamerPlayerServicePlugin", "gstmediaplayer", "mediaservice", ["gst-plugins-base::gst-plugins-base"])
+                _create_plugin("CameraBinServicePlugin", "gstcamerabin", "mediaservice", ["gst-plugins-base::gst-plugins-base"])
             if self.settings.os == "Linux":
-                _create_plugin("CameraBinServicePlugin", "gstcamerabin", "mediaservice", [])
                 if self.options.get_safe("with_libalsa", False):
                     _create_plugin("QAlsaPlugin", "qtaudio_alsa", "audio", ["libalsa::libalsa"])
             if self.settings.os == "Windows":

From 52132de46f0058a010ba55673141f94e2ebcede4 Mon Sep 17 00:00:00 2001
From: ericLemanissier <ericLemanissier@users.noreply.github.com>
Date: Tue, 28 May 2024 08:08:08 +0000
Subject: [PATCH 9/9] remove qt 5.15.11

---
 recipes/qt/5.x.x/conandata.yml                |  53 ---
 ...10-fix-macos-cpp-lib-memory-resource.patch |  43 ---
 recipes/qt/5.x.x/qtmodules5.15.11.conf        | 326 ------------------
 recipes/qt/config.yml                         |   2 -
 4 files changed, 424 deletions(-)
 delete mode 100644 recipes/qt/5.x.x/patches/5.15.10-fix-macos-cpp-lib-memory-resource.patch
 delete mode 100644 recipes/qt/5.x.x/qtmodules5.15.11.conf

diff --git a/recipes/qt/5.x.x/conandata.yml b/recipes/qt/5.x.x/conandata.yml
index 3be13b32d91cd..0cd43c4fb0add 100644
--- a/recipes/qt/5.x.x/conandata.yml
+++ b/recipes/qt/5.x.x/conandata.yml
@@ -53,28 +53,6 @@ sources:
       - "https://ftp.jaist.ac.jp/pub/qtproject/archive/qt/5.15/5.15.12/single/qt-everywhere-opensource-src-5.15.12.tar.xz"
       - "https://ftp.yz.yamagata-u.ac.jp/pub/qtproject/archive/qt/5.15/5.15.12/single/qt-everywhere-opensource-src-5.15.12.tar.xz"
     sha256: "93f2c0889ee2e9cdf30c170d353c3f829de5f29ba21c119167dee5995e48ccce"
-  "5.15.11":
-    url:
-      - "https://download.qt.io/official_releases/qt/5.15/5.15.11/single/qt-everywhere-opensource-src-5.15.11.tar.xz"
-      - "https://download.qt.io/archive/qt/5.15/5.15.11/single/qt-everywhere-opensource-src-5.15.11.tar.xz"
-      - "https://qt.mirror.constant.com/archive/qt/5.15/5.15.11/single/qt-everywhere-opensource-src-5.15.11.tar.xz"
-      - "https://mirrors.ukfast.co.uk/sites/qt.io/archive/qt/5.15/5.15.11/single/qt-everywhere-opensource-src-5.15.11.tar.xz"
-      - "https://mirrors.20i.com/pub/qt.io/archive/qt/5.15/5.15.11/single/qt-everywhere-opensource-src-5.15.11.tar.xz"
-      - "https://ftp.nluug.nl/languages/qt/archive/qt/5.15/5.15.11/single/qt-everywhere-opensource-src-5.15.11.tar.xz"
-      - "https://mirror.netcologne.de/qtproject/archive/qt/5.15/5.15.11/single/qt-everywhere-opensource-src-5.15.11.tar.xz"
-      - "https://mirror.web4africa.ng/qt/archive/qt/5.15/5.15.11/single/qt-everywhere-opensource-src-5.15.11.tar.xz"
-      - "https://qt-mirror.dannhauer.de/archive/qt/5.15/5.15.11/single/qt-everywhere-opensource-src-5.15.11.tar.xz"
-      - "https://ftp.fau.de/qtproject/archive/qt/5.15/5.15.11/single/qt-everywhere-opensource-src-5.15.11.tar.xz"
-      - "https://mirrors.dotsrc.org/qtproject/archive/qt/5.15/5.15.11/single/qt-everywhere-opensource-src-5.15.11.tar.xz"
-      - "https://ftp.icm.edu.pl/packages/qt/archive/qt/5.15/5.15.11/single/qt-everywhere-opensource-src-5.15.11.tar.xz"
-      - "https://ftp.acc.umu.se/mirror/qt.io/qtproject/archive/qt/5.15/5.15.11/single/qt-everywhere-opensource-src-5.15.11.tar.xz"
-      - "https://www.nic.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/5.15/5.15.11/single/qt-everywhere-opensource-src-5.15.11.tar.xz"
-      - "https://qtproject.mirror.liquidtelecom.com/archive/qt/5.15/5.15.11/single/qt-everywhere-opensource-src-5.15.11.tar.xz"
-      - "https://mirrors.ustc.edu.cn/qtproject/archive/qt/5.15/5.15.11/single/qt-everywhere-opensource-src-5.15.11.tar.xz"
-      - "https://mirrors.sjtug.sjtu.edu.cn/qt/archive/qt/5.15/5.15.11/single/qt-everywhere-opensource-src-5.15.11.tar.xz"
-      - "https://ftp.jaist.ac.jp/pub/qtproject/archive/qt/5.15/5.15.11/single/qt-everywhere-opensource-src-5.15.11.tar.xz"
-      - "https://ftp.yz.yamagata-u.ac.jp/pub/qtproject/archive/qt/5.15/5.15.11/single/qt-everywhere-opensource-src-5.15.11.tar.xz"
-    sha256: "7426b1eaab52ed169ce53804bdd05dfe364f761468f888a0f15a308dc1dc2951"
 patches:
   "5.15.14":
     - "base_path": "qt5/qtbase"
@@ -151,34 +129,3 @@ patches:
       "patch_file": "patches/5.15.12-fix-macos-cpp-lib-memory-resource.patch"
       "patch_source": "https://codereview.qt-project.org/c/qt/qtbase/+/482392"
       "patch_type": "portability"
-  "5.15.11":
-    - "base_path": "qt5/qtbase"
-      "patch_file": "patches/aa2a39dea5.diff"
-    - "base_path": "qt5/qtwebengine"
-      "patch_file": "patches/c72097e.diff"
-    - "base_path": "qt5/qttools"
-      "patch_file": "patches/fix-macdeployqt.diff"
-    - "base_path": "qt5/qtwebengine/src/3rdparty/chromium/v8"
-      "patch_file": "patches/chromium-v8-missing-constexpr.patch"
-    - "base_path": "qt5/qtwebengine/src/3rdparty"
-      "patch_file": "patches/chromium-skia-missing-iterator-include.patch"
-    - "base_path": "qt5/qtwebengine/src/3rdparty/chromium/third_party/skia"
-      "patch_file": "patches/skia-cd397f3.diff"
-    - "base_path": "qt5/qtwebengine/src/3rdparty"
-      "patch_file": "patches/0001-Find-fontconfig-using-pkg-config.patch"
-    - "base_path": "qt5/qtbase"
-      "patch_file": "patches/android-backtrace.diff"
-    - "base_path": "qt5/qtbase"
-      "patch_file": "patches/android-openssl.diff"
-    - "base_path": "qt5/qtbase"
-      "patch_file": "patches/android-new-ndk.diff"
-    - patch_file: "patches/5.15.8-fix-qmake-default-libdirs-apple-clang-15.patch"
-      base_path: "qt5/qtbase"
-      patch_description: "Fix qmake build with apple-clang>=15"
-      patch_type: "portability"
-      patch_source: "https://codereview.qt-project.org/c/qt/qtbase/+/503916"
-    - patch_file: "patches/5.15.10-fix-macos-cpp-lib-memory-resource.patch"
-      base_path: "qt5/qtbase"
-      patch_description: "Fix usage of memory_resource with apple-clang>=15 and deployment target of macOS < 14"
-      patch_type: "portability"
-      patch_source: "https://codereview.qt-project.org/c/qt/qtbase/+/482392"
diff --git a/recipes/qt/5.x.x/patches/5.15.10-fix-macos-cpp-lib-memory-resource.patch b/recipes/qt/5.x.x/patches/5.15.10-fix-macos-cpp-lib-memory-resource.patch
deleted file mode 100644
index 21112d5316d7a..0000000000000
--- a/recipes/qt/5.x.x/patches/5.15.10-fix-macos-cpp-lib-memory-resource.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/src/corelib/global/qcompilerdetection.h
-+++ b/src/corelib/global/qcompilerdetection.h
-@@ -1050,16 +1050,22 @@
- #   endif // !_HAS_CONSTEXPR
- #  endif // !__GLIBCXX__ && !_LIBCPP_VERSION
- # endif // Q_OS_QNX
--# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC) && defined(__GNUC_LIBSTD__) \
--    && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)
-+# if (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC)
-+#  if defined(__GNUC_LIBSTD__) && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402)
- // Apple has not updated libstdc++ since 2007, which means it does not have
- // <initializer_list> or std::move. Let's disable these features
--#  undef Q_COMPILER_INITIALIZER_LISTS
--#  undef Q_COMPILER_RVALUE_REFS
--#  undef Q_COMPILER_REF_QUALIFIERS
-+#   undef Q_COMPILER_INITIALIZER_LISTS
-+#   undef Q_COMPILER_RVALUE_REFS
-+#   undef Q_COMPILER_REF_QUALIFIERS
- // Also disable <atomic>, since it's clearly not there
--#  undef Q_COMPILER_ATOMICS
--# endif
-+#   undef Q_COMPILER_ATOMICS
-+#  endif
-+#  if defined(__cpp_lib_memory_resource) \
-+    && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED)  && __MAC_OS_X_VERSION_MIN_REQUIRED  < 140000) \
-+     || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 170000))
-+#   undef __cpp_lib_memory_resource // Only supported on macOS 14 and iOS 17
-+#  endif
-+# endif // (defined(Q_CC_CLANG) || defined(Q_CC_INTEL)) && defined(Q_OS_MAC)
- # if defined(Q_CC_CLANG) && defined(Q_CC_INTEL) && Q_CC_INTEL >= 1500
- // ICC 15.x and 16.0 have their own implementation of std::atomic, which is activated when in Clang mode
- // (probably because libc++'s <atomic> on OS X failed to compile), but they're missing some
---- a/src/corelib/tools/qduplicatetracker_p.h
-+++ b/src/corelib/tools/qduplicatetracker_p.h
-@@ -52,7 +52,7 @@
- 
- #include <qglobal.h>
- 
--#if QT_HAS_INCLUDE(<memory_resource>) && __cplusplus > 201402L
-+#if defined(__cpp_lib_memory_resource) && __cplusplus > 201402L
- #  include <unordered_set>
- #  include <memory_resource>
- #else
diff --git a/recipes/qt/5.x.x/qtmodules5.15.11.conf b/recipes/qt/5.x.x/qtmodules5.15.11.conf
deleted file mode 100644
index 452233655f279..0000000000000
--- a/recipes/qt/5.x.x/qtmodules5.15.11.conf
+++ /dev/null
@@ -1,326 +0,0 @@
-[submodule "qtbase"]
-	path = qtbase
-	url = ../qtbase.git
-	branch = 5.15
-	status = essential
-[submodule "qtsvg"]
-	depends = qtbase
-	path = qtsvg
-	url = ../qtsvg.git
-	branch = 5.15
-	status = addon
-[submodule "qtdeclarative"]
-	depends = qtbase
-	recommends = qtsvg
-	path = qtdeclarative
-	url = ../qtdeclarative.git
-	branch = 5.15
-	status = essential
-[submodule "qtactiveqt"]
-	depends = qtbase
-	path = qtactiveqt
-	url = ../qtactiveqt.git
-	branch = 5.15
-	status = addon
-[submodule "qtscript"]
-	depends = qtbase
-	recommends = qttools
-	path = qtscript
-	url = ../qtscript.git
-	branch = 5.15
-	status = deprecated
-[submodule "qtmultimedia"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtmultimedia
-	url = ../qtmultimedia.git
-	branch = 5.15
-	status = essential
-[submodule "qttools"]
-	depends = qtbase
-	recommends = qtdeclarative qtactiveqt
-	path = qttools
-	url = ../qttools.git
-	branch = 5.15
-	status = essential
-[submodule "qtxmlpatterns"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtxmlpatterns
-	url = ../qtxmlpatterns.git
-	branch = 5.15
-	status = deprecated
-[submodule "qttranslations"]
-	depends = qttools
-	path = qttranslations
-	url = ../qttranslations.git
-	branch = 5.15
-	status = essential
-	priority = 30
-[submodule "qtdoc"]
-	depends = qtdeclarative qttools
-	recommends = qtmultimedia qtquickcontrols qtquickcontrols2
-	path = qtdoc
-	url = ../qtdoc.git
-	branch = 5.15
-	status = essential
-	priority = 40
-[submodule "qtrepotools"]
-	path = qtrepotools
-	url = ../qtrepotools.git
-	branch = master
-	status = essential
-	project = -
-[submodule "qtqa"]
-	depends = qtbase
-	path = qtqa
-	url = ../qtqa.git
-	branch = master
-	status = essential
-	priority = 50
-[submodule "qtlocation"]
-	depends = qtbase
-	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
-	path = qtlocation
-	url = ../qtlocation.git
-	branch = 5.15
-	status = addon
-[submodule "qtsensors"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtsensors
-	url = ../qtsensors.git
-	branch = 5.15
-	status = addon
-[submodule "qtsystems"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtsystems
-	url = ../qtsystems.git
-	branch = dev
-	status = ignore
-[submodule "qtfeedback"]
-	depends = qtdeclarative
-	recommends = qtmultimedia
-	path = qtfeedback
-	url = ../qtfeedback.git
-	branch = master
-	status = ignore
-[submodule "qtdocgallery"]
-	depends = qtdeclarative
-	path = qtdocgallery
-	url = ../qtdocgallery.git
-	branch = master
-	status = ignore
-[submodule "qtpim"]
-	depends = qtdeclarative
-	path = qtpim
-	url = ../qtpim.git
-	branch = dev
-	status = ignore
-[submodule "qtconnectivity"]
-	depends = qtbase
-	recommends = qtdeclarative qtandroidextras
-	path = qtconnectivity
-	url = ../qtconnectivity.git
-	branch = 5.15
-	status = addon
-[submodule "qtwayland"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtwayland
-	url = ../qtwayland.git
-	branch = 5.15
-	status = addon
-[submodule "qt3d"]
-	depends = qtbase
-	recommends = qtdeclarative qtimageformats qtgamepad
-	path = qt3d
-	url = ../qt3d.git
-	branch = 5.15
-	status = addon
-[submodule "qtimageformats"]
-	depends = qtbase
-	path = qtimageformats
-	url = ../qtimageformats.git
-	branch = 5.15
-	status = addon
-[submodule "qtgraphicaleffects"]
-	depends = qtdeclarative
-	path = qtgraphicaleffects
-	url = ../qtgraphicaleffects.git
-	branch = 5.15
-	status = essential
-[submodule "qtquickcontrols"]
-	depends = qtdeclarative
-	recommends = qtgraphicaleffects
-	path = qtquickcontrols
-	url = ../qtquickcontrols.git
-	branch = 5.15
-	status = addon
-[submodule "qtserialbus"]
-	depends = qtbase
-	recommends = qtserialport
-	path = qtserialbus
-	url = ../qtserialbus.git
-	branch = 5.15
-	status = addon
-[submodule "qtserialport"]
-	depends = qtbase
-	path = qtserialport
-	url = ../qtserialport.git
-	branch = 5.15
-	status = addon
-[submodule "qtx11extras"]
-	depends = qtbase
-	path = qtx11extras
-	url = ../qtx11extras.git
-	branch = 5.15
-	status = addon
-[submodule "qtmacextras"]
-	depends = qtbase
-	path = qtmacextras
-	url = ../qtmacextras.git
-	branch = 5.15
-	status = addon
-[submodule "qtwinextras"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtwinextras
-	url = ../qtwinextras.git
-	branch = 5.15
-	status = addon
-[submodule "qtandroidextras"]
-	depends = qtbase
-	path = qtandroidextras
-	url = ../qtandroidextras.git
-	branch = 5.15
-	status = addon
-[submodule "qtwebsockets"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtwebsockets
-	url = ../qtwebsockets.git
-	branch = 5.15
-	status = addon
-[submodule "qtwebchannel"]
-	depends = qtbase
-	recommends = qtdeclarative qtwebsockets
-	path = qtwebchannel
-	url = ../qtwebchannel.git
-	branch = 5.15
-	status = addon
-[submodule "qtwebengine"]
-	depends = qtdeclarative
-	recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
-	path = qtwebengine
-	url = ../qtwebengine.git
-	branch = 5.15
-	status = addon
-	priority = 10
-[submodule "qtcanvas3d"]
-	depends = qtdeclarative
-	path = qtcanvas3d
-	url = ../qtcanvas3d.git
-	branch = dev
-	status = ignore
-[submodule "qtwebview"]
-	depends = qtdeclarative
-	recommends = qtwebengine
-	path = qtwebview
-	url = ../qtwebview.git
-	branch = 5.15
-	status = addon
-[submodule "qtquickcontrols2"]
-	depends = qtgraphicaleffects
-	recommends = qtimageformats
-	path = qtquickcontrols2
-	url = ../qtquickcontrols2.git
-	branch = 5.15
-	status = essential
-[submodule "qtpurchasing"]
-	depends = qtbase
-	recommends = qtdeclarative qtandroidextras
-	path = qtpurchasing
-	url = ../qtpurchasing.git
-	branch = 5.15
-	status = addon
-[submodule "qtcharts"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtcharts
-	url = ../qtcharts.git
-	branch = 5.15
-	status = addon
-[submodule "qtdatavis3d"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtdatavis3d
-	url = ../qtdatavis3d.git
-	branch = 5.15
-	status = addon
-[submodule "qtvirtualkeyboard"]
-	depends = qtbase qtdeclarative qtsvg
-	recommends = qtmultimedia qtquickcontrols
-	path = qtvirtualkeyboard
-	url = ../qtvirtualkeyboard.git
-	branch = 5.15
-	status = addon
-[submodule "qtgamepad"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtgamepad
-	url = ../qtgamepad.git
-	branch = 5.15
-	status = addon
-[submodule "qtscxml"]
-	depends = qtbase qtdeclarative
-	path = qtscxml
-	url = ../qtscxml.git
-	branch = 5.15
-	status = addon
-[submodule "qtspeech"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtspeech
-	url = ../qtspeech.git
-	branch = 5.15
-	status = addon
-[submodule "qtnetworkauth"]
-	depends = qtbase
-	path = qtnetworkauth
-	url = ../qtnetworkauth.git
-	branch = 5.15
-	status = addon
-[submodule "qtremoteobjects"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtremoteobjects
-	url = ../qtremoteobjects.git
-	branch = 5.15
-	status = addon
-[submodule "qtwebglplugin"]
-	depends = qtbase qtwebsockets
-	recommends = qtdeclarative
-	path = qtwebglplugin
-	url = ../qtwebglplugin.git
-	branch = 5.15
-	status = addon
-[submodule "qtlottie"]
-	depends = qtbase qtdeclarative
-	path = qtlottie
-	url = ../qtlottie.git
-	branch = 5.15
-	status = addon
-[submodule "qtquicktimeline"]
-	depends = qtbase qtdeclarative
-	path = qtquicktimeline
-	url = ../qtquicktimeline
-	branch = 5.15
-	status = addon
-[submodule "qtquick3d"]
-	depends = qtbase qtdeclarative
-	path = qtquick3d
-	url = ../qtquick3d.git
-	branch = 5.15
-	status = addon
diff --git a/recipes/qt/config.yml b/recipes/qt/config.yml
index e9fc5dd836ed7..395c6e9434733 100644
--- a/recipes/qt/config.yml
+++ b/recipes/qt/config.yml
@@ -15,5 +15,3 @@ versions:
     folder: 5.x.x
   "5.15.12":
     folder: 5.x.x
-  "5.15.11":
-    folder: 5.x.x