diff options
| author | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2013-10-29 22:25:41 +0100 |
|---|---|---|
| committer | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2013-10-31 18:19:09 +0100 |
| commit | b39f26e856340618f4aced96fbfd1126284d591c (patch) | |
| tree | 92d2837c8b030741db299742cbd6d2bfc91866dd /src/plugins/ios/iosdebugsupport.cpp | |
| parent | 8429f1744bda5b8877060ba95db7157ce0deab7a (diff) | |
| download | qt-creator-b39f26e856340618f4aced96fbfd1126284d591c.tar.gz | |
ios: device debugging
switched to using a relay server
Change-Id: Ic3ddb48b818fa43894314f7fbaf9d7780fc01ade
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Diffstat (limited to 'src/plugins/ios/iosdebugsupport.cpp')
| -rw-r--r-- | src/plugins/ios/iosdebugsupport.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/plugins/ios/iosdebugsupport.cpp b/src/plugins/ios/iosdebugsupport.cpp index f4d6befda8..6ce8ee49e6 100644 --- a/src/plugins/ios/iosdebugsupport.cpp +++ b/src/plugins/ios/iosdebugsupport.cpp @@ -92,6 +92,7 @@ RunControl *IosDebugSupport::createDebugRunControl(IosRunConfiguration *runConfi if (ToolChain *tc = ToolChainKitInformation::toolChain(kit)) params.toolChainAbi = tc->targetAbi(); params.executable = runConfig->exePath().toString(); + params.remoteChannel = QLatin1String("connect://localhost:0"); } if (aspect->useQmlDebugger()) { params.languages |= QmlLanguage; @@ -116,7 +117,7 @@ IosDebugSupport::IosDebugSupport(IosRunConfiguration *runConfig, DebuggerRunControl *runControl) : QObject(runControl), m_runControl(runControl), m_runner(new IosRunner(this, runConfig, true)), - m_gdbServerFd(0), m_qmlPort(0) + m_qmlPort(0) { connect(m_runControl->engine(), SIGNAL(requestRemoteSetup()), @@ -124,8 +125,8 @@ IosDebugSupport::IosDebugSupport(IosRunConfiguration *runConfig, connect(m_runControl, SIGNAL(finished()), m_runner, SLOT(stop())); - connect(m_runner, SIGNAL(gotGdbSocket(int)), - SLOT(handleGdbServerFd(int))); + connect(m_runner, SIGNAL(gotGdbserverPort(int)), + SLOT(handleGdbServerPort(int))); connect(m_runner, SIGNAL(gotInferiorPid(Q_PID)), SLOT(handleGotInferiorPid(Q_PID))); connect(m_runner, SIGNAL(finished(bool)), @@ -139,18 +140,12 @@ IosDebugSupport::IosDebugSupport(IosRunConfiguration *runConfig, IosDebugSupport::~IosDebugSupport() { - if (m_gdbServerFd > 0) - close(m_gdbServerFd); } -void IosDebugSupport::handleGdbServerFd(int gdbServerFd) +void IosDebugSupport::handleGdbServerPort(int gdbServerPort) { - if (m_gdbServerFd > 0) { - close(m_gdbServerFd); - m_gdbServerFd = 0; - } - if (gdbServerFd > 0) { - m_runControl->engine()->notifyEngineRemoteSetupDone(m_gdbServerFd, m_qmlPort); + if (gdbServerPort > 0) { + m_runControl->engine()->notifyEngineRemoteSetupDone(gdbServerPort, m_qmlPort); } else { m_runControl->engine()->notifyEngineRemoteSetupFailed( tr("Could not get debug server file descriptor.")); |