From 9ddd7a59d7688e5be302e33fc86cfa59fb434071 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Thu, 8 Apr 2010 10:49:20 +0200
Subject: [PATCH] Revert "Progress so far"
This reverts commit b1a121c54f5f0f7013a13a63472ac2d82b62731e.
Accidentally pushed the linux icc parser before it was ready.
Conflicts:
src/plugins/qt4projectmanager/qtversionmanager.cpp
---
src/plugins/debugger/debuggermanager.cpp | 4 +--
.../genericprojectmanager/genericproject.cpp | 5 ++--
src/plugins/projectexplorer/projectexplorer.h | 3 ---
.../projectexplorer/projectexplorer.pro | 6 ++---
src/plugins/projectexplorer/toolchain.cpp | 25 ++-----------------
src/plugins/projectexplorer/toolchain.h | 12 +--------
.../qt4projectmanager/qt4runconfiguration.cpp | 1 -
.../qt4projectmanager/qtversionmanager.cpp | 5 +---
8 files changed, 10 insertions(+), 51 deletions(-)
diff --git a/src/plugins/debugger/debuggermanager.cpp b/src/plugins/debugger/debuggermanager.cpp
index b4a53581308..a764d1bb898 100644
--- a/src/plugins/debugger/debuggermanager.cpp
+++ b/src/plugins/debugger/debuggermanager.cpp
@@ -965,7 +965,7 @@ static QString msgEngineNotAvailable(const char *engine)
static IDebuggerEngine *debuggerEngineForToolChain(int toolChainType)
{
switch (toolChainType) {
- case ProjectExplorer::ToolChain::LINUX_ICC:
+ //case ProjectExplorer::ToolChain::LinuxICC:
case ProjectExplorer::ToolChain::MinGW:
case ProjectExplorer::ToolChain::GCC:
return gdbEngine;
@@ -1885,7 +1885,7 @@ bool DebuggerManager::checkDebugConfiguration(int toolChain,
bool success = true;
switch(toolChain) {
case ProjectExplorer::ToolChain::GCC:
- case ProjectExplorer::ToolChain::LINUX_ICC:
+ //case ProjectExplorer::ToolChain::LinuxICC:
case ProjectExplorer::ToolChain::MinGW:
case ProjectExplorer::ToolChain::WINCE: // S60
case ProjectExplorer::ToolChain::WINSCW:
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index d699c609b23..c21d3744b06 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -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();
}
}
diff --git a/src/plugins/projectexplorer/projectexplorer.h b/src/plugins/projectexplorer/projectexplorer.h
index 467f124e7e2..3dcbb421029 100644
--- a/src/plugins/projectexplorer/projectexplorer.h
+++ b/src/plugins/projectexplorer/projectexplorer.h
@@ -194,9 +194,6 @@ private slots:
void testGccOutputParsers_data();
void testGccOutputParsers();
- void testLinuxIccOutputParsers_data();
- void testLinuxIccOutputParsers();
-
void testGnuMakeParserParsing_data();
void testGnuMakeParserParsing();
void testGnuMakeParserTaskMangling_data();
diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro
index bc9824c9141..431893dddea 100644
--- a/src/plugins/projectexplorer/projectexplorer.pro
+++ b/src/plugins/projectexplorer/projectexplorer.pro
@@ -77,8 +77,7 @@ HEADERS += projectexplorer.h \
doubletabwidget.h \
addtargetdialog.h \
buildenvironmentwidget.h \
- buildconfigdialog.h \
- linuxiccparser.h
+ buildconfigdialog.h
SOURCES += projectexplorer.cpp \
projectwindow.cpp \
buildmanager.cpp \
@@ -142,8 +141,7 @@ SOURCES += projectexplorer.cpp \
doubletabwidget.cpp \
addtargetdialog.cpp \
buildenvironmentwidget.cpp \
- buildconfigdialog.cpp \
- linuxiccparser.cpp
+ buildconfigdialog.cpp
FORMS += processstep.ui \
editorsettingspropertiespage.ui \
runsettingspropertiespage.ui \
diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp
index 523689e57b6..a4bb2db97b9 100644
--- a/src/plugins/projectexplorer/toolchain.cpp
+++ b/src/plugins/projectexplorer/toolchain.cpp
@@ -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
diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h
index ea3453d9e14..99cf9667e3d 100644
--- a/src/plugins/projectexplorer/toolchain.h
+++ b/src/plugins/projectexplorer/toolchain.h
@@ -76,7 +76,7 @@ public:
enum ToolChainType
{
GCC = 0,
- LINUX_ICC = 1,
+ // LINUX_ICC = 1,
MinGW = 2,
MSVC = 3,
WINCE = 4,
@@ -107,7 +107,6 @@ public:
// Factory methods
static ToolChain *createGccToolChain(const QString &gcc);
static ToolChain *createMinGWToolChain(const QString &gcc, const QString &mingwPath);
- static ToolChain *createLinuxIccToolChain();
static ToolChain *createMSVCToolChain(const QString &name, bool amd64);
static ToolChain *createWinCEToolChain(const QString &name, const QString &platform);
static QStringList availableMSVCVersions();
@@ -158,15 +157,6 @@ private:
QString m_mingwPath;
};
-class PROJECTEXPLORER_EXPORT LinuxIccToolChain : public GccToolChain
-{
-public:
- LinuxIccToolChain();
- virtual ToolChainType type() const;
-
- virtual IOutputParser *outputParser() const;
-};
-
// TODO some stuff needs to be moved into this
class PROJECTEXPLORER_EXPORT MSVCToolChain : public ToolChain
{
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
index c5f62e8654a..25ef2e71d9f 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -142,7 +142,6 @@ bool Qt4RunConfiguration::isEnabled(ProjectExplorer::BuildConfiguration *configu
case ToolChain::GCC: case ToolChain::MinGW:
case ToolChain::GCCE_GNUPOC: case ToolChain::RVCT_ARMV5_GNUPOC:
case ToolChain::OTHER: case ToolChain::UNKNOWN:
- case ToolChain::LINUX_ICC:
case ToolChain::INVALID:
enabled = true;
break;
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 9808ce95db8..6e5625c9ae3 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -1309,17 +1309,14 @@ void QtVersion::updateToolChainAndMkspec() const
// we should try to do a better job, but for now that's good enough
ProjectExplorer::Environment env = ProjectExplorer::Environment::systemEnvironment();
//addToEnvironment(env);
+ qmakeCXX = env.searchInPath(qmakeCXX);
if (qmakeCXX.isEmpty()) {
// macx-xcode mkspec resets the value of QMAKE_CXX.
// Unfortunately, we need a valid QMAKE_CXX to configure the parser.
qmakeCXX = QLatin1String("cc");
}
- qmakeCXX = env.searchInPath(qmakeCXX);
m_toolChains << ToolChainPtr(ProjectExplorer::ToolChain::createGccToolChain(qmakeCXX));
m_targetIds.insert(QLatin1String(Constants::DESKTOP_TARGET_ID));
- } else if (qmakeCXX == "icpc") {
- m_toolChains << ToolChainPtr(ProjectExplorer::ToolChain::createLinuxIccToolChain());
- m_targetIds.insert(QLatin1String(Constants::DESKTOP_TARGET_ID));
}
if (m_toolChains.isEmpty()) {
--
GitLab