aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhjk <hjk@theqtcompany.com>2015-03-03 13:36:28 +0100
committerhjk <hjk@theqtcompany.com>2015-03-03 14:10:25 +0000
commit6288d2833bc363a24eaec2c1898240e206901d8b (patch)
tree44d75ab6679aa0c3e5516525f850a9fdc1ebcaae
parentaaf4c3e978fd4b9f6147df95413da56fe0515b0c (diff)
Debugger: Remove 'Remote' qualification from 'Debug Server'
While using the Debug Server typically does involve a remotely running debug server (GDBServer or other stub) it's also possible and sometimes useful to use it locally. Change-Id: I7b041b14cc09d15ae3e6b501c9298f78764e256d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
-rw-r--r--doc/src/debugger/creator-debugger.qdoc2
-rw-r--r--src/plugins/debugger/debuggerplugin.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/debugger/creator-debugger.qdoc b/doc/src/debugger/creator-debugger.qdoc
index 59fa9c6f1d..3813d73130 100644
--- a/doc/src/debugger/creator-debugger.qdoc
+++ b/doc/src/debugger/creator-debugger.qdoc
@@ -273,7 +273,7 @@
\list 1
- \li Select \uicontrol {Debug > Start Debugging > Attach to Remote
+ \li Select \uicontrol {Debug > Start Debugging > Attach to Running
Debug Server}.
\li In the \uicontrol {Host and port} field, enter the name of the remote
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index f9ea096e3f..5d6587f6ef 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -2634,11 +2634,11 @@ void DebuggerPluginPrivate::extensionsInitialized()
connect(act, &QAction::triggered, this, &DebuggerPluginPrivate::attachCore);
act = m_attachToRemoteServerAction = new QAction(this);
- act->setText(tr("Attach to Remote Debug Server..."));
+ act->setText(tr("Attach to Running Debug Server..."));
connect(act, &QAction::triggered, this, &DebuggerPluginPrivate::attachToRemoteServer);
act = m_startRemoteServerAction = new QAction(this);
- act->setText(tr("Start Remote Debug Server Attached to Process..."));
+ act->setText(tr("Start Debug Server Attached to Process..."));
connect(act, &QAction::triggered, this, &DebuggerPluginPrivate::startRemoteServerAndAttachToProcess);
act = m_attachToRunningApplication = new QAction(this);