From 795d7364dfaac4931537c11ccf8ef957fcbc3c3c Mon Sep 17 00:00:00 2001
From: Cristian Adam <cristian.adam@qt.io>
Date: Tue, 25 Jan 2022 15:33:00 +0100
Subject: [PATCH] CMakePM: auto-setup.cmake do not fail if QtCreator.ini
 doesn't exist

There are Qt Creator installations that do not provide
"QtProject/QtCreator.ini" file, and without it the auto-setup.cmake
code would fail.

Task-number: QTBUG-99273
Change-Id: I7674f68bc89375d8065d820b89650a358a7226b2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 .../3rdparty/package-manager/auto-setup.cmake | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/share/3rdparty/package-manager/auto-setup.cmake b/src/share/3rdparty/package-manager/auto-setup.cmake
index 601d95f9dd0..e1f1dcb2663 100644
--- a/src/share/3rdparty/package-manager/auto-setup.cmake
+++ b/src/share/3rdparty/package-manager/auto-setup.cmake
@@ -33,18 +33,20 @@ macro(qtc_auto_setup_conan)
 
     # Get conan from Qt SDK
     set(qt_creator_ini "${CMAKE_CURRENT_LIST_DIR}/../QtProject/QtCreator.ini")
-    file(STRINGS ${qt_creator_ini} install_settings REGEX "^InstallSettings=.*$")
-    if (install_settings)
-      string(REPLACE "InstallSettings=" "" install_settings "${install_settings}")
-      set(qt_creator_ini "${install_settings}/QtProject/QtCreator.ini")
-      file(TO_CMAKE_PATH "${qt_creator_ini}" qt_creator_ini)
-    endif()
+    if (EXISTS ${qt_creator_ini})
+      file(STRINGS ${qt_creator_ini} install_settings REGEX "^InstallSettings=.*$")
+      if (install_settings)
+        string(REPLACE "InstallSettings=" "" install_settings "${install_settings}")
+        set(qt_creator_ini "${install_settings}/QtProject/QtCreator.ini")
+        file(TO_CMAKE_PATH "${qt_creator_ini}" qt_creator_ini)
+      endif()
 
-    file(STRINGS ${qt_creator_ini} conan_executable REGEX "^ConanFilePath=.*$")
-    if (conan_executable)
-      string(REPLACE "ConanFilePath=" "" conan_executable "${conan_executable}")
-      file(TO_CMAKE_PATH "${conan_executable}" conan_executable)
-      get_filename_component(conan_path "${conan_executable}" DIRECTORY)
+      file(STRINGS ${qt_creator_ini} conan_executable REGEX "^ConanFilePath=.*$")
+      if (conan_executable)
+        string(REPLACE "ConanFilePath=" "" conan_executable "${conan_executable}")
+        file(TO_CMAKE_PATH "${conan_executable}" conan_executable)
+        get_filename_component(conan_path "${conan_executable}" DIRECTORY)
+      endif()
     endif()
 
     set(path_sepparator ":")