Commit 598ca05b authored by Tobias Hunger's avatar Tobias Hunger
Browse files

QtVersion: Get SDK settings from Nokia/qtcreator/qtversion.xml



and not from Nokia/qtversion.xml. This is so that the personal and
the SDK settings only differ in the prefix.

Change-Id: I145ffea19275b03429478b01d135b95655867252
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
parent 7466da64
......@@ -71,7 +71,7 @@ static const char QTVERSION_DATA_KEY[] = "QtVersion.";
static const char QTVERSION_TYPE_KEY[] = "QtVersion.Type";
static const char QTVERSION_FILE_VERSION_KEY[] = "Version";
static const char QTVERSION_FILENAME[] = "/qtcreator/qtversion.xml";
static const char QTVERSION_SDK_FILENAME[] = "/qtversion.xml";
static const char QTVERSION_LEGACY_FILENAME[] = "/qtversion.xml"; // TODO: pre 2.6, remove later
// legacy settings
static const char QtVersionsSectionName[] = "QtVersions";
......@@ -96,7 +96,7 @@ static Utils::FileName globalSettingsFileName()
{
QSettings *globalSettings = ExtensionSystem::PluginManager::globalSettings();
return Utils::FileName::fromString(QFileInfo(globalSettings->fileName()).absolutePath()
+ QLatin1String(QTVERSION_SDK_FILENAME));
+ QLatin1String(QTVERSION_FILENAME));
}
static Utils::FileName settingsFileName(const QString &path)
......@@ -184,7 +184,7 @@ bool QtVersionManager::restoreQtVersions()
// Read Qt Creator 2.5 qtversions.xml once:
if (!filename.toFileInfo().exists())
filename = settingsFileName(QLatin1String(QTVERSION_SDK_FILENAME));
filename = settingsFileName(QLatin1String(QTVERSION_LEGACY_FILENAME));
if (!reader.load(filename))
return false;
QVariantMap data = reader.restoreValues();
......
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