Merge remote branch 'origin/2.1'

2011-01-05 10:42:01 +01:00
parent c44b642a72 8d7d17dc78
commit 11fc831598
8 changed files with 124 additions and 70 deletions
--- a/src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.cpp
@@ -131,6 +131,11 @@ void MaemoSshRunner::stop()
    if (m_state == PostRunCleaning || m_state == StopRequested
        || m_state == Inactive)
        return;
+    if (m_state == Connecting) {
+        setState(Inactive);
+        emit remoteProcessFinished(InvalidExitCode);
+        return;
+    }

    setState(StopRequested);
    cleanup();