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

ProjectExplorer: Remove Toolchain::AutoDetectionFromSettings

Browse Source 
It's unclear why auto-detected toolchains should be treated differently
after a restart of Qt Creator.

Change-Id: I0ba3787adccfb070ce0b36135e8fe94d6e4e4628
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2019-05-10 16:58:30 +02:00
parent 8b532c2cc5
commit 175018abe7
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -273,7 +273,7 @@ bool ToolChain::fromMap(const QVariantMap &data)
d->m_id = id.mid(pos + 1).toUtf8(); d->m_id = id.mid(pos + 1).toUtf8();
const bool autoDetect = data.value(QLatin1String(AUTODETECT_KEY), false).toBool(); const bool autoDetect = data.value(QLatin1String(AUTODETECT_KEY), false).toBool();
d->m_detection = autoDetect ? AutoDetectionFromSettings : ManualDetection; d->m_detection = autoDetect ? AutoDetection : ManualDetection;
if (data.contains(LANGUAGE_KEY_V2)) { if (data.contains(LANGUAGE_KEY_V2)) {
// remove hack to trim language id in 4.4: This is to fix up broken language // remove hack to trim language id in 4.4: This is to fix up broken language

1
src/plugins/projectexplorer/toolchain.h
View File

@@ -82,7 +82,6 @@ public:
enum Detection { enum Detection {
ManualDetection, ManualDetection,
AutoDetection, AutoDetection,
AutoDetectionFromSettings,
AutoDetectionFromSdk, AutoDetectionFromSdk,
UninitializedDetection, UninitializedDetection,
}; };

8
src/plugins/projectexplorer/toolchainsettingsaccessor.cpp
View File

@@ -390,14 +390,14 @@ void ProjectExplorerPlugin::testToolChainMerging_data()
user3i = new TTC("user3", false); user3i = new TTC("user3", false);
user3i->setDetection(ToolChain::ManualDetection); user3i->setDetection(ToolChain::ManualDetection);
auto1 = new TTC("auto1"); auto1 = new TTC("auto1");
auto1->setDetection(ToolChain::AutoDetectionFromSettings); auto1->setDetection(ToolChain::AutoDetection);
auto1c = auto1->clone(); Q_UNUSED(auto1c); auto1c = auto1->clone(); Q_UNUSED(auto1c);
auto1_2 = new TTC("auto1"); auto1_2 = new TTC("auto1");
auto1_2->setDetection(ToolChain::AutoDetectionFromSettings); auto1_2->setDetection(ToolChain::AutoDetection);
auto2 = new TTC("auto2"); auto2 = new TTC("auto2");
auto2->setDetection(ToolChain::AutoDetectionFromSettings); auto2->setDetection(ToolChain::AutoDetection);
auto3i = new TTC("auto3", false); auto3i = new TTC("auto3", false);
auto3i->setDetection(ToolChain::AutoDetectionFromSettings); auto3i->setDetection(ToolChain::AutoDetection);
} }
QTest::newRow("no toolchains") QTest::newRow("no toolchains")