diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2012-10-23 14:11:18 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-23 15:29:46 +0200 |
| commit | dae4efc4e5157cf39ca5a2b2e5a3eebb2827069e (patch) | |
| tree | 6a18bd3bee7a9770e1035f975bcb965304f2277b /tests/auto/qml/debugger/shared | |
| parent | 020dc5e140e0239868135f181267aaa449202b89 (diff) | |
Allow QQmlDebugProcess to be child of other qobjects.
Some tests when failing would leave the process running.
For example on my machine tst_qqmlinspector would hang and
restarting it would not work because the before started process was
still blocking the port.
Change-Id: I32dfb4874b18d7dcf34d0f40819b17dedd794ff3
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'tests/auto/qml/debugger/shared')
| -rw-r--r-- | tests/auto/qml/debugger/shared/debugutil.cpp | 5 | ||||
| -rw-r--r-- | tests/auto/qml/debugger/shared/debugutil_p.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/qml/debugger/shared/debugutil.cpp b/tests/auto/qml/debugger/shared/debugutil.cpp index f1700c8fa0..df8042ca11 100644 --- a/tests/auto/qml/debugger/shared/debugutil.cpp +++ b/tests/auto/qml/debugger/shared/debugutil.cpp @@ -83,8 +83,9 @@ void QQmlDebugTestClient::messageReceived(const QByteArray &ba) emit serverMessage(ba); } -QQmlDebugProcess::QQmlDebugProcess(const QString &executable) - : m_executable(executable) +QQmlDebugProcess::QQmlDebugProcess(const QString &executable, QObject *parent) + : QObject(parent) + , m_executable(executable) , m_started(false) { m_process.setProcessChannelMode(QProcess::MergedChannels); diff --git a/tests/auto/qml/debugger/shared/debugutil_p.h b/tests/auto/qml/debugger/shared/debugutil_p.h index e5e8878996..0791d05205 100644 --- a/tests/auto/qml/debugger/shared/debugutil_p.h +++ b/tests/auto/qml/debugger/shared/debugutil_p.h @@ -84,7 +84,7 @@ class QQmlDebugProcess : public QObject { Q_OBJECT public: - QQmlDebugProcess(const QString &executable); + QQmlDebugProcess(const QString &executable, QObject *parent = 0); ~QQmlDebugProcess(); QString state(); |