diff options
| -rw-r--r-- | libqsystemtest/qsystemtest.cpp | 19 | ||||
| -rw-r--r-- | libqtslave/libqtslave.pro | 5 |
2 files changed, 24 insertions, 0 deletions
diff --git a/libqsystemtest/qsystemtest.cpp b/libqsystemtest/qsystemtest.cpp index 76d9f87..945a6b2 100644 --- a/libqsystemtest/qsystemtest.cpp +++ b/libqsystemtest/qsystemtest.cpp @@ -281,6 +281,25 @@ QSystemTest::~QSystemTest() delete proc; } } + // ensure that we stop any running remote applications + if (runsOnDevice()){ + QProcess proc; + while (m_remote_aut.count()) { + QStringList args; + QString aut = m_remote_aut.takeFirst(); + args << aut; + qWarning(QString("Stopping remote process %1").arg(aut).toLatin1().constData()); + static QByteArray stopProcess = qgetenv("QTUITEST_STOP_PROCESS"); + if (stopProcess.isEmpty()) { + fail(QString("Could not stop remote process '%1', QTUITEST_STOP_PROCESS not defined.").arg(aut)); + } + proc.start(stopProcess, args); + if (!proc.waitForFinished(10000)) { + proc.kill(); + proc.waitForFinished(5000); + } + } + } delete device_control; delete event_timer; diff --git a/libqtslave/libqtslave.pro b/libqtslave/libqtslave.pro index d06cdb2..c44e34d 100644 --- a/libqtslave/libqtslave.pro +++ b/libqtslave/libqtslave.pro @@ -29,6 +29,11 @@ unix:!symbian { INSTALLS+=target } +linux-g++-maemo*:{ + message(Maemo platform detected enabling define Q_OS_MAEMO) + DEFINES += Q_OS_MAEMO +} + symbian { TARGET.EPOCALLOWDLLDATA=1 TARGET.CAPABILITY += AllFiles ReadDeviceData ReadUserData SwEvent WriteUserData NetworkServices |