2 files changed, 12 insertions, 1 deletions
diff --git a/tests/auto/qml/debugger/shared/debugutil.cpp b/tests/auto/qml/debugger/shared/debugutil.cpp
index 6585f7eca2..ff3140f520 100644
--- a/tests/auto/qml/debugger/shared/debugutil.cpp
+++ b/tests/auto/qml/debugger/shared/debugutil.cpp
@@ -182,6 +182,8 @@ void QQmlDebugProcess::processAppOutput()
 {
     m_mutex.lock();
 
+    bool outputFromAppItself = false;
+
     QString newOutput = m_process.readAll();
     m_output.append(newOutput);
     m_outputBuffer.append(newOutput);
@@ -208,7 +210,13 @@ void QQmlDebugProcess::processAppOutput()
                 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();
 }
diff --git a/tests/auto/qml/debugger/shared/debugutil_p.h b/tests/auto/qml/debugger/shared/debugutil_p.h
index 2b9a94366a..11b16a1fb8 100644
--- a/tests/auto/qml/debugger/shared/debugutil_p.h
+++ b/tests/auto/qml/debugger/shared/debugutil_p.h
@@ -57,7 +57,7 @@
 class QQmlDebugTest
 {
 public:
-    static bool waitForSignal(QObject *receiver, const char *member, int timeout = 10000);
+    static bool waitForSignal(QObject *receiver, const char *member, int timeout = 5000);
 };
 
 class QQmlDebugTestClient : public QQmlDebugClient
@@ -98,6 +98,9 @@ public:
     QString output() const;
     void stop();
 
+signals:
+    void readyReadStandardOutput();
+
 private slots:
     void timeout();
     void processAppOutput();