Merge remote-tracking branch 'origin/dev' into wip/new-backend

 Conflicts:
	src/qml/compiler/qv4isel_moth.cpp
	src/qml/compiler/qv4jsir.cpp
	src/qml/jsruntime/qv4mathobject.cpp

Change-Id: I426f1f4f0a5302b5bcff021de11766a03fec7637

24 files changed, 556 insertions, 260 deletions

diff --git a/tests/auto/qml/debugger/debugger.pro b/tests/auto/qml/debugger/debugger.pro
index a50411e18b..63721cc575 100644
--- a/tests/auto/qml/debugger/debugger.pro
+++ b/tests/auto/qml/debugger/debugger.pro
@@ -10,7 +10,8 @@ PUBLICTESTS += \
     qqmlenginedebuginspectorintegrationtest \
     qqmlenginecontrol \
     qqmldebuggingenabler \
-    qqmlnativeconnector
+    qqmlnativeconnector \
+    qqmldebugprocess
 
 PRIVATETESTS += \
     qqmldebugclient \
diff --git a/tests/auto/qml/debugger/qdebugmessageservice/BLACKLIST b/tests/auto/qml/debugger/qdebugmessageservice/BLACKLIST
deleted file mode 100644
index 5fb1dc193b..0000000000
--- a/tests/auto/qml/debugger/qdebugmessageservice/BLACKLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-# QTQAINFRA-1334
-windows gcc
diff --git a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/BLACKLIST b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/BLACKLIST
deleted file mode 100644
index 5fb1dc193b..0000000000
--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/BLACKLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-# QTQAINFRA-1334
-windows gcc
diff --git a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
index 134de44858..a76740a3f9 100644
--- a/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
+++ b/tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp
@@ -27,6 +27,7 @@
 ****************************************************************************/
 
 #include "debugutil_p.h"
+#include "qqmldebugprocess_p.h"
 #include "../../../shared/util.h"
 
 #include <private/qqmldebugclient_p.h>
diff --git a/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/BLACKLIST b/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/BLACKLIST
deleted file mode 100644
index 5fb1dc193b..0000000000
--- a/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/BLACKLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-# QTQAINFRA-1334
-windows gcc
diff --git a/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/tst_qqmldebugjs.cpp b/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/tst_qqmldebugjs.cpp
index 59483d75da..33b294593f 100644
--- a/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/tst_qqmldebugjs.cpp
+++ b/tests/auto/qml/debugger/qqmldebugjs/qqmldebugjs/tst_qqmldebugjs.cpp
@@ -27,6 +27,7 @@
 ****************************************************************************/
 
 #include "debugutil_p.h"
+#include "qqmldebugprocess_p.h"
 #include "../../shared/qqmlenginedebugclient.h"
 #include "../../../../shared/util.h"
 
diff --git a/tests/auto/qml/debugger/qqmldebuglocal/tst_qqmldebuglocal.cpp b/tests/auto/qml/debugger/qqmldebuglocal/tst_qqmldebuglocal.cpp
index 8d21a8a45a..4b28857fc0 100644
--- a/tests/auto/qml/debugger/qqmldebuglocal/tst_qqmldebuglocal.cpp
+++ b/tests/auto/qml/debugger/qqmldebuglocal/tst_qqmldebuglocal.cpp
@@ -32,6 +32,9 @@
 #include <private/qqmldebugconnector_p.h>
 #include <private/qqmldebugconnection_p.h>
 
+#include <QtQml/qqmldebug.h>
+#include <QtQml/qqmlengine.h>
+
 #include <QtTest/qtest.h>
 #include <QtTest/qsignalspy.h>
 #include <QtNetwork/qhostaddress.h>
