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

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

Browse Source 
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: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Tobias Hunger
2012-09-18 17:12:40 +02:00
parent 598ca05b81
commit adb40fadb6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/toolchainmanager.cpp
View File

@@ -142,7 +142,7 @@ void ToolChainManager::restoreToolChains()
// read all tool chains from SDK // read all tool chains from SDK
QFileInfo systemSettingsFile(Core::ICore::settings(QSettings::SystemScope)->fileName()); QFileInfo systemSettingsFile(Core::ICore::settings(QSettings::SystemScope)->fileName());
QList<ToolChain *> readTcs = 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! // make sure we mark these as autodetected!
foreach (ToolChain *tc, readTcs) foreach (ToolChain *tc, readTcs)
tc->setAutoDetected(true); tc->setAutoDetected(true);