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

Core: Fix compiler warning about unused variables

Browse Source 
settings(), globalSettings() are nowadays static methods.

Change-Id: I7083d639ac2bb28c0319c8cb1f8459adc8e254b8
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Kai Koehne
2012-08-21 10:44:57 +02:00
committed by Eike Ziller
parent 9c7b96c663
commit 7b5745c5cc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qtsupport/qtversionmanager.cpp
View File

@@ -94,15 +94,15 @@ static T *createToolChain(const QString &id)
static QString globalSettingsFileName() static QString globalSettingsFileName()
{ {
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); QSettings *globalSettings = ExtensionSystem::PluginManager::globalSettings();
return QFileInfo(pm->globalSettings()->fileName()).absolutePath() return QFileInfo(globalSettings->fileName()).absolutePath()
+ QLatin1String(QTVERSION_SDK_FILENAME); + QLatin1String(QTVERSION_SDK_FILENAME);
} }
static QString settingsFileName(const QString &path) static QString settingsFileName(const QString &path)
{ {
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); QSettings *settings = ExtensionSystem::PluginManager::settings();
QFileInfo settingsLocation(pm->settings()->fileName()); QFileInfo settingsLocation(settings->fileName());
return settingsLocation.absolutePath() + path; return settingsLocation.absolutePath() + path;
} }