From 7b5745c5cc691f7bcd1b99000cefaa751691ce7b Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 21 Aug 2012 10:44:57 +0200 Subject: [PATCH] Core: Fix compiler warning about unused variables settings(), globalSettings() are nowadays static methods. Change-Id: I7083d639ac2bb28c0319c8cb1f8459adc8e254b8 Reviewed-by: Eike Ziller --- src/plugins/qtsupport/qtversionmanager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp index 856d3fa9281..0139a3e8dc6 100644 --- a/src/plugins/qtsupport/qtversionmanager.cpp +++ b/src/plugins/qtsupport/qtversionmanager.cpp @@ -94,15 +94,15 @@ static T *createToolChain(const QString &id) static QString globalSettingsFileName() { - ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); - return QFileInfo(pm->globalSettings()->fileName()).absolutePath() + QSettings *globalSettings = ExtensionSystem::PluginManager::globalSettings(); + return QFileInfo(globalSettings->fileName()).absolutePath() + QLatin1String(QTVERSION_SDK_FILENAME); } static QString settingsFileName(const QString &path) { - ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); - QFileInfo settingsLocation(pm->settings()->fileName()); + QSettings *settings = ExtensionSystem::PluginManager::settings(); + QFileInfo settingsLocation(settings->fileName()); return settingsLocation.absolutePath() + path; }