feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Maemo: Fix deployment signal handling.

Browse Source
This commit is contained in:
Christian Kandeler
2011-01-17 11:59:50 +01:00
parent e601b3c7cb
commit d2a9631206
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
View File

@@ -509,6 +509,7 @@ void MaemoDeployStep::handleMountError(const QString &errorMsg)
case UnmountingOldDirs: case UnmountingOldDirs:
case UnmountingCurrentDirs: case UnmountingCurrentDirs:
case UnmountingCurrentMounts: case UnmountingCurrentMounts:
case Mounting:
case StopRequested: case StopRequested:
raiseError(errorMsg); raiseError(errorMsg);
setState(Inactive); setState(Inactive);
@@ -528,6 +529,7 @@ void MaemoDeployStep::handleMountDebugOutput(const QString &output)
case UnmountingOldDirs: case UnmountingOldDirs:
case UnmountingCurrentDirs: case UnmountingCurrentDirs:
case UnmountingCurrentMounts: case UnmountingCurrentMounts:
case Mounting:
case StopRequested: case StopRequested:
writeOutput(output, ErrorOutput); writeOutput(output, ErrorOutput);
break; break;
@@ -728,6 +730,7 @@ void MaemoDeployStep::handleProgressReport(const QString &progressMsg)
case UnmountingOldDirs: case UnmountingOldDirs:
case UnmountingCurrentDirs: case UnmountingCurrentDirs:
case UnmountingCurrentMounts: case UnmountingCurrentMounts:
case Mounting:
case StopRequested: case StopRequested:
writeOutput(progressMsg); writeOutput(progressMsg);
break; break;

1
src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp
View File

@@ -57,6 +57,7 @@ MaemoRemoteMounter::MaemoRemoteMounter(QObject *parent)
{ {
connect(m_utfsServerTimer, SIGNAL(timeout()), this, connect(m_utfsServerTimer, SIGNAL(timeout()), this,
SLOT(handleUtfsServerTimeout())); SLOT(handleUtfsServerTimeout()));
m_utfsServerTimer->setSingleShot(true);
} }
MaemoRemoteMounter::~MaemoRemoteMounter() MaemoRemoteMounter::~MaemoRemoteMounter()