diff --git a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess.pro b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess.pro
new file mode 100644
index 0000000000..331d87b9f1
--- /dev/null
+++ b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess.pro
@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+SUBDIRS = qqmldebugprocess qqmldebugprocessprocess
+
+qqmldebugprocess.depends = qqmldebugprocessprocess
diff --git a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess/qqmldebugprocess.pro b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess/qqmldebugprocess.pro
new file mode 100644
index 0000000000..9bea2d222c
--- /dev/null
+++ b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess/qqmldebugprocess.pro
@@ -0,0 +1,14 @@
+CONFIG += testcase
+TARGET = tst_qqmldebugprocess
+QT = core testlib
+CONFIG -= debug_and_release_target
+macos:CONFIG -= app_bundle
+
+SOURCES += \
+    ../../shared/qqmldebugprocess.cpp \
+    tst_qqmldebugprocess.cpp
+
+HEADERS += \
+    ../../shared/qqmldebugprocess_p.h
+
+INCLUDEPATH += ../../shared
diff --git a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess/tst_qqmldebugprocess.cpp b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess/tst_qqmldebugprocess.cpp
new file mode 100644
index 0000000000..993a1d5f63
--- /dev/null
+++ b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocess/tst_qqmldebugprocess.cpp
@@ -0,0 +1,126 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qqmldebugprocess_p.h>
+#include <QtTest>
+
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qscopedpointer.h>
+
+class tst_QQmlDebugProcess : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void sessionStart_data();
+    void sessionStart();
+};
+
+void tst_QQmlDebugProcess::sessionStart_data()
+{
+    QTest::addColumn<int>("delay");
+    QTest::addColumn<QString>("arg");
+    QTest::addColumn<bool>("sessionExpected");
+    QTest::addColumn<bool>("outputExpected");
+
+    QTest::addRow("synchronous / waiting") << -1
+                                           << "QML Debugger: Waiting for connection on port 2423..."
+                                           << true << false;
+    QTest::addRow("synchronous / failed")  << -1 << "QML Debugger: Unable to listen to port 242."
+                                           << false << false;
+    QTest::addRow("synchronous / unknown") << -1 << "QML Debugger: You don't know this string."
+                                           << false << true;
+    QTest::addRow("synchronous / appout")  << -1 << "Output from app itself."
+                                           << false << true;
+
+    QTest::addRow("no delay / waiting") << 0
+                                        << "QML Debugger: Waiting for connection on port 2423..."
+                                        << true << false;
+    QTest::addRow("no delay / failed")  << 0 << "QML Debugger: Unable to listen to port 242."
+                                        << false << false;
+    QTest::addRow("no delay / unknown") << 0 << "QML Debugger: You don't know this string."
+                                        << false << true;
+    QTest::addRow("no delay / appout")  << 0 << "Output from app itself."
+                                        << false << true;
+
+    QTest::addRow("delay / waiting") << 1000
+                                     << "QML Debugger: Waiting for connection on port 2423..."
+                                     << true << false;
+    QTest::addRow("delay / failed")  << 1000 << "QML Debugger: Unable to listen to port 242."
+                                     << false << false;
+    QTest::addRow("delay / unknown") << 1000 << "QML Debugger: You don't know this string."
+                                     << false << true;
+    QTest::addRow("delay / appout")  << 1000 << "Output from app itself."
+                                     << false << true;
+}
+
+void tst_QQmlDebugProcess::sessionStart()
+{
+    QFETCH(int, delay);
+    QFETCH(QString, arg);
+    QFETCH(bool, sessionExpected);
+    QFETCH(bool, outputExpected);
+
+    QScopedPointer<QQmlDebugProcess> process(
+                new QQmlDebugProcess(QCoreApplication::applicationDirPath()
+                                     + QLatin1String("/qqmldebugprocessprocess"), this));
+    QVERIFY(process);
+
+    bool outputReceived = false;
+    connect(process.data(), &QQmlDebugProcess::readyReadStandardOutput, this, [&]() {
+        QVERIFY(outputExpected);
+        QVERIFY(!outputReceived);
+        QCOMPARE(process->output().trimmed(), arg);
+        outputReceived = true;
+        QTimer::singleShot(qMax(delay, 0), process.data(), &QQmlDebugProcess::stop);
+    });
+
+    if (!outputExpected && !sessionExpected)
+        QTest::ignoreMessage(QtWarningMsg, "App was unable to bind to port!");
+    process->start(QStringList({arg}));
+
+    bool done = false;
+    auto wait = [&](){
+        QCOMPARE(process->waitForSessionStart(), sessionExpected);
+        QCOMPARE(outputReceived, outputExpected);
+        process->stop();
+        done = true;
+    };
+
+    if (delay < 0)
+        wait();
+    else
+        QTimer::singleShot(delay, process.data(), wait);
+
+    QTRY_VERIFY(done);
+    QVERIFY(process->state().startsWith("not running"));
+}
+
+QTEST_MAIN(tst_QQmlDebugProcess)
+
+#include "tst_qqmldebugprocess.moc"
diff --git a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/qqmldebugprocessprocess.cpp b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/qqmldebugprocessprocess.cpp
new file mode 100644
index 0000000000..21cce53fc3
--- /dev/null
+++ b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/qqmldebugprocessprocess.cpp
@@ -0,0 +1,39 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/qdebug.h>
+#include <QtCore/qcoreapplication.h>
+
+// Process that just outputs a fake "Waiting" message.
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+    if (argc > 1)
+        qDebug() << argv[1];
+    return app.exec();
+}
diff --git a/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/qqmldebugprocessprocess.pro b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/qqmldebugprocessprocess.pro
new file mode 100644
index 0000000000..55a77d830d
--- /dev/null
+++ b/tests/auto/qml/debugger/qqmldebugprocess/qqmldebugprocessprocess/qqmldebugprocessprocess.pro
@@ -0,0 +1,10 @@
+QT = core
+macos:CONFIG -= app_bundle
+CONFIG -= debug_and_release_target
+SOURCES += qqmldebugprocessprocess.cpp
+
+DESTDIR = ../qqmldebugprocess
+
+target.path = $$[QT_INSTALL_TESTS]/tst_qqmldebugprocess
+INSTALLS += target
+
diff --git a/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp b/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp
index 06e4a4bfcc..4e103e9a65 100644
--- a/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp
+++ b/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp
@@ -29,6 +29,7 @@
 
 #include "qqmldebugtestservice.h"
 #include "debugutil_p.h"
