diff options
| author | Tobias Hunger <tobias.hunger@digia.com> | 2012-09-18 17:12:40 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2012-09-19 10:28:53 +0200 |
| commit | adb40fadb6f9c7ca04cea0dd4febce515dd1e2ac (patch) | |
| tree | d6d57c1f8c294954d568fc4e5281cd97190adf76 /src/plugins/projectexplorer/toolchainmanager.cpp | |
| parent | 598ca05b81864d06c42077f5858b5c3691612e9e (diff) | |
| download | qt-creator-adb40fadb6f9c7ca04cea0dd4febce515dd1e2ac.tar.gz | |
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: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/projectexplorer/toolchainmanager.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/toolchainmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/toolchainmanager.cpp b/src/plugins/projectexplorer/toolchainmanager.cpp index 4a2568c966..729e8f5c61 100644 --- a/src/plugins/projectexplorer/toolchainmanager.cpp +++ b/src/plugins/projectexplorer/toolchainmanager.cpp @@ -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); |