From 2e09df3d9c1f1788140d3125c6ce92e0411ec5c7 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Fri, 26 Nov 2010 11:54:38 +0100
Subject: [PATCH] ToolChain: Rename RVCT toolchains to RVCT2
Reviewed-by: dt
---
src/plugins/debugger/debuggerplugin.cpp | 2 +-
src/plugins/debugger/debuggerrunner.cpp | 8 ++++----
src/plugins/debugger/gdb/gdbchooserwidget.cpp | 8 ++++----
src/plugins/debugger/gdb/gdbengine.cpp | 4 ++--
src/plugins/debugger/gdb/remotegdbserveradapter.cpp | 4 ++--
src/plugins/projectexplorer/toolchain.cpp | 8 ++++----
src/plugins/projectexplorer/toolchaintype.h | 4 ++--
.../qt4projectmanager/qt-s60/s60deployconfiguration.cpp | 2 +-
.../qt-s60/s60devicerunconfiguration.cpp | 6 +++---
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp | 4 ++--
src/plugins/qt4projectmanager/qt4runconfiguration.cpp | 2 +-
src/plugins/qt4projectmanager/qtversionmanager.cpp | 8 ++++----
12 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 2d75be180b9..a45eba421de 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -2135,7 +2135,7 @@ void DebuggerPluginPrivate::startExternalApplication()
sp.processArgs = dlg.executableArguments();
// Fixme: 1 of 3 testing hacks.
if (sp.processArgs.startsWith(__("@tcf@ ")) || sp.processArgs.startsWith(__("@sym@ ")))
- sp.toolChainType = ToolChain_RVCT_ARMV5;
+ sp.toolChainType = ToolChain_RVCT2_ARMV5;
if (RunControl *rc = m_debuggerRunControlFactory->create(sp))
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index 18cdc89ed30..4ad8b2d2478 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -455,8 +455,8 @@ static DebuggerEngineType engineForToolChain(int toolChainType)
case ProjectExplorer::ToolChain_GCC:
case ProjectExplorer::ToolChain_WINSCW: // S60
case ProjectExplorer::ToolChain_GCCE:
- case ProjectExplorer::ToolChain_RVCT_ARMV5:
- case ProjectExplorer::ToolChain_RVCT_ARMV6:
+ case ProjectExplorer::ToolChain_RVCT2_ARMV5:
+ case ProjectExplorer::ToolChain_RVCT2_ARMV6:
case ProjectExplorer::ToolChain_RVCT_ARMV5_GNUPOC:
case ProjectExplorer::ToolChain_GCCE_GNUPOC:
case ProjectExplorer::ToolChain_GCC_MAEMO:
@@ -607,8 +607,8 @@ bool DebuggerRunControl::checkDebugConfiguration(int toolChain,
case ProjectExplorer::ToolChain_WINCE: // S60
case ProjectExplorer::ToolChain_WINSCW:
case ProjectExplorer::ToolChain_GCCE:
- case ProjectExplorer::ToolChain_RVCT_ARMV5:
- case ProjectExplorer::ToolChain_RVCT_ARMV6:
+ case ProjectExplorer::ToolChain_RVCT2_ARMV5:
+ case ProjectExplorer::ToolChain_RVCT2_ARMV6:
if (debuggerCore()->gdbBinaryForToolChain(toolChain).isEmpty()) {
*errorMessage = msgNoBinaryForToolChain(toolChain);
*settingsPage = GdbOptionsPage::settingsId();
diff --git a/src/plugins/debugger/gdb/gdbchooserwidget.cpp b/src/plugins/debugger/gdb/gdbchooserwidget.cpp
index 98d93ffe09d..b353501f285 100644
--- a/src/plugins/debugger/gdb/gdbchooserwidget.cpp
+++ b/src/plugins/debugger/gdb/gdbchooserwidget.cpp
@@ -74,8 +74,8 @@ static QList<int> allGdbToolChains()
<< ProjectExplorer::ToolChain_MinGW
<< ProjectExplorer::ToolChain_WINSCW
<< ProjectExplorer::ToolChain_GCCE
- << ProjectExplorer::ToolChain_RVCT_ARMV5
- << ProjectExplorer::ToolChain_RVCT_ARMV6
+ << ProjectExplorer::ToolChain_RVCT2_ARMV5
+ << ProjectExplorer::ToolChain_RVCT2_ARMV6
#endif
<< ProjectExplorer::ToolChain_GCC_MAEMO
#ifdef Q_OS_UNIX
@@ -451,8 +451,8 @@ ToolChainSelectorWidget::ToolChainSelectorWidget(QWidget *parent) :
break;
case ProjectExplorer::ToolChain_WINSCW:
case ProjectExplorer::ToolChain_GCCE:
- case ProjectExplorer::ToolChain_RVCT_ARMV5:
- case ProjectExplorer::ToolChain_RVCT_ARMV6:
+ case ProjectExplorer::ToolChain_RVCT2_ARMV5:
+ case ProjectExplorer::ToolChain_RVCT2_ARMV6:
case ProjectExplorer::ToolChain_GCCE_GNUPOC:
case ProjectExplorer::ToolChain_RVCT_ARMV5_GNUPOC:
symbianLayout->addWidget(createToolChainCheckBox(tc));
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 9d5ebfff357..87a8dd52ea0 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -1728,8 +1728,8 @@ AbstractGdbAdapter *GdbEngine::createAdapter()
switch (sp.toolChainType) {
case ProjectExplorer::ToolChain_WINSCW: // S60
case ProjectExplorer::ToolChain_GCCE:
- case ProjectExplorer::ToolChain_RVCT_ARMV5:
- case ProjectExplorer::ToolChain_RVCT_ARMV6:
+ case ProjectExplorer::ToolChain_RVCT2_ARMV5:
+ case ProjectExplorer::ToolChain_RVCT2_ARMV6:
case ProjectExplorer::ToolChain_RVCT_ARMV5_GNUPOC:
case ProjectExplorer::ToolChain_GCCE_GNUPOC:
// FIXME: 1 of 3 testing hacks.
diff --git a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp
index 681c3f83c8b..e8e74b7e711 100644
--- a/src/plugins/debugger/gdb/remotegdbserveradapter.cpp
+++ b/src/plugins/debugger/gdb/remotegdbserveradapter.cpp
@@ -76,8 +76,8 @@ AbstractGdbAdapter::DumperHandling RemoteGdbServerAdapter::dumperHandling() cons
case ProjectExplorer::ToolChain_WINCE:
case ProjectExplorer::ToolChain_WINSCW:
case ProjectExplorer::ToolChain_GCCE:
- case ProjectExplorer::ToolChain_RVCT_ARMV5:
- case ProjectExplorer::ToolChain_RVCT_ARMV6:
+ case ProjectExplorer::ToolChain_RVCT2_ARMV5:
+ case ProjectExplorer::ToolChain_RVCT2_ARMV6:
case ProjectExplorer::ToolChain_GCC_MAEMO:
return DumperLoadedByGdb;
default:
diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp
index 8fe844ddbe1..7efbd165677 100644
--- a/src/plugins/projectexplorer/toolchain.cpp
+++ b/src/plugins/projectexplorer/toolchain.cpp
@@ -149,10 +149,10 @@ QString ToolChain::toolChainName(ToolChainType tc)
return QCoreApplication::translate("ToolChain", "GCCE/GnuPoc");
case ToolChain_RVCT_ARMV5_GNUPOC:
return QCoreApplication::translate("ToolChain", "RVCT (ARMV6)/GnuPoc");
- case ToolChain_RVCT_ARMV5:
- return QCoreApplication::translate("ToolChain", "RVCT (ARMV5)");
- case ToolChain_RVCT_ARMV6:
- return QCoreApplication::translate("ToolChain", "RVCT (ARMV6)");
+ case ToolChain_RVCT2_ARMV5:
+ return QCoreApplication::translate("ToolChain", "RVCT 2 (ARMV5)");
+ case ToolChain_RVCT2_ARMV6:
+ return QCoreApplication::translate("ToolChain", "RVCT 2 (ARMV6)");
case ToolChain_GCC_MAEMO:
return QCoreApplication::translate("ToolChain", "GCC for Maemo");
case ToolChain_OTHER:
diff --git a/src/plugins/projectexplorer/toolchaintype.h b/src/plugins/projectexplorer/toolchaintype.h
index 695e75094af..cce032433c6 100644
--- a/src/plugins/projectexplorer/toolchaintype.h
+++ b/src/plugins/projectexplorer/toolchaintype.h
@@ -41,8 +41,8 @@ enum ToolChainType
ToolChain_WINCE = 4,
ToolChain_WINSCW = 5,
ToolChain_GCCE = 6,
- ToolChain_RVCT_ARMV5 = 7,
- ToolChain_RVCT_ARMV6 = 8,
+ ToolChain_RVCT2_ARMV5 = 7,
+ ToolChain_RVCT2_ARMV6 = 8,
ToolChain_GCC_MAEMO = 9,
ToolChain_GCCE_GNUPOC = 10,
ToolChain_RVCT_ARMV5_GNUPOC = 11,
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp
index c34a4b021c3..d6e441d7a8c 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp
@@ -243,7 +243,7 @@ QString S60DeployConfiguration::symbianPlatform() const
case ProjectExplorer::ToolChain_GCCE:
case ProjectExplorer::ToolChain_GCCE_GNUPOC:
return QLatin1String("gcce");
- case ProjectExplorer::ToolChain_RVCT_ARMV5:
+ case ProjectExplorer::ToolChain_RVCT2_ARMV5:
return QLatin1String("armv5");
default: // including ProjectExplorer::RVCT_ARMV6_GNUPOC:
return QLatin1String("armv6");
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index da304d250fd..e0aea884675 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -188,8 +188,8 @@ bool S60DeviceRunConfiguration::isEnabled(ProjectExplorer::BuildConfiguration *c
const Qt4BuildConfiguration *qt4bc = static_cast<const Qt4BuildConfiguration *>(configuration);
switch (qt4bc->toolChainType()) {
case ProjectExplorer::ToolChain_GCCE:
- case ProjectExplorer::ToolChain_RVCT_ARMV5:
- case ProjectExplorer::ToolChain_RVCT_ARMV6:
+ case ProjectExplorer::ToolChain_RVCT2_ARMV5:
+ case ProjectExplorer::ToolChain_RVCT2_ARMV6:
case ProjectExplorer::ToolChain_GCCE_GNUPOC:
case ProjectExplorer::ToolChain_RVCT_ARMV5_GNUPOC:
return true;
@@ -281,7 +281,7 @@ static inline QString symbianPlatformForToolChain(ProjectExplorer::ToolChainType
case ProjectExplorer::ToolChain_GCCE:
case ProjectExplorer::ToolChain_GCCE_GNUPOC:
return QLatin1String("gcce");
- case ProjectExplorer::ToolChain_RVCT_ARMV5:
+ case ProjectExplorer::ToolChain_RVCT2_ARMV5:
return QLatin1String("armv5");
default: // including ProjectExplorer::RVCT_ARMV6_GNUPOC:
break;
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index 053b79b04ed..f05f3ae10a4 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
@@ -324,9 +324,9 @@ QString Qt4BuildConfiguration::defaultMakeTarget() const
switch (tc->type()) {
case ProjectExplorer::ToolChain_GCCE:
return symbianMakeTarget(buildConfig, QLatin1String("gcce"));
- case ProjectExplorer::ToolChain_RVCT_ARMV5:
+ case ProjectExplorer::ToolChain_RVCT2_ARMV5:
return symbianMakeTarget(buildConfig, QLatin1String("armv5"));
- case ProjectExplorer::ToolChain_RVCT_ARMV6:
+ case ProjectExplorer::ToolChain_RVCT2_ARMV6:
return symbianMakeTarget(buildConfig, QLatin1String("armv6"));
case ProjectExplorer::ToolChain_RVCT_ARMV5_GNUPOC:
case ProjectExplorer::ToolChain_GCCE_GNUPOC:
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
index d0259a060b0..784d54781d6 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -150,7 +150,7 @@ bool Qt4RunConfiguration::isEnabled(ProjectExplorer::BuildConfiguration *configu
enabled = true;
break;
case ProjectExplorer::ToolChain_WINSCW: case ProjectExplorer::ToolChain_GCCE:
- case ProjectExplorer::ToolChain_RVCT_ARMV5: case ProjectExplorer::ToolChain_RVCT_ARMV6:
+ case ProjectExplorer::ToolChain_RVCT2_ARMV5: case ProjectExplorer::ToolChain_RVCT2_ARMV6:
case ProjectExplorer::ToolChain_GCC_MAEMO:
enabled = false;
break;
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 7e384b80e87..0dbaa468174 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -1429,8 +1429,8 @@ void QtVersion::updateToolChainAndMkspec() const
m_targetIds.insert(QLatin1String(Constants::S60_DEVICE_TARGET_ID));
m_toolChains << ToolChainPtr(s60mgr->createGCCEToolChain(this));
if (S60Manager::hasRvctCompiler())
- m_toolChains << ToolChainPtr(s60mgr->createRVCTToolChain(this, ProjectExplorer::ToolChain_RVCT_ARMV5))
- << ToolChainPtr(s60mgr->createRVCTToolChain(this, ProjectExplorer::ToolChain_RVCT_ARMV6));
+ m_toolChains << ToolChainPtr(s60mgr->createRVCTToolChain(this, ProjectExplorer::ToolChain_RVCT2_ARMV5))
+ << ToolChainPtr(s60mgr->createRVCTToolChain(this, ProjectExplorer::ToolChain_RVCT2_ARMV6));
if (!mwcDirectory().isEmpty()) {
m_toolChains << ToolChainPtr(s60mgr->createWINSCWToolChain(this));
m_targetIds.insert(QLatin1String(Constants::S60_EMULATOR_TARGET_ID));
@@ -1702,8 +1702,8 @@ bool QtVersion::supportsBinaryDebuggingHelper() const
return true;
case ProjectExplorer::ToolChain_WINSCW:
case ProjectExplorer::ToolChain_GCCE :
- case ProjectExplorer::ToolChain_RVCT_ARMV5:
- case ProjectExplorer::ToolChain_RVCT_ARMV6:
+ case ProjectExplorer::ToolChain_RVCT2_ARMV5:
+ case ProjectExplorer::ToolChain_RVCT2_ARMV6:
case ProjectExplorer::ToolChain_GCCE_GNUPOC:
case ProjectExplorer::ToolChain_RVCT_ARMV5_GNUPOC:
case ProjectExplorer::ToolChain_INVALID:
--
GitLab