+#include "qqmldebugprocess_p.h"
 #include "../../../shared/util.h"
 
 #include <private/qqmldebugclient_p.h>
diff --git a/tests/auto/qml/debugger/qqmlenginecontrol/BLACKLIST b/tests/auto/qml/debugger/qqmlenginecontrol/BLACKLIST
deleted file mode 100644
index 5fb1dc193b..0000000000
--- a/tests/auto/qml/debugger/qqmlenginecontrol/BLACKLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-# QTQAINFRA-1334
-windows gcc
diff --git a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/BLACKLIST b/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/BLACKLIST
deleted file mode 100644
index 5fb1dc193b..0000000000
--- a/tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/BLACKLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-# QTQAINFRA-1334
-windows gcc
diff --git a/tests/auto/qml/debugger/qqmlinspector/BLACKLIST b/tests/auto/qml/debugger/qqmlinspector/BLACKLIST
deleted file mode 100644
index 5fb1dc193b..0000000000
--- a/tests/auto/qml/debugger/qqmlinspector/BLACKLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-# QTQAINFRA-1334
-windows gcc
diff --git a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
index a4cf932ee1..5c9506eb21 100644
--- a/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
+++ b/tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp
@@ -28,6 +28,7 @@
 
 #include "qqmlinspectorclient.h"
 #include "../shared/debugutil_p.h"
+#include "../shared/qqmldebugprocess_p.h"
 #include "../../../shared/util.h"
 
 #include <private/qqmldebugconnection_p.h>
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/BLACKLIST b/tests/auto/qml/debugger/qqmlprofilerservice/BLACKLIST
deleted file mode 100644
index 5fb1dc193b..0000000000
--- a/tests/auto/qml/debugger/qqmlprofilerservice/BLACKLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-# QTQAINFRA-1334
-windows gcc
diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
index 45e4ad1207..6232a8a867 100644
--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
@@ -27,6 +27,7 @@
 ****************************************************************************/
 
 #include "debugutil_p.h"
+#include "qqmldebugprocess_p.h"
 #include "../../../shared/util.h"
 
 #include <private/qqmlprofilerclient_p.h>
diff --git a/tests/auto/qml/debugger/shared/debugutil.cpp b/tests/auto/qml/debugger/shared/debugutil.cpp
index d3bb25ee89..8ecbe53822 100644
--- a/tests/auto/qml/debugger/shared/debugutil.cpp
+++ b/tests/auto/qml/debugger/shared/debugutil.cpp
@@ -27,13 +27,14 @@
 ****************************************************************************/
 
 #include "debugutil_p.h"
+#include "qqmldebugprocess_p.h"
 
 #include <private/qqmldebugconnection_p.h>
 
+#include <QtQml/qqmldebug.h>
+
 #include <QtCore/qeventloop.h>
 #include <QtCore/qtimer.h>
-#include <QtCore/qfileinfo.h>
-#include <QtCore/qdir.h>
 
 bool QQmlDebugTest::waitForSignal(QObject *receiver, const char *member, int timeout) {
     QEventLoop loop;
@@ -116,193 +117,6 @@ void QQmlDebugTestClient::messageReceived(const QByteArray &ba)
     emit serverMessage(ba);
 }
 
-QQmlDebugProcess::QQmlDebugProcess(const QString &executable, QObject *parent)
-    : QObject(parent)
-    , m_executable(executable)
-    , m_started(false)
-    , m_port(0)
-    , m_maximumBindErrors(0)
-    , m_receivedBindErrors(0)
-{
-    m_process.setProcessChannelMode(QProcess::MergedChannels);
-    m_timer.setSingleShot(true);
-    m_timer.setInterval(5000);
-    connect(&m_process, SIGNAL(readyReadStandardOutput()), this, SLOT(processAppOutput()));
-    connect(&m_process, SIGNAL(errorOccurred(QProcess::ProcessError)),
-            this, SLOT(processError(QProcess::ProcessError)));
-    connect(&m_timer, SIGNAL(timeout()), SLOT(timeout()));
-}
-
-QQmlDebugProcess::~QQmlDebugProcess()
-{
-    stop();
-}
-
-QString QQmlDebugProcess::state()
-{
-    QString stateStr;
-    switch (m_process.state()) {
-    case QProcess::NotRunning: {
-        stateStr = "not running";
-        if (m_process.exitStatus() == QProcess::CrashExit)
-            stateStr += " (crashed!)";
-        else
-            stateStr += ", return value " + QString::number(m_process.exitCode());
-        break;
-    }
-    case QProcess::Starting: stateStr = "starting"; break;
-    case QProcess::Running: stateStr = "running"; break;
-    }
-    return stateStr;
-}
-
-void QQmlDebugProcess::start(const QStringList &arguments)
-{
-#ifdef Q_OS_MAC
-    // make sure m_executable points to the actual binary even if it's inside an app bundle
-    QFileInfo binFile(m_executable);
-    if (!binFile.isExecutable()) {
-        QDir bundleDir(m_executable + ".app");
-        if (bundleDir.exists()) {
-            m_executable = bundleDir.absoluteFilePath("Contents/MacOS/" + binFile.baseName());
-            //qDebug() << Q_FUNC_INFO << "found bundled binary" << m_executable;
-        }
-    }
-#endif
-    m_mutex.lock();
-    m_port = 0;
-    m_process.setEnvironment(QProcess::systemEnvironment() + m_environment);
-    m_process.start(m_executable, arguments);
-    if (!m_process.waitForStarted()) {
-        qWarning() << "QML Debug Client: Could not launch app " << m_executable
-                   << ": " << m_process.errorString();
-        m_eventLoop.quit();
-    } else {
-        m_timer.start();
-    }
-    m_mutex.unlock();
-}
-
-void QQmlDebugProcess::stop()
-{
-    if (m_process.state() != QProcess::NotRunning) {
-        m_process.kill();
-        m_process.waitForFinished(5000);
-    }
-}
-
-void QQmlDebugProcess::setMaximumBindErrors(int ignore)
-{
-    m_maximumBindErrors = ignore;
-}
-
-void QQmlDebugProcess::timeout()
-{
-    qWarning() << "Timeout while waiting for QML debugging messages "
-                  "in application output. Process is in state" << m_process.state() << ", Output:" << m_output << ".";
-    m_eventLoop.quit();
-}
-
-bool QQmlDebugProcess::waitForSessionStart()
-{
-    if (m_process.state() != QProcess::Running) {
-        qWarning() << "Could not start up " << m_executable;
-        return false;
-    }
-    m_eventLoop.exec();
-
-    return m_started;
-}
-
-int QQmlDebugProcess::debugPort() const
-{
-    return m_port;
-}
-
-bool QQmlDebugProcess::waitForFinished()
-{
-    return m_process.waitForFinished();
-}
-
-QProcess::ExitStatus QQmlDebugProcess::exitStatus() const
-{
-    return m_process.exitStatus();
-}
-
-void QQmlDebugProcess::addEnvironment(const QString &environment)
-{
-    m_environment.append(environment);
-}
-
-QString QQmlDebugProcess::output() const
-{
-    return m_output;
-}
-
-void QQmlDebugProcess::processAppOutput()
-{
-    m_mutex.lock();
-
-    bool outputFromAppItself = false;
-
-    QString newOutput = m_process.readAll();
-    m_output.append(newOutput);
-    m_outputBuffer.append(newOutput);
-
-    while (true) {
-        const int nlIndex = m_outputBuffer.indexOf(QLatin1Char('\n'));
-        if (nlIndex < 0) // no further complete lines
-            break;
-        const QString line = m_outputBuffer.left(nlIndex);
-        m_outputBuffer = m_outputBuffer.right(m_outputBuffer.size() - nlIndex - 1);
-
-        if (line.contains("QML Debugger:")) {
-            const QRegExp portRx("Waiting for connection on port (\\d+)");
-            if (portRx.indexIn(line) != -1) {
-                m_port = portRx.cap(1).toInt();
-                m_timer.stop();
-                m_started = true;
-                m_eventLoop.quit();
-                continue;
-            }
-            if (line.contains("Unable to listen")) {
-                if (++m_receivedBindErrors >= m_maximumBindErrors) {
-                    if (m_maximumBindErrors == 0)
-                        qWarning() << "App was unable to bind to port!";
-                    m_timer.stop();
-                    m_eventLoop.quit();
-                 }
-                 continue;
-            }
-        } else {
-            // set to true if there is output not coming from the debugger
-            outputFromAppItself = true;
-        }
-    }
-    m_mutex.unlock();
-
-    if (outputFromAppItself)
-        emit readyReadStandardOutput();
-}
-
-void QQmlDebugProcess::processError(QProcess::ProcessError error)
-{
-    if (!m_eventLoop.isRunning())
-       return;
-
-    qDebug() << "An error occurred while waiting for debug process to become available:";
-    switch (error) {
-    case QProcess::FailedToStart: qDebug() << "Process failed to start."; break;
-    case QProcess::Crashed: qDebug() << "Process crashed."; break;
-    case QProcess::Timedout: qDebug() << "Process timed out."; break;
-    case QProcess::WriteError: qDebug() << "Error while writing to process."; break;
-    case QProcess::ReadError: qDebug() << "Error while reading from process."; break;
-    case QProcess::UnknownError: qDebug() << "Unknown process error."; break;
-    }
-
-    m_eventLoop.exit();
-}
-
 template<typename F>
 struct Finalizer {
     F m_lambda;
diff --git a/tests/auto/qml/debugger/shared/debugutil.pri b/tests/auto/qml/debugger/shared/debugutil.pri
index 44e8e0f999..13dcdb91d8 100644
--- a/tests/auto/qml/debugger/shared/debugutil.pri
+++ b/tests/auto/qml/debugger/shared/debugutil.pri
@@ -3,5 +3,9 @@ QT += qmldebug-private
 INCLUDEPATH += $$PWD
 include($$PWD/../../../shared/util.pri)
 
-HEADERS += $$PWD/debugutil_p.h
-SOURCES += $$PWD/debugutil.cpp
+HEADERS += \
+    $$PWD/debugutil_p.h \
+    $$PWD/qqmldebugprocess_p.h
+SOURCES += \
+    $$PWD/debugutil.cpp \
+    $$PWD/qqmldebugprocess.cpp
diff --git a/tests/auto/qml/debugger/shared/debugutil_p.h b/tests/auto/qml/debugger/shared/debugutil_p.h
index f1b25d5f6d..94ad83bfce 100644
--- a/tests/auto/qml/debugger/shared/debugutil_p.h
+++ b/tests/auto/qml/debugger/shared/debugutil_p.h
@@ -1,4 +1,3 @@
-
 /****************************************************************************
 **
 ** Copyright (C) 2016 The Qt Company Ltd.
@@ -44,14 +43,6 @@
 #include <../../../shared/util.h>
 #include <private/qqmldebugclient_p.h>
 
-#include <QtCore/qeventloop.h>
-#include <QtCore/qtimer.h>
-#include <QtCore/qthread.h>
-#include <QtCore/qprocess.h>
-#include <QtCore/qmutex.h>
-#include <QtTest/qtest.h>
-#include <QtQml/qqmlengine.h>
-
 class QQmlDebugProcess;
 class QQmlDebugTest : public QQmlDataTest
 {
@@ -108,51 +99,6 @@ private:
     QByteArray lastMsg;
 };
 
-class QQmlDebugProcess : public QObject
-{
-    Q_OBJECT
-public:
-    QQmlDebugProcess(const QString &executable, QObject *parent = 0);
-    ~QQmlDebugProcess();
-
-    QString state();
-
-    void addEnvironment(const QString &environment);
-
-    void start(const QStringList &arguments);
-    bool waitForSessionStart();
-    int debugPort() const;
-
-    bool waitForFinished();
-    QProcess::ExitStatus exitStatus() const;
-
-    QString output() const;
-    void stop();
-    void setMaximumBindErrors(int numErrors);
-
-signals:
-    void readyReadStandardOutput();
-
-private slots:
-    void timeout();
-    void processAppOutput();
-    void processError(QProcess::ProcessError error);
-
-private:
-    QString m_executable;
-    QProcess m_process;
-    QString m_outputBuffer;
-    QString m_output;
-    QTimer m_timer;
-    QEventLoop m_eventLoop;
-    QMutex m_mutex;
-    bool m_started;
-    QStringList m_environment;
-    int m_port;
-    int m_maximumBindErrors;
-    int m_receivedBindErrors;
-};
-
 class QQmlInspectorResultRecipient : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/qml/debugger/shared/qqmldebugprocess.cpp b/tests/auto/qml/debugger/shared/qqmldebugprocess.cpp
new file mode 100644
index 0000000000..816fec6a2f
--- /dev/null
+++ b/tests/auto/qml/debugger/shared/qqmldebugprocess.cpp
@@ -0,0 +1,245 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qqmldebugprocess_p.h"
+
+#include <QtCore/qdebug.h>
+#include <QtCore/qfileinfo.h>
+#include <QtCore/qdir.h>
+
+QQmlDebugProcess::QQmlDebugProcess(const QString &executable, QObject *parent)
+    : QObject(parent)
+    , m_executable(executable)
+    , m_state(SessionUnknown)
+    , m_port(0)
+    , m_maximumBindErrors(0)
+    , m_receivedBindErrors(0)
+{
+    m_process.setProcessChannelMode(QProcess::MergedChannels);
+    m_timer.setSingleShot(true);
+    m_timer.setInterval(15000);
+    connect(&m_process, &QProcess::readyReadStandardOutput,
+            this, &QQmlDebugProcess::processAppOutput);
+    connect(&m_process, &QProcess::errorOccurred,
+            this, &QQmlDebugProcess::processError);
+    connect(&m_process, static_cast<void(QProcess::*)(int)>(&QProcess::finished),
+            this, [this]() {
+        m_timer.stop();
+        m_eventLoop.quit();
+    });
+    connect(&m_timer, &QTimer::timeout,
+            this, &QQmlDebugProcess::timeout);
+}
+
+QQmlDebugProcess::~QQmlDebugProcess()
+{
+    stop();
+}
+
+QString QQmlDebugProcess::state()
+{
+    QString stateStr;
+    switch (m_process.state()) {
+    case QProcess::NotRunning: {
+        stateStr = "not running";
+        if (m_process.exitStatus() == QProcess::CrashExit)
+            stateStr += " (crashed!)";
+        else
+            stateStr += ", return value " + QString::number(m_process.exitCode());
+        break;
+    }
+    case QProcess::Starting:
+        stateStr = "starting";
+        break;
+    case QProcess::Running:
+        stateStr = "running";
+        break;
+    }
+    return stateStr;
+}
+
+void QQmlDebugProcess::start(const QStringList &arguments)
+{
+#ifdef Q_OS_MAC
+    // make sure m_executable points to the actual binary even if it's inside an app bundle
+    QFileInfo binFile(m_executable);
+    if (!binFile.isExecutable()) {
+        QDir bundleDir(m_executable + ".app");
+        if (bundleDir.exists()) {
+            m_executable = bundleDir.absoluteFilePath("Contents/MacOS/" + binFile.baseName());
+            //qDebug() << Q_FUNC_INFO << "found bundled binary" << m_executable;
+        }
+    }
+#endif
+    m_mutex.lock();
+    m_port = 0;
+    m_process.setEnvironment(QProcess::systemEnvironment() + m_environment);
+    m_process.start(m_executable, arguments);
+    if (!m_process.waitForStarted()) {
+        qWarning() << "QML Debug Client: Could not launch app " << m_executable
+                   << ": " << m_process.errorString();
+        m_eventLoop.quit();
+    }
+    m_mutex.unlock();
+}
+
+void QQmlDebugProcess::stop()
+{
+    if (m_process.state() != QProcess::NotRunning) {
+        disconnect(&m_process, &QProcess::errorOccurred, this, &QQmlDebugProcess::processError);
+        m_process.kill();
+        m_process.waitForFinished(5000);
+    }
+}
+
+void QQmlDebugProcess::setMaximumBindErrors(int ignore)
+{
+    m_maximumBindErrors = ignore;
+}
+
+void QQmlDebugProcess::timeout()
+{
+    qWarning() << "Timeout while waiting for QML debugging messages "
+                  "in application output. Process is in state" << m_process.state()
+               << ", Output:" << m_output << ".";
+    m_eventLoop.quit();
+}
+
+bool QQmlDebugProcess::waitForSessionStart()
+{
+    if (m_process.state() != QProcess::Running) {
+        qWarning() << "Could not start up " << m_executable;
+        return false;
+    } else if (m_state == SessionStarted) {
+        return true;
+    } else if (m_state == SessionFailed) {
+        return false;
+    }
+
+    m_timer.start();
+    m_eventLoop.exec();
+
+    return m_state == SessionStarted;
+}
+
+int QQmlDebugProcess::debugPort() const
+{
+    return m_port;
+}
+
+bool QQmlDebugProcess::waitForFinished()
+{
+    return m_process.waitForFinished();
+}
+
+QProcess::ExitStatus QQmlDebugProcess::exitStatus() const
+{
+    return m_process.exitStatus();
+}
+
+void QQmlDebugProcess::addEnvironment(const QString &environment)
+{
+    m_environment.append(environment);
+}
+
+QString QQmlDebugProcess::output() const
+{
+    return m_output;
+}
+
+void QQmlDebugProcess::processAppOutput()
+{
+    m_mutex.lock();
+
+    bool outputFromAppItself = false;
+
+    QString newOutput = m_process.readAll();
+    m_output.append(newOutput);
+    m_outputBuffer.append(newOutput);
+
+    while (true) {
+        const int nlIndex = m_outputBuffer.indexOf(QLatin1Char('\n'));
+        if (nlIndex < 0) // no further complete lines
+            break;
+        const QString line = m_outputBuffer.left(nlIndex);
+        m_outputBuffer = m_outputBuffer.right(m_outputBuffer.size() - nlIndex - 1);
+
+        if (line.contains("QML Debugger:")) {
+            const QRegExp portRx("Waiting for connection on port (\\d+)");
+            if (portRx.indexIn(line) != -1) {
+                m_port = portRx.cap(1).toInt();
+                m_timer.stop();
+                m_state = SessionStarted;
+                m_eventLoop.quit();
+                continue;
+            }
+            if (line.contains("Unable to listen")) {
+                if (++m_receivedBindErrors >= m_maximumBindErrors) {
+                    if (m_maximumBindErrors == 0)
+                        qWarning() << "App was unable to bind to port!";
+                    m_timer.stop();
+                    m_state = SessionFailed;
+                    m_eventLoop.quit();
+                 }
+                 continue;
+            }
+        }
+
+        // set to true if there is output not coming from the debugger or we don't understand it
+        outputFromAppItself = true;
+    }
+    m_mutex.unlock();
+
+    if (outputFromAppItself)
+        emit readyReadStandardOutput();
+}
+
+void QQmlDebugProcess::processError(QProcess::ProcessError error)
+{
+    qDebug() << "An error occurred while waiting for debug process to become available:";
+    switch (error) {
+    case QProcess::FailedToStart:
+        qDebug() << "Process failed to start.";
+        break;
+    case QProcess::Crashed:
+        qDebug() << "Process crashed.";
+        break;
+    case QProcess::Timedout:
+        qDebug() << "Process timed out.";
+        break;
+    case QProcess::WriteError:
+        qDebug() << "Error while writing to process.";
+        break;
+    case QProcess::ReadError:
+        qDebug() << "Error while reading from process.";
+        break;
+    case QProcess::UnknownError:
+        qDebug() << "Unknown process error.";
+        break;
+    }
+}
diff --git a/tests/auto/qml/debugger/shared/qqmldebugprocess_p.h b/tests/auto/qml/debugger/shared/qqmldebugprocess_p.h
new file mode 100644
index 0000000000..fd2c89bb41
--- /dev/null
+++ b/tests/auto/qml/debugger/shared/qqmldebugprocess_p.h
@@ -0,0 +1,99 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQMLDEBUGPROCESS_P_H
+#define QQMLDEBUGPROCESS_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QtCore/qprocess.h>
+#include <QtCore/qtimer.h>
+#include <QtCore/qeventloop.h>
+#include <QtCore/qmutex.h>
+
+class QQmlDebugProcess : public QObject
+{
+    Q_OBJECT
+public:
+    QQmlDebugProcess(const QString &executable, QObject *parent = 0);
+    ~QQmlDebugProcess();
+
+    QString state();
+
+    void addEnvironment(const QString &environment);
+
+    void start(const QStringList &arguments);
+    bool waitForSessionStart();
+    int debugPort() const;
+
+    bool waitForFinished();
+    QProcess::ExitStatus exitStatus() const;
+
+    QString output() const;
+    void stop();
+    void setMaximumBindErrors(int numErrors);
+
+signals:
+    void readyReadStandardOutput();
+
+private slots:
+    void timeout();
+    void processAppOutput();
+    void processError(QProcess::ProcessError error);
+
+private:
+    enum SessionState {
+        SessionUnknown,
+        SessionStarted,
+        SessionFailed
+    };
+
+    QString m_executable;
+    QProcess m_process;
+    QString m_outputBuffer;
+    QString m_output;
+    QTimer m_timer;
+    QEventLoop m_eventLoop;
+    QMutex m_mutex;
+    SessionState m_state;
+    QStringList m_environment;
+    int m_port;
+    int m_maximumBindErrors;
+    int m_receivedBindErrors;
+};
+
+#endif // QQMLDEBUGPROCESS_P_H