Revert "Progress so far"

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

View File

@@ -33,7 +33,6 @@
#include "projectexplorersettings.h"
#include "gccparser.h"
#include "msvcparser.h"
#include "linuxiccparser.h"
#include <QtCore/QDebug>
#include <QtCore/QFileInfo>
@@ -84,11 +83,6 @@ ToolChain *ToolChain::createMinGWToolChain(const QString &gcc, const QString &mi
return new MinGWToolChain(gcc, mingwPath);
}
ToolChain *ToolChain::createLinuxIccToolChain()
{
return new LinuxIccToolChain();
}
ToolChain *ToolChain::createMSVCToolChain(const QString &name, bool amd64)
{
return MSVCToolChain::create(name, amd64);
@@ -130,8 +124,8 @@ QString ToolChain::toolChainName(ToolChainType tc)
switch (tc) {
case GCC:
return QCoreApplication::translate("ToolChain", "GCC");
case LINUX_ICC:
return QCoreApplication::translate("ToolChain", "Intel C++ Compiler (Linux)");
// case LinuxICC:
// return QCoreApplication::translate("ToolChain", "Intel C++ Compiler (Linux)");
case MinGW:
return QString::fromLatin1("MinGW");
case MSVC:
@@ -325,21 +319,6 @@ IOutputParser *MinGWToolChain::outputParser() const
return new GccParser;
}
LinuxIccToolChain::LinuxIccToolChain()
: GccToolChain(QLatin1String("icpc"))
{
}
ToolChain::ToolChainType LinuxIccToolChain::type() const
{
return ToolChain::LINUX_ICC;
}
IOutputParser *LinuxIccToolChain::outputParser() const
{
return new LinuxIccParser;
}
// ---------------- MSVC installation location code
// Format the name of an SDK or VC installation version with platform