From 6f4aa3ad2775977569e3ed77b99e4d0e0b1f7609 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Fri, 14 Jul 2023 09:54:46 +0200
Subject: [PATCH] Conan: Delay settings initialization to first use

In practice this could mean "never" in case the step is not used.

Change-Id: I714f2adbe051b6b795d915d56a48900625d258b0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 src/plugins/conan/conanplugin.cpp   |  2 --
 src/plugins/conan/conansettings.cpp | 10 +++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/plugins/conan/conanplugin.cpp b/src/plugins/conan/conanplugin.cpp
index 13655b93b63..71c3b0c90e2 100644
--- a/src/plugins/conan/conanplugin.cpp
+++ b/src/plugins/conan/conanplugin.cpp
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "conaninstallstep.h"
-#include "conansettings.h"
 
 #include <extensionsystem/iplugin.h>
 
@@ -16,7 +15,6 @@ class ConanPlugin final : public ExtensionSystem::IPlugin
 public:
     ConanPlugin()
     {
-        addManaged<ConanSettings>();
         addManaged<ConanInstallStepFactory>();
     }
 };
diff --git a/src/plugins/conan/conansettings.cpp b/src/plugins/conan/conansettings.cpp
index db88a242be2..d3e5d9d09b0 100644
--- a/src/plugins/conan/conansettings.cpp
+++ b/src/plugins/conan/conansettings.cpp
@@ -9,14 +9,14 @@ using namespace Utils;
 
 namespace Conan::Internal {
 
-static ConanSettings *theSettings;
-
-ConanSettings &settings() { return *theSettings; }
+ConanSettings &settings()
+{
+    static ConanSettings theSettings;
+    return theSettings;
+}
 
 ConanSettings::ConanSettings()
 {
-    theSettings = this;
-
     setSettingsGroup("ConanSettings");
     setAutoApply(false);