debugger: clearer naming for some of the remote operations

Change-Id: If5857d9f41ac3819c591df165ef2d8788d95089c
Reviewed-by: hjk <qthjk@ovi.com>

src/plugins/debugger/debuggerconstants.h

@@ -48,7 +48,8 @@ const char C_QMLDEBUGGER[]          = "Qml/JavaScript Debugger";
 
 // Menu Groups
 const char G_START_LOCAL[]          = "Debugger.Group.Start.Local";
-const char G_START_REMOTE[]         = "Debugger.Group.Start.Remote";
+const char G_MANUAL_REMOTE[]        = "Debugger.Group.Manual.Remote";
+const char G_AUTOMATIC_REMOTE[]     = "Debugger.Group.Automatic.Remote";
 const char G_START_QML[]            = "Debugger.Group.Start.Qml";
 
 // Project Explorer run mode (RUN/DEBUG)
@@ -130,8 +131,9 @@ enum DebuggerStartMode
     AttachExternal,        // Attach to running process by process id
     AttachCrashedExternal, // Attach to crashed process by process id
     AttachCore,            // Attach to a core file
-    AttachToRemoteServer,  // Attach to a running remote server
-    StartRemote,           // Start and attach to a remote process
+    AttachToRemoteServer,  // Attach to a running gdbserver
+    AttachToRemoteProcess, // Attach to a running remote process
+    StartRemoteProcess,    // Start and attach to a remote process
     AttachToQmlPort,       // Attach to QML debugging port
     StartRemoteGdb,        // Start gdb itself remotely
     StartRemoteEngine      // Start ipc guest engine on other machine

src/plugins/debugger/debuggerrunner.cpp

@@ -457,10 +457,11 @@ static QList<DebuggerEngineType> enginesForMode(DebuggerStartMode startMode,
 #endif
         result.push_back(GdbEngineType);
         break;
-    case StartRemote:
+    case StartRemoteProcess:
     case StartRemoteGdb:
         result.push_back(GdbEngineType);
         break;
+    case AttachToRemoteProcess:
     case AttachToRemoteServer:
         if (!hardConstraintsOnly) {
 #ifdef Q_OS_WIN

src/plugins/remotelinux/remotelinuxplugin.cpp

@@ -100,7 +100,7 @@ void RemoteLinuxPlugin::extensionsInitialized()
     QAction *startGdbServerAction = new QAction(tr("Start Remote Debug Server..."), 0);
     Command *cmd = am->registerAction(startGdbServerAction, "StartGdbServer", globalcontext);
     cmd->setDefaultText(tr("Start Gdbserver"));
-    mstart->addAction(cmd, Debugger::Constants::G_START_REMOTE);
+    mstart->addAction(cmd, Debugger::Constants::G_MANUAL_REMOTE);
 
     connect(startGdbServerAction, SIGNAL(triggered()), SLOT(startGdbServer()));
 }