From 9d7021d42c9d897f0de4e85b9e33a8a0cfc6af86 Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Tue, 10 Aug 2010 16:26:41 +0200
Subject: [PATCH] Maemo: Progress report also for debugging.

---
 .../qt4projectmanager/qt-maemo/maemodebugsupport.cpp     | 9 ++++++++-
 .../qt4projectmanager/qt-maemo/maemodebugsupport.h       | 1 +
 .../qt4projectmanager/qt-maemo/maemoremotemounter.cpp    | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
index 4420bb635c1..36250176fdf 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.cpp
@@ -134,6 +134,8 @@ void MaemoDebugSupport::handleAdapterSetupRequested()
         SLOT(handleSshError(QString)));
     connect(m_runner, SIGNAL(readyForExecution()), this,
         SLOT(startExecution()));
+    connect(m_runner, SIGNAL(reportProgress(QString)), this,
+        SLOT(handleProgressReport(QString)));
     m_runner->start();
 }
 
@@ -256,9 +258,14 @@ void MaemoDebugSupport::handleRemoteErrorOutput(const QByteArray &output)
     m_runControl->showMessage(QString::fromUtf8(output), AppOutput);
 }
 
+void MaemoDebugSupport::handleProgressReport(const QString &progressOutput)
+{
+    m_runControl->showMessage(progressOutput, AppStuff);
+}
+
 void MaemoDebugSupport::stopSsh()
 {
-    disconnect(m_runner, 0, this, 0);
+    //disconnect(m_runner, 0, this, 0);
     if (m_uploader) {
         disconnect(m_uploader.data(), 0, this, 0);
         m_uploader->closeChannel();
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.h b/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.h
index d2b79b104bc..8607c18e481 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.h
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodebugsupport.h
@@ -84,6 +84,7 @@ private slots:
     void handleDebuggingFinished();
     void handleRemoteOutput(const QByteArray &output);
     void handleRemoteErrorOutput(const QByteArray &output);
+    void handleProgressReport(const QString &progressOutput);
 
 private:
     void stopSsh();
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
index 210a6723eab..cdccaa2dbc7 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
@@ -129,6 +129,7 @@ void MaemoRemoteMounter::handleUnmountProcessFinished(int exitStatus)
     m_mountSpecs.clear();
 
     if (errorMsg.isEmpty()) {
+        emit reportProgress(tr("Finished unmounting."));
         emit unmounted();
     } else {
         if (!m_umountStderr.isEmpty()) {