Merge remote-tracking branch 'origin/4.2'

Change-Id: If7e8fbfeae064c95e412b4cfa4804f7aa732be67
This commit is contained in:
Eike Ziller
2017-01-17 14:03:33 +01:00
11 changed files with 3498 additions and 1796 deletions

View File

@@ -937,6 +937,8 @@ void IosSimulatorToolHandlerPrivate::launchAppOnSimulator(const QStringList &ext
// Poll every 1 sec to check whether the app is running.
QThread::msleep(1000);
} while (!fi.isCanceled() && kill(pid, 0) == 0);
#else
Q_UNUSED(pid);
#endif
// Future is cancelled if the app is stopped from the qt creator.
if (!fi.isCanceled())