diff options
author | Kai Koehne <kai.koehne@nokia.com> | 2011-11-17 12:24:50 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-17 18:08:50 +0100 |
commit | c887b0e84674378c26b85da292bdee54536056b7 (patch) | |
tree | 01e104666fb86e1875356718d3ca6160fcf2764a /tests/auto/declarative/debugger/shared | |
parent | b36bbe3626bc68ac267d7653fa6408a8f258251d (diff) |
Debugger: Fix warnings about QProcess still running in autotest
Change-Id: Ib0c68629cfe430a0d13b1504f86bfa78e85007b4
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Diffstat (limited to 'tests/auto/declarative/debugger/shared')
-rw-r--r-- | tests/auto/declarative/debugger/shared/debugutil.cpp | 2 | ||||
-rw-r--r-- | tests/auto/declarative/debugger/shared/debugutil_p.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/declarative/debugger/shared/debugutil.cpp b/tests/auto/declarative/debugger/shared/debugutil.cpp index 5abafd2111..7af3d0f68f 100644 --- a/tests/auto/declarative/debugger/shared/debugutil.cpp +++ b/tests/auto/declarative/debugger/shared/debugutil.cpp @@ -131,7 +131,7 @@ void QDeclarativeDebugProcess::start(const QStringList &arguments) void QDeclarativeDebugProcess::stop() { if (m_process.state() != QProcess::NotRunning) { - m_process.terminate(); + m_process.kill(); m_process.waitForFinished(5000); } } diff --git a/tests/auto/declarative/debugger/shared/debugutil_p.h b/tests/auto/declarative/debugger/shared/debugutil_p.h index 24b7e252cb..d24d2d949f 100644 --- a/tests/auto/declarative/debugger/shared/debugutil_p.h +++ b/tests/auto/declarative/debugger/shared/debugutil_p.h @@ -102,14 +102,12 @@ public: bool waitForSessionStart(); QString output() const; + void stop(); private slots: void processAppOutput(); private: - void stop(); - -private: QString m_executable; QProcess m_process; QString m_outputBuffer; |