Merge branch 'qt662' into meta_qt6

conan-io · Feb 21, 2024 · 41876ae · 41876ae
2 parents 79c6f2b + e0498ab
commit 41876ae
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/recipes/qt/6.x.x/conanfile.py b/recipes/qt/6.x.x/conanfile.py
@@ -669,7 +669,10 @@ def source(self):
             # 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"), "qt_auto_detect_vcpkg()", "# qt_auto_detect_vcpkg()")
+        replace_in_file(self,
+                        os.path.join(self.source_folder, "qtbase", "cmake", "QtAutoDetect.cmake" if Version(self.version) < "6.6.2" else "QtAutoDetectHelpers.cmake"),
+                        "qt_auto_detect_vcpkg()",
+                        "# qt_auto_detect_vcpkg()")
 
     def _xplatform(self):
         if self.settings.os == "Linux":