From 41f6b768ea96322efaadf29d30d23a9cae4169ee Mon Sep 17 00:00:00 2001
From: leha-bot <leha-bot@users.noreply.github.com>
Date: Sat, 30 Sep 2023 12:23:24 +0300
Subject: [PATCH] qt-advanced-docking-system: Modernize to Conan V2 and add new
 version

---
 .../qt-advanced-docking-system/all/conandata.yml |  3 +++
 .../qt-advanced-docking-system/all/conanfile.py  | 16 +++++++++-------
 recipes/qt-advanced-docking-system/config.yml    |  2 ++
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/recipes/qt-advanced-docking-system/all/conandata.yml b/recipes/qt-advanced-docking-system/all/conandata.yml
index 4dc01c8789b064..f5c7e60ddadd89 100644
--- a/recipes/qt-advanced-docking-system/all/conandata.yml
+++ b/recipes/qt-advanced-docking-system/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "3.8.4":
+    url: "https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/archive/refs/tags/3.8.3.tar.gz"
+    sha256: "0"
   "3.8.3":
     url: "https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/archive/refs/tags/3.8.3.tar.gz"
     sha256: "bd5a9469b755bedf33baefd0b3dda6d167b7917a2888e2794eed5abee7d78f74"
diff --git a/recipes/qt-advanced-docking-system/all/conanfile.py b/recipes/qt-advanced-docking-system/all/conanfile.py
index 332361aaf68625..677d754b4ddfaa 100644
--- a/recipes/qt-advanced-docking-system/all/conanfile.py
+++ b/recipes/qt-advanced-docking-system/all/conanfile.py
@@ -1,6 +1,6 @@
 from conan import ConanFile
 from conan.tools.files import copy, get, apply_conandata_patches, export_conandata_patches, replace_in_file, rmdir
-from conans import CMake
+from conan.tools.cmake import CMakeDeps, cmake_layout
 import os
 
 required_conan_version = ">=1.52.0"
@@ -26,14 +26,13 @@ class QtADS(ConanFile):
         "shared": False,
         "fPIC": True,
     }
-    generators = "cmake", "cmake_find_package", "cmake_find_package_multi"
+    generators = "CMakeDeps"
 
     _cmake = None
-    _qt_version = "5.15.6"
+    _qt_version = "5.15.10"
 
-    @property
-    def _source_subfolder(self):
-        return "source_subfolder"
+    def layout(self):
+        cmake_layout(self)
 
     def export_sources(self):
         copy(self, "CMakeLists.txt", self.recipe_folder, self.export_sources_folder)
@@ -52,7 +51,7 @@ def requirements(self):
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True,
-                  destination=self._source_subfolder)
+                  destination=self.source_folder)
 
     def _configure_cmake(self):
         if self._cmake:
@@ -75,6 +74,9 @@ def _patch_sources(self):
             f"#include <{self._qt_version}/QtGui/qpa/qplatformnativeinterface.h>"
         )
 
+    def generate(self):
+        _configure_cmake()
+
     def build(self):
         self._patch_sources()
         cmake = self._configure_cmake()
diff --git a/recipes/qt-advanced-docking-system/config.yml b/recipes/qt-advanced-docking-system/config.yml
index 63dc53b34436f6..2d16863c52e8e8 100644
--- a/recipes/qt-advanced-docking-system/config.yml
+++ b/recipes/qt-advanced-docking-system/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "3.8.4":
+    folder: "all"
   "3.8.3":
     folder: "all"
   "3.8.2":