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

Revert "Progress so far"

Browse Source 
This reverts commit b1a121c54f.

Accidentally pushed the linux icc parser before it was ready.

Conflicts:

	src/plugins/qt4projectmanager/qtversionmanager.cpp
This commit is contained in:
dt
2010-04-08 10:49:20 +02:00
parent 0351121864
commit 9ddd7a59d7
8 changed files with 10 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/genericprojectmanager/genericproject.cpp
View File

@@ -348,11 +348,10 @@ void GenericProject::setToolChainType(ProjectExplorer::ToolChain::ToolChainType
} else if (type == ToolChain::WINCE) {
const QString msvcVersion, wincePlatform; // ### FIXME
m_toolChain = ToolChain::createWinCEToolChain(msvcVersion, wincePlatform);
} else if (type == ToolChain::GCC) {
} else if (type == ToolChain::GCC || type == ToolChain::GCC) {
const QLatin1String qmake_cxx("g++"); // ### FIXME
m_toolChain = ToolChain::createGccToolChain(qmake_cxx);
} else if (type == ToolChain::LINUX_ICC) {
m_toolChain = ToolChain::createLinuxIccToolChain();
}
}