iOS: Fix standalone QML debugging

Wait for ports before connecting to QML server.

Change-Id: Id2cc1928ddd90c61b84ffed5bdeffeb70f15b8c6
Reviewed-by: hjk <hjk@qt.io>

src/plugins/ios/iosrunner.cpp

@@ -132,6 +132,11 @@ bool IosRunner::cppDebug() const
     return m_cppDebug;
 }
 
+bool IosRunner::qmlDebug() const
+{
+    return m_qmlDebugServices != QmlDebug::NoQmlDebugServices;
+}
+
 QmlDebug::QmlDebugServicesPreset IosRunner::qmlDebugServices() const
 {
     return m_qmlDebugServices;
@@ -172,8 +177,6 @@ void IosRunner::start()
     m_toolHandler = new IosToolHandler(m_deviceType, this);
     connect(m_toolHandler, &IosToolHandler::appOutput,
             this, &IosRunner::handleAppOutput);
-    connect(m_toolHandler, &IosToolHandler::didStartApp,
-            this, &IosRunner::handleDidStartApp);
     connect(m_toolHandler, &IosToolHandler::errorMsg,
             this, &IosRunner::handleErrorMsg);
     connect(m_toolHandler, &IosToolHandler::gotServerPorts,
@@ -193,39 +196,34 @@ void IosRunner::stop()
         m_toolHandler->stop();
 }
 
-void IosRunner::handleDidStartApp(IosToolHandler *handler, const QString &bundlePath,
-                                  const QString &deviceId, IosToolHandler::OpStatus status)
-{
-    Q_UNUSED(bundlePath); Q_UNUSED(deviceId);
-    if (m_toolHandler == handler && runType() == IosToolHandler::NormalRun) {
-        // For normal run type the notify reportStarted here for debug type wait for
-        // server ports or PID for device and simulator respectivelly.
-        if (status == IosToolHandler::Success)
-            reportStarted();
-        else
-            reportFailure();
-    }
-}
-
 void IosRunner::handleGotServerPorts(IosToolHandler *handler, const QString &bundlePath,
                                      const QString &deviceId, Port gdbPort,
                                      Port qmlPort)
 {
     // Called when debugging on Device.
     Q_UNUSED(bundlePath); Q_UNUSED(deviceId);
-    if (m_toolHandler == handler && runType() == IosToolHandler::DebugRun) {
+
+    if (m_toolHandler != handler)
+        return;
+
     m_gdbServerPort = gdbPort;
     m_qmlServerPort = qmlPort;
-        bool portsValid = m_gdbServerPort.isValid() && m_qmlServerPort.isValid();
+
-        bool qmlDebugging = m_qmlDebugServices != QmlDebug::NoQmlDebugServices;
+    bool prerequisiteOk = false;
-        if ( (qmlDebugging && m_cppDebug && portsValid) // Mixed mode debuggin & valid ports
+    if (cppDebug() && qmlDebug())
-             || (qmlDebugging && !m_cppDebug && m_qmlServerPort.isValid()) // Qml debugging only
+        prerequisiteOk = m_gdbServerPort.isValid() && m_qmlServerPort.isValid();
-             || (m_cppDebug && !qmlDebugging && m_gdbServerPort.isValid())) { // C++ debugging only
+    else if (cppDebug())
+        prerequisiteOk = m_gdbServerPort.isValid();
+    else if (qmlDebug())
+        prerequisiteOk = m_qmlServerPort.isValid();
+    else
+        prerequisiteOk = true; // Not debugging. Ports not required.
+
+
+    if (prerequisiteOk)
         reportStarted();
-        } else {
+    else
-            reportFailure(tr("Could not get debug server file descriptor."));
+        reportFailure(tr("Could not get necessary ports for the debugger connection."));
-        }
-    }
 }
 
 void IosRunner::handleGotInferiorPid(IosToolHandler *handler, const QString &bundlePath,
@@ -233,17 +231,26 @@ void IosRunner::handleGotInferiorPid(IosToolHandler *handler, const QString &bun
 {
     // Called when debugging on Simulator.
     Q_UNUSED(bundlePath); Q_UNUSED(deviceId);
-    m_pid = pid;
-    if (m_pid <= 0)
-        reportFailure(tr("Could not get inferior PID."));
 
-    if (m_toolHandler == handler && runType() == IosToolHandler::DebugRun) {
+    if (m_toolHandler != handler)
-        bool qmlDebugging = m_qmlDebugServices != QmlDebug::NoQmlDebugServices;
+        return;
-        if ((qmlDebugging && m_qmlServerPort.isValid()) || (m_cppDebug && !qmlDebugging))
+
+    m_pid = pid;
+    bool prerequisiteOk = false;
+    if (m_pid > 0) {
+        prerequisiteOk = true;
+    } else {
+        reportFailure(tr("Could not get inferior PID."));
+        return;
+    }
+
+    if (qmlDebug())
+        prerequisiteOk = m_qmlServerPort.isValid();
+
+    if (prerequisiteOk)
         reportStarted();
     else
-            reportFailure(tr("Could not get debug server file descriptor."));
+        reportFailure(tr("Could not get necessary ports the debugger connection."));
-    }
 }
 
 void IosRunner::handleAppOutput(IosToolHandler *handler, const QString &output)

src/plugins/ios/iosrunner.h

@@ -57,6 +57,7 @@ public:
     QString deviceId();
     IosToolHandler::RunKind runType();
     bool cppDebug() const;
+    bool qmlDebug() const;
     QmlDebug::QmlDebugServicesPreset qmlDebugServices() const;
 
     void start() override;
@@ -71,8 +72,6 @@ public:
     bool isAppRunning() const;
 
 private:
-    void handleDidStartApp(Ios::IosToolHandler *handler, const QString &bundlePath,
-                           const QString &deviceId, Ios::IosToolHandler::OpStatus status);
     void handleGotServerPorts(Ios::IosToolHandler *handler, const QString &bundlePath,
                               const QString &deviceId, Utils::Port gdbPort, Utils::Port qmlPort);
     void handleGotInferiorPid(Ios::IosToolHandler *handler, const QString &bundlePath,