summaryrefslogtreecommitdiff
path: root/src/plugins/madde/maddedevicetester.cpp
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@nokia.com>2011-11-30 14:39:17 +0100
committerChristian Kandeler <christian.kandeler@nokia.com>2011-12-05 12:54:37 +0100
commit51511a3c591617f984f36f1e88304bb0af0d0407 (patch)
tree3e6d1a12c37b2b38217c37c513947a03c9a9d483 /src/plugins/madde/maddedevicetester.cpp
parent5ff9d60433a6d7c09af01a297f12ab8d33a34f72 (diff)
downloadqt-creator-51511a3c591617f984f36f1e88304bb0af0d0407.tar.gz
SSH: Don't expose SshRemoteProcess object from SshRemoteProcessRunner.
It's part of the internal state. Change-Id: I2670be2d55c791435bd286150f4b4097e8d92f6d Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Diffstat (limited to 'src/plugins/madde/maddedevicetester.cpp')
-rw-r--r--src/plugins/madde/maddedevicetester.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/madde/maddedevicetester.cpp b/src/plugins/madde/maddedevicetester.cpp
index 80090f07d6..0968f20695 100644
--- a/src/plugins/madde/maddedevicetester.cpp
+++ b/src/plugins/madde/maddedevicetester.cpp
@@ -89,7 +89,7 @@ void MaddeDeviceTester::stopTest()
case QtTest:
case MadDeveloperTest:
case QmlToolingTest:
- m_processRunner->process()->close();
+ m_processRunner->cancel();
break;
}
@@ -177,7 +177,7 @@ void MaddeDeviceTester::handleProcessFinished(int exitStatus)
void MaddeDeviceTester::handleQtTestFinished(int exitStatus)
{
if (exitStatus != SshRemoteProcess::ExitedNormally
- || m_processRunner->process()->exitCode() != 0) {
+ || m_processRunner->processExitCode() != 0) {
if (!m_stderr.isEmpty()) {
emit errorMessage(tr("Error checking for Qt libraries: %1\n")
.arg(QString::fromUtf8(m_stderr)));
@@ -209,7 +209,7 @@ void MaddeDeviceTester::handleMadDeveloperTestFinished(int exitStatus)
emit errorMessage(tr("Error checking for connectivity tool.\n"));
}
m_result = TestFailure;
- } else if (m_processRunner->process()->exitCode() != 0) {
+ } else if (m_processRunner->processExitCode() != 0) {
QString message = tr("Connectivity tool not installed on device. "
"Deployment currently not possible.");
if (m_deviceConfiguration->osType() == QLatin1String(HarmattanOsType)) {
@@ -247,7 +247,7 @@ void MaddeDeviceTester::handleQmlToolingTestFinished(int exitStatus)
emit errorMessage(tr("Error checking for QML tooling support.\n"));
}
m_result = TestFailure;
- } else if (m_processRunner->process()->exitCode() != 0) {
+ } else if (m_processRunner->processExitCode() != 0) {
emit errorMessage(tr("Missing directory '%1'. You will not be able to do "
"QML debugging on this device.\n").arg(QmlToolingDirectory));
m_result = TestFailure;