From d2a963120609f49bb7756f7f53d798f856d4cbf1 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Mon, 17 Jan 2011 11:59:50 +0100
Subject: [PATCH] Maemo: Fix deployment signal handling.
---
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp | 3 +++
src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp | 1 +
2 files changed, 4 insertions(+)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
index d227fc03dd5..104ce44bace 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
@@ -509,6 +509,7 @@ void MaemoDeployStep::handleMountError(const QString &errorMsg)
case UnmountingOldDirs:
case UnmountingCurrentDirs:
case UnmountingCurrentMounts:
+ case Mounting:
case StopRequested:
raiseError(errorMsg);
setState(Inactive);
@@ -528,6 +529,7 @@ void MaemoDeployStep::handleMountDebugOutput(const QString &output)
case UnmountingOldDirs:
case UnmountingCurrentDirs:
case UnmountingCurrentMounts:
+ case Mounting:
case StopRequested:
writeOutput(output, ErrorOutput);
break;
@@ -728,6 +730,7 @@ void MaemoDeployStep::handleProgressReport(const QString &progressMsg)
case UnmountingOldDirs:
case UnmountingCurrentDirs:
case UnmountingCurrentMounts:
+ case Mounting:
case StopRequested:
writeOutput(progressMsg);
break;
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
index 3c0d032acd1..620c5893bb7 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
@@ -57,6 +57,7 @@ MaemoRemoteMounter::MaemoRemoteMounter(QObject *parent)
{
connect(m_utfsServerTimer, SIGNAL(timeout()), this,
SLOT(handleUtfsServerTimeout()));
+ m_utfsServerTimer->setSingleShot(true);
}
MaemoRemoteMounter::~MaemoRemoteMounter()
--
GitLab