feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Remove remote setup sub-statemachinery

Browse Source 
Not needed anymore in the world of RunWorkers.

Change-Id: Id7fb24fece6acb03de12f2677dd99a05c513e7a4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
This commit is contained in:
hjk
2017-06-13 08:49:18 +02:00
parent 107df0a7c1
commit ffc97df7a6
15 changed files with 47 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/ios/iosrunner.cpp
View File

@@ -410,6 +410,11 @@ IosDebugSupport::IosDebugSupport(RunControl *runControl)
void IosDebugSupport::start()
{
if (!m_runner->isAppRunning()) {
reportFailure(tr("Application not running."));
return;
}
RunConfiguration *runConfig = runControl()->runConfiguration();
DebuggerStartParameters params;
@@ -447,7 +452,6 @@ void IosDebugSupport::start()
auto iosRunConfig = qobject_cast<IosRunConfiguration *>(runConfig);
params.displayName = iosRunConfig->applicationName();
params.remoteSetupNeeded = true;
params.continueAfterAttach = true;
Utils::Port gdbServerPort = m_runner->gdbServerPort();
@@ -458,10 +462,7 @@ void IosDebugSupport::start()
const bool qmlDebug = isQmlDebugging();
if (cppDebug) {
params.inferior.executable = iosRunConfig->localExecutable().toString();
if (gdbServerPort.isValid())
params.remoteChannel = "connect://localhost:" + gdbServerPort.toString();
else
params.remoteChannel = "connect://localhost:0";
params.remoteChannel = "connect://localhost:" + gdbServerPort.toString();
FileName xcodeInfo = IosConfigurations::developerPath().parentDir().appendPath("Info.plist");
bool buggyLldb = false;
@@ -506,20 +507,6 @@ void IosDebugSupport::start()
setStartParameters(params);
if (!m_runner->isAppRunning()) {
reportFailure(tr("Application not running."));
return;
}
RemoteSetupResult result;
if (m_runner->pid() > 0)
result.inferiorPid = m_runner->pid();
else
result.gdbServerPort = gdbServerPort;
result.qmlServerPort = qmlServerPort;
result.success = true; // Port validation already checked.
notifyEngineRemoteSetupFinished(result);
DebuggerRunTool::start();
}