feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Conan: Delay settings initialization to first use

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

Change-Id: I714f2adbe051b6b795d915d56a48900625d258b0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2023-07-14 09:54:46 +02:00
parent 48ebffc539
commit 6f4aa3ad27
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/conan/conanplugin.cpp
View File

@@ -2,7 +2,6 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "conaninstallstep.h" #include "conaninstallstep.h"
#include "conansettings.h"
#include <extensionsystem/iplugin.h> #include <extensionsystem/iplugin.h>
@@ -16,7 +15,6 @@ class ConanPlugin final : public ExtensionSystem::IPlugin
public: public:
ConanPlugin() ConanPlugin()
{ {
addManaged<ConanSettings>();
addManaged<ConanInstallStepFactory>(); addManaged<ConanInstallStepFactory>();
} }
}; };

10
src/plugins/conan/conansettings.cpp
View File

@@ -9,14 +9,14 @@ using namespace Utils;
namespace Conan::Internal { namespace Conan::Internal {
static ConanSettings *theSettings; ConanSettings &settings()
{
ConanSettings &settings() { return *theSettings; } static ConanSettings theSettings;
return theSettings;
}
ConanSettings::ConanSettings() ConanSettings::ConanSettings()
{ {
theSettings = this;
setSettingsGroup("ConanSettings"); setSettingsGroup("ConanSettings");
setAutoApply(false); setAutoApply(false);