Commit 07aec935 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by hjk

Fix warnings

MSVC warns about pm being unused (because settings() is static)

Change-Id: I750804cc52edc71649545bc03f798a6802c87c7d
Reviewed-by: default avatarLaszlo Papp <lpapp@kde.org>
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent 7c7477ee
......@@ -222,8 +222,7 @@ QVariantMap DeviceManager::toMap() const
QString DeviceManager::settingsFilePath(const QString &extension)
{
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
return QFileInfo(pm->settings()->fileName()).absolutePath() + extension;
return QFileInfo(ExtensionSystem::PluginManager::settings()->fileName()).absolutePath() + extension;
}
void DeviceManager::addDevice(const IDevice::Ptr &_device)
......
......@@ -192,6 +192,8 @@ void LocalProcessList::doKillProcess(const DeviceProcess &process)
else
m_error.clear();
QTimer::singleShot(0, this, SLOT(reportDelayedKillStatus()));
#else
Q_UNUSED(process);
#endif
}
......
......@@ -61,8 +61,7 @@ using Utils::PersistentSettingsReader;
static QString settingsFileName()
{
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
QFileInfo settingsLocation(pm->settings()->fileName());
QFileInfo settingsLocation(ExtensionSystem::PluginManager::settings()->fileName());
return settingsLocation.absolutePath() + QLatin1String(PROFILE_FILENAME);
}
......
......@@ -2624,8 +2624,7 @@ static QString maddeRoot(const QString &qmakePath)
void Version11Handler::parseQtversionFile()
{
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
QFileInfo settingsLocation(pm->settings()->fileName());
QFileInfo settingsLocation(ExtensionSystem::PluginManager::settings()->fileName());
QString fileName = settingsLocation.absolutePath() + QLatin1String("/qtversion.xml");
Utils::PersistentSettingsReader reader;
if (!reader.load(fileName)) {
......@@ -2669,8 +2668,7 @@ void Version11Handler::parseQtversionFile()
void Version11Handler::parseToolChainFile()
{
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
QFileInfo settingsLocation(pm->settings()->fileName());
QFileInfo settingsLocation(ExtensionSystem::PluginManager::settings()->fileName());
QString fileName = settingsLocation.absolutePath() + QLatin1String("/toolChains.xml");
Utils::PersistentSettingsReader reader;
if (!reader.load(fileName)) {
......
......@@ -58,8 +58,7 @@ using Utils::PersistentSettingsReader;
static QString settingsFileName(const QString &path)
{
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
QFileInfo settingsLocation(pm->settings()->fileName());
QFileInfo settingsLocation(ExtensionSystem::PluginManager::settings()->fileName());
return settingsLocation.absolutePath() + path;
}
......
......@@ -74,7 +74,7 @@ QMakeBaseKey::QMakeBaseKey(const QString &_root, bool _hostBuild)
uint qHash(const QMakeBaseKey &key)
{
return qHash(key.root) ^ key.hostBuild;
return qHash(key.root) ^ (uint)key.hostBuild;
}
bool operator==(const QMakeBaseKey &one, const QMakeBaseKey &two)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment