diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp index 8941e617321..82356fd5be7 100644 --- a/src/plugins/coreplugin/coreplugin.cpp +++ b/src/plugins/coreplugin/coreplugin.cpp @@ -61,15 +61,8 @@ static CorePlugin *m_instance = nullptr; const char kWarnCrashReportingSetting[] = "WarnCrashReporting"; const char kEnvironmentChanges[] = "Core/EnvironmentChanges"; -void CorePlugin::setupSystemEnvironment() -{ - m_instance->m_startupSystemEnvironment = Environment::systemEnvironment(); - const EnvironmentItems changes = EnvironmentItem::fromStringList( - ICore::settings()->value(kEnvironmentChanges).toStringList()); - setEnvironmentChanges(changes); -} - CorePlugin::CorePlugin() + : m_startupSystemEnvironment(Environment::systemEnvironment()) { qRegisterMetaType(); qRegisterMetaType(); @@ -81,7 +74,10 @@ CorePlugin::CorePlugin() qRegisterMetaType(); qRegisterMetaType(); m_instance = this; - setupSystemEnvironment(); + + const EnvironmentItems changes = EnvironmentItem::fromStringList( + ICore::settings()->value(kEnvironmentChanges).toStringList()); + setEnvironmentChanges(changes); } CorePlugin::~CorePlugin() @@ -329,11 +325,6 @@ QObject *CorePlugin::remoteCommand(const QStringList & /* options */, return res; } -Environment CorePlugin::startupSystemEnvironment() -{ - return m_instance->m_startupSystemEnvironment; -} - EnvironmentItems CorePlugin::environmentChanges() { return m_instance->m_environmentChanges; diff --git a/src/plugins/coreplugin/coreplugin.h b/src/plugins/coreplugin/coreplugin.h index f06caa83d7d..987c6d15817 100644 --- a/src/plugins/coreplugin/coreplugin.h +++ b/src/plugins/coreplugin/coreplugin.h @@ -50,7 +50,6 @@ public: const QString &workingDirectory, const QStringList &args) override; - static Utils::Environment startupSystemEnvironment(); static Utils::EnvironmentItems environmentChanges(); static void setEnvironmentChanges(const Utils::EnvironmentItems &changes); static QString msgCrashpadInformation(); @@ -71,7 +70,6 @@ private slots: private: static void addToPathChooserContextMenu(Utils::PathChooser *pathChooser, QMenu *menu); - static void setupSystemEnvironment(); void checkSettings(); void warnAboutCrashReporing(); @@ -80,7 +78,7 @@ private: Locator *m_locator = nullptr; std::unique_ptr m_sessionManager; FolderNavigationWidgetFactory *m_folderNavigationWidgetFactory = nullptr; - Utils::Environment m_startupSystemEnvironment; + const Utils::Environment m_startupSystemEnvironment; Utils::EnvironmentItems m_environmentChanges; };