Add a toolChainType() method to the ApplicationRunConfiguration.

Best effort only though. This can make detection in the debugger which
engine should be used easier.

Task-Nr: 256161

src/plugins/cmakeprojectmanager/cmakeproject.cpp

@@ -612,6 +612,15 @@ CMakeTarget CMakeProject::targetForTitle(const QString &title)
     return CMakeTarget();
 }
 
+ProjectExplorer::ToolChain::ToolChainType CMakeProject::toolChainType() const
+{
+    if (m_toolChain)
+        return m_toolChain->type();
+    return ProjectExplorer::ToolChain::UNKNOWN;
+}
+
+// CMakeFile
+
 CMakeFile::CMakeFile(CMakeProject *parent, QString fileName)
     : Core::IFile(parent), m_project(parent), m_fileName(fileName)
 {

src/plugins/cmakeprojectmanager/cmakeproject.h

@@ -105,6 +105,7 @@ public:
     CMakeTarget targetForTitle(const QString &title);
 
     QString sourceDirectory() const;
+    ProjectExplorer::ToolChain::ToolChainType toolChainType() const;
 
 protected:
     virtual void saveSettingsImpl(ProjectExplorer::PersistentSettingsWriter &writer);

src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp

@@ -217,6 +217,12 @@ void CMakeRunConfiguration::setUserEnvironmentChanges(const QList<ProjectExplore
     }
 }
 
+ProjectExplorer::ToolChain::ToolChainType CMakeRunConfiguration::toolChainType() const
+{
+    CMakeProject *pro = static_cast<CMakeProject *>(project());
+    return pro->toolChainType();
+}
+
 // Configuration widget
 
 

src/plugins/cmakeprojectmanager/cmakerunconfiguration.h

@@ -70,6 +70,7 @@ public:
     virtual void save(ProjectExplorer::PersistentSettingsWriter &writer) const;
     virtual void restore(const ProjectExplorer::PersistentSettingsReader &reader);
     virtual QString dumperLibrary() const;
+    virtual ProjectExplorer::ToolChain::ToolChainType toolChainType() const;
 
 signals:
     void baseEnvironmentChanged();

src/plugins/projectexplorer/applicationrunconfiguration.h

@@ -30,6 +30,8 @@
 #ifndef APPLICATIONRUNCONFIGURATION_H
 #define APPLICATIONRUNCONFIGURATION_H
 
+#include <projectexplorer/toolchain.h>
+
 #include "runconfiguration.h"
 #include "applicationlauncher.h"
 
@@ -55,6 +57,7 @@ public:
     virtual QStringList commandLineArguments() const = 0;
     virtual Environment environment() const = 0;
     virtual QString dumperLibrary() const = 0;
+    virtual ProjectExplorer::ToolChain::ToolChainType toolChainType() const = 0;
 
     virtual void save(PersistentSettingsWriter &writer) const;
     virtual void restore(const PersistentSettingsReader &reader);

src/plugins/projectexplorer/customexecutablerunconfiguration.cpp

@@ -459,6 +459,10 @@ QString CustomExecutableRunConfiguration::dumperLibrary() const
     return ProjectExplorer::DebuggingHelperLibrary::debuggingHelperLibrary(qmakePath);
 }
 
+ProjectExplorer::ToolChain::ToolChainType CustomExecutableRunConfiguration::toolChainType() const
+{
+    return ProjectExplorer::ToolChain::UNKNOWN;
+}
 
 // Factory
 

src/plugins/projectexplorer/customexecutablerunconfiguration.h

@@ -90,6 +90,8 @@ public:
     virtual QWidget *configurationWidget();
     virtual QString dumperLibrary() const;
 
+    virtual ProjectExplorer::ToolChain::ToolChainType toolChainType() const;
+
 signals:
     void changed();
 

src/plugins/projectexplorer/toolchain.h

@@ -74,6 +74,7 @@ public:
         MSVC,
         WINCE,
         OTHER,
+        UNKNOWN,
         INVALID
     };
 

src/plugins/qt4projectmanager/qt4runconfiguration.cpp

@@ -635,6 +635,11 @@ Qt4RunConfiguration::BaseEnvironmentBase Qt4RunConfiguration::baseEnvironmentBas
 {
     return m_baseEnvironmentBase;
 }
+ProjectExplorer::ToolChain::ToolChainType Qt4RunConfiguration::toolChainType() const
+{
+    Qt4Project *pro = qobject_cast<Qt4Project *>(project());
+    return pro->qtVersion(pro->activeBuildConfiguration())->toolchainType();
+}
 
 ///
 /// Qt4RunConfigurationFactory

src/plugins/qt4projectmanager/qt4runconfiguration.h

@@ -73,6 +73,7 @@ public:
     virtual QStringList commandLineArguments() const;
     virtual ProjectExplorer::Environment environment() const;
     virtual QString dumperLibrary() const;
+    virtual ProjectExplorer::ToolChain::ToolChainType toolChainType() const;
 
     bool isUsingDyldImageSuffix() const;
     void setUsingDyldImageSuffix(bool state);