feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fixes: Add Linux icc to the supported toolchains.

Browse Source 
Details:  Treat it the same as g++.
This commit is contained in:
dt
2009-02-12 12:44:49 +01:00
parent 113723bb0e
commit 73ff2581c7
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/projectexplorer/toolchain.h
View File

@@ -40,6 +40,7 @@ public:
enum ToolChainType enum ToolChainType
{ {
GCC, GCC,
LinuxICC,
MinGW, MinGW,
MSVC, MSVC,
WINCE, WINCE,

2
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -419,7 +419,7 @@ ProjectExplorer::ToolChain *Qt4Project::toolChain(const QString &buildConfigurat
m_test = ToolChain::createMSVCToolChain(version->msvcVersion()); m_test = ToolChain::createMSVCToolChain(version->msvcVersion());
} else if(t == ToolChain::WINCE) { } else if(t == ToolChain::WINCE) {
m_test = ToolChain::createWinCEToolChain(version->msvcVersion(), version->wincePlatform()); 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); QStringList list = rootProjectNode()->variableValue(Internal::CxxCompilerVar);
QString qmake_cxx = list.isEmpty() ? QString::null : list.first(); QString qmake_cxx = list.isEmpty() ? QString::null : list.first();
Environment env = Environment::systemEnvironment(); Environment env = Environment::systemEnvironment();

2
src/plugins/qt4projectmanager/qtversionmanager.cpp
View File

@@ -1191,6 +1191,8 @@ ProjectExplorer::ToolChain::ToolChainType QtVersion::toolchainType() const
return ProjectExplorer::ToolChain::INVALID; return ProjectExplorer::ToolChain::INVALID;
else if (spec.startsWith("wince")) else if (spec.startsWith("wince"))
return ProjectExplorer::ToolChain::WINCE; return ProjectExplorer::ToolChain::WINCE;
else if (spec.startsWith("linux-icc"))
return ProjectExplorer::ToolChain::LinuxICC;
else else
return ProjectExplorer::ToolChain::GCC; return ProjectExplorer::ToolChain::GCC;
} }