From 6288d2833bc363a24eaec2c1898240e206901d8b Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 3 Mar 2015 13:36:28 +0100 Subject: [PATCH] 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 --- doc/src/debugger/creator-debugger.qdoc | 2 +- src/plugins/debugger/debuggerplugin.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/src/debugger/creator-debugger.qdoc b/doc/src/debugger/creator-debugger.qdoc index 59fa9c6f1d5..3813d731301 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 f9ea096e3f5..5d6587f6efd 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);