Commit 49b3e7a2 authored by Fawzi Mohamed's avatar Fawzi Mohamed
Browse files

ios: fix running/debugging with new version of MobileDevice.framework



The version of MobileDevice.framework shipped with iTunes 11.1.3 and
XCode 5.0.2 does not support concurrent connections well, asking
for the application path while the connection to gdb was open would
lock up the device, and require a reboot.

Task-number: QTCREATORBUG-10922
Change-Id: I939cb9e75896e200da552d6708c01e726b9d7b45
Reviewed-by: default avatarFawzi Mohamed <fawzi.mohamed@digia.com>
parent f6542e2a
...@@ -1091,6 +1091,7 @@ void AppOpSession::deviceCallbackReturned() ...@@ -1091,6 +1091,7 @@ void AppOpSession::deviceCallbackReturned()
bool AppOpSession::runApp() bool AppOpSession::runApp()
{ {
bool failure = (device == 0); bool failure = (device == 0);
QString exe = appPathOnDevice();
ServiceSocket gdbFd = -1; ServiceSocket gdbFd = -1;
if (!failure && !startService(QLatin1String("com.apple.debugserver"), gdbFd)) if (!failure && !startService(QLatin1String("com.apple.debugserver"), gdbFd))
gdbFd = -1; gdbFd = -1;
...@@ -1103,7 +1104,6 @@ bool AppOpSession::runApp() ...@@ -1103,7 +1104,6 @@ bool AppOpSession::runApp()
if (!failure) failure = !sendGdbCommand(gdbFd, "QEnvironmentHexEncoded:"); // send the environment with a series of these commands... if (!failure) failure = !sendGdbCommand(gdbFd, "QEnvironmentHexEncoded:"); // send the environment with a series of these commands...
if (!failure) failure = !sendGdbCommand(gdbFd, "QSetDisableASLR:1"); // avoid address randomization to debug if (!failure) failure = !sendGdbCommand(gdbFd, "QSetDisableASLR:1"); // avoid address randomization to debug
if (!failure) failure = !expectGdbOkReply(gdbFd); if (!failure) failure = !expectGdbOkReply(gdbFd);
QString exe = appPathOnDevice();
QStringList args = extraArgs; QStringList args = extraArgs;
QByteArray runCommand("A"); QByteArray runCommand("A");
args.insert(0, exe); args.insert(0, exe);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment