diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h index 455d480b8606ddba7615d66048d0df059e4b5fd4..0e7e16c5ffd4cc53195696b6ed89638fa9daf309 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 05be102b81c7730eb37ebd10d417d781dc84524b..492dc2c50d046cf7a1de3a7d9e381eeb355ef0f4 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 8abc994e919e2047d386cbbde1b5dfb7ecdaa1d0..58f196b3edec7cac564cf675ef4f2ffc13825448 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; }