summaryrefslogtreecommitdiff
path: root/src/plugins/qtsupport
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2012-08-21 10:44:57 +0200
committerEike Ziller <eike.ziller@nokia.com>2012-08-21 10:51:14 +0200
commit7b5745c5cc691f7bcd1b99000cefaa751691ce7b (patch)
treeb5eed2a41274253dbdc5e672ddc5040aaf2d0933 /src/plugins/qtsupport
parent9c7b96c663ab3234c77a83124ff547f72f52d766 (diff)
downloadqt-creator-7b5745c5cc691f7bcd1b99000cefaa751691ce7b.tar.gz
Core: Fix compiler warning about unused variables
settings(), globalSettings() are nowadays static methods. Change-Id: I7083d639ac2bb28c0319c8cb1f8459adc8e254b8 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'src/plugins/qtsupport')
-rw-r--r--src/plugins/qtsupport/qtversionmanager.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp
index 856d3fa928..0139a3e8dc 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;
}