From 73ff2581c7781c3488c3b36a40205277824e3423 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Thu, 12 Feb 2009 12:44:49 +0100
Subject: [PATCH] Fixes: Add Linux icc to the supported toolchains.
Details: Treat it the same as g++.
---
src/plugins/projectexplorer/toolchain.h | 1 +
src/plugins/qt4projectmanager/qt4project.cpp | 2 +-
src/plugins/qt4projectmanager/qtversionmanager.cpp | 2 ++
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h
index 455d480b860..0e7e16c5ffd 100644
--- a/src/plugins/projectexplorer/toolchain.h
+++ b/src/plugins/projectexplorer/toolchain.h
@@ -40,6 +40,7 @@ public:
enum ToolChainType
{
GCC,
+ LinuxICC,
MinGW,
MSVC,
WINCE,
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 05be102b81c..492dc2c50d0 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -419,7 +419,7 @@ ProjectExplorer::ToolChain *Qt4Project::toolChain(const QString &buildConfigurat
m_test = ToolChain::createMSVCToolChain(version->msvcVersion());
} else if(t == ToolChain::WINCE) {
m_test = ToolChain::createWinCEToolChain(version->msvcVersion(), version->wincePlatform());
- } else if(t == ToolChain::GCC) {
+ } else if(t == ToolChain::GCC || t == ToolChain::LinuxICC) {
QStringList list = rootProjectNode()->variableValue(Internal::CxxCompilerVar);
QString qmake_cxx = list.isEmpty() ? QString::null : list.first();
Environment env = Environment::systemEnvironment();
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 8abc994e919..58f196b3ede 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -1191,6 +1191,8 @@ ProjectExplorer::ToolChain::ToolChainType QtVersion::toolchainType() const
return ProjectExplorer::ToolChain::INVALID;
else if (spec.startsWith("wince"))
return ProjectExplorer::ToolChain::WINCE;
+ else if (spec.startsWith("linux-icc"))
+ return ProjectExplorer::ToolChain::LinuxICC;
else
return ProjectExplorer::ToolChain::GCC;
}
--
GitLab