diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp index 038884ca2d988ed6b5a599a5fc9c47a1a634a3ba..303b8e889bd9863eea3d85f0aa99802ca42b9b88 100644 --- a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp @@ -224,13 +224,13 @@ QVariantMap DeviceManager::toMap() const Utils::FileName DeviceManager::settingsFilePath(const QString &extension) { - return Utils::FileName::fromString(QFileInfo(ExtensionSystem::PluginManager::settings()->fileName()).absolutePath() + extension); + return Utils::FileName::fromString(QFileInfo(Core::ICore::settings()->fileName()).absolutePath() + extension); } Utils::FileName DeviceManager::systemSettingsFilePath(const QString &deviceFileRelativePath) { return Utils::FileName::fromString( - QFileInfo(ExtensionSystem::PluginManager::globalSettings()->fileName()).absolutePath() + QFileInfo(Core::ICore::settings(QSettings::SystemScope)->fileName()).absolutePath() + deviceFileRelativePath); } diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp index 911d90fb645bd8bdd02726b846deec1749492417..122dc06340d18192a7b003488777cbd8141996ab 100644 --- a/src/plugins/projectexplorer/kitmanager.cpp +++ b/src/plugins/projectexplorer/kitmanager.cpp @@ -55,7 +55,7 @@ using Utils::PersistentSettingsReader; static Utils::FileName settingsFileName() { - QFileInfo settingsLocation(ExtensionSystem::PluginManager::settings()->fileName()); + QFileInfo settingsLocation(Core::ICore::settings()->fileName()); return Utils::FileName::fromString(settingsLocation.absolutePath() + QLatin1String(KIT_FILENAME)); } diff --git a/src/plugins/projectexplorer/settingsaccessor.cpp b/src/plugins/projectexplorer/settingsaccessor.cpp index 439dfbb380cdd7e5322ac5009e8bf27dee873316..19549f9ded41ec59534bd3216a56473d8d41073c 100644 --- a/src/plugins/projectexplorer/settingsaccessor.cpp +++ b/src/plugins/projectexplorer/settingsaccessor.cpp @@ -2620,7 +2620,7 @@ static QString maddeRoot(const QString &qmakePath) void Version11Handler::parseQtversionFile() { - QFileInfo settingsLocation(ExtensionSystem::PluginManager::settings()->fileName()); + QFileInfo settingsLocation(Core::ICore::settings()->fileName()); Utils::FileName fileName = Utils::FileName::fromString(settingsLocation.absolutePath() + QLatin1String("/qtversion.xml")); Utils::PersistentSettingsReader reader; if (!reader.load(fileName)) { @@ -2663,7 +2663,7 @@ void Version11Handler::parseQtversionFile() void Version11Handler::parseToolChainFile() { - QFileInfo settingsLocation(ExtensionSystem::PluginManager::settings()->fileName()); + QFileInfo settingsLocation(Core::ICore::settings()->fileName()); Utils::FileName fileName = Utils::FileName::fromString(settingsLocation.absolutePath() + QLatin1String("/toolChains.xml")); Utils::PersistentSettingsReader reader; if (!reader.load(fileName)) { diff --git a/src/plugins/projectexplorer/toolchainmanager.cpp b/src/plugins/projectexplorer/toolchainmanager.cpp index 53728931de71b73bc3cf4dedea5015b1a6b5680d..4f29847aa6493d7c43d4ed42ec5d19721aee92e7 100644 --- a/src/plugins/projectexplorer/toolchainmanager.cpp +++ b/src/plugins/projectexplorer/toolchainmanager.cpp @@ -58,7 +58,7 @@ using Utils::PersistentSettingsReader; static Utils::FileName settingsFileName(const QString &path) { - QFileInfo settingsLocation(ExtensionSystem::PluginManager::settings()->fileName()); + QFileInfo settingsLocation(Core::ICore::settings()->fileName()); return Utils::FileName::fromString(settingsLocation.absolutePath() + path); }