ProjectExplorer: Drop Detection argument from ToolChain constructor

This was used wildly inconsistently. Use a setter instead in
circumstances where the context is reasonably clear.

The assumption is that this will always be done at some time in all
code paths.

Use a new 'Uninitialized' value to avoid triggering the first update.

Change-Id: I82c38cb9da3ccdbd8fbae8beefcbfa0e559ff794
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

3 files changed, 7 insertions, 6 deletions

diff --git a/src/plugins/qnx/qnxconfiguration.cpp b/src/plugins/qnx/qnxconfiguration.cpp
index 5d8cfa736c..9b5ff20881 100644
--- a/src/plugins/qnx/qnxconfiguration.cpp
+++ b/src/plugins/qnx/qnxconfiguration.cpp
@@ -265,7 +265,8 @@ QVariant QnxConfiguration::createDebugger(const Target &target)
 
 QnxToolChain *QnxConfiguration::createToolChain(const Target &target)
 {
-    auto toolChain = new QnxToolChain(ToolChain::AutoDetection);
+    auto toolChain = new QnxToolChain;
+    toolChain->setDetection(ToolChain::AutoDetection);
     toolChain->setLanguage(ProjectExplorer::Constants::CXX_LANGUAGE_ID);
     toolChain->setTargetAbi(target.m_abi);
     toolChain->setDisplayName(
diff --git a/src/plugins/qnx/qnxtoolchain.cpp b/src/plugins/qnx/qnxtoolchain.cpp
index ea36c22e71..716127799a 100644
--- a/src/plugins/qnx/qnxtoolchain.cpp
+++ b/src/plugins/qnx/qnxtoolchain.cpp
@@ -100,8 +100,8 @@ static QStringList reinterpretOptions(const QStringList &args)
     return arguments;
 }
 
-QnxToolChain::QnxToolChain(ToolChain::Detection d)
-    : GccToolChain(Constants::QNX_TOOLCHAIN_ID, d)
+QnxToolChain::QnxToolChain()
+    : GccToolChain(Constants::QNX_TOOLCHAIN_ID)
 {
     setOptionsReinterpreter(&reinterpretOptions);
 }
@@ -223,7 +223,7 @@ QList<ProjectExplorer::ToolChain *> QnxToolChainFactory::autoDetect(
 
 ToolChain *QnxToolChainFactory::restore(const QVariantMap &data)
 {
-    auto tc = new QnxToolChain(ToolChain::ManualDetection);
+    auto tc = new QnxToolChain;
     if (tc->fromMap(data))
         return tc;
 
@@ -238,7 +238,7 @@ bool QnxToolChainFactory::canCreate()
 
 ToolChain *QnxToolChainFactory::create()
 {
-    return new QnxToolChain(ToolChain::ManualDetection);
+    return new QnxToolChain;
 }
 
 //---------------------------------------------------------------------------------
diff --git a/src/plugins/qnx/qnxtoolchain.h b/src/plugins/qnx/qnxtoolchain.h
index 321a25f352..753e39e5ed 100644
--- a/src/plugins/qnx/qnxtoolchain.h
+++ b/src/plugins/qnx/qnxtoolchain.h
@@ -34,7 +34,7 @@ namespace Internal {
 class QnxToolChain : public ProjectExplorer::GccToolChain
 {
 public:
-    explicit QnxToolChain(Detection d);
+    QnxToolChain();
 
     QString typeDisplayName() const override;