Commit 73ff2581 authored by dt's avatar dt
Browse files

Fixes: Add Linux icc to the supported toolchains.

Details:  Treat it the same as g++.
parent 113723bb
......@@ -40,6 +40,7 @@ public:
enum ToolChainType
{
GCC,
LinuxICC,
MinGW,
MSVC,
WINCE,
......
......@@ -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();
......
......@@ -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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment