Commit adb40fad authored by Tobias Hunger's avatar Tobias Hunger
Browse files

ToolChains: Read SDK settings from Nokia/qtcreator/toolchains.xml



and not from Nokia/toolchains.xml. This makes sure the SDK settings
and the personal settings pathes differ in prefix only.

Change-Id: Ib3a742d28258e86912cb820ff6c9d0c1b44c1763
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
parent 598ca05b
......@@ -142,7 +142,7 @@ void ToolChainManager::restoreToolChains()
// read all tool chains from SDK
QFileInfo systemSettingsFile(Core::ICore::settings(QSettings::SystemScope)->fileName());
QList<ToolChain *> readTcs =
restoreToolChains(Utils::FileName::fromString(systemSettingsFile.absolutePath() + QLatin1String(LEGACY_TOOLCHAIN_FILENAME)));
restoreToolChains(Utils::FileName::fromString(systemSettingsFile.absolutePath() + QLatin1String(TOOLCHAIN_FILENAME)));
// make sure we mark these as autodetected!
foreach (ToolChain *tc, readTcs)
tc->setAutoDetected(true);
......
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