diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-06-19 18:28:36 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-19 17:23:10 +0000 |
| commit | ba64b7d013fb95fb7b3afe9f1724edae7fcca2ed (patch) | |
| tree | 9aaddf6c214b41999a584129e63282b443734ca9 /tests/auto/qml/debugger/shared | |
| parent | 9333ea8649838d7e0400b0e94c8cbd4fa5d216b0 (diff) | |
| parent | 5100d558742c682d83e0d4033d78ed4c9f521f56 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
src/plugins/qmltooling/packetprotocol/qpacketprotocol.cpp
src/qml/compiler/qv4codegen.cpp
tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp
Change-Id: I010505326d76ee728ffe5fbd4c7879f28adadb12
Diffstat (limited to 'tests/auto/qml/debugger/shared')
| -rw-r--r-- | tests/auto/qml/debugger/shared/qqmldebugprocess.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/qml/debugger/shared/qqmldebugprocess.cpp b/tests/auto/qml/debugger/shared/qqmldebugprocess.cpp index 0005477075..6f74edf863 100644 --- a/tests/auto/qml/debugger/shared/qqmldebugprocess.cpp +++ b/tests/auto/qml/debugger/shared/qqmldebugprocess.cpp @@ -41,7 +41,6 @@ QQmlDebugProcess::QQmlDebugProcess(const QString &executable, QObject *parent) , m_receivedBindErrors(0) { m_process.setProcessChannelMode(QProcess::MergedChannels); - m_timer.setSingleShot(true); m_timer.setInterval(15000); connect(&m_process, &QProcess::readyReadStandardOutput, this, &QQmlDebugProcess::processAppOutput); @@ -128,7 +127,6 @@ 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() |