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

Maemo: Make sure deploying stops when build step thread finishes.

Browse Source 
This is important for the "canceled" case and doesn't hurt otherwise.
This commit is contained in:
ck
2010-07-14 08:33:17 +02:00
parent 3fe09f81bb
commit d0cbac9032
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,6 +88,7 @@ void MaemoDeployStep::run(QFutureInterface<bool> &fi)
QTimer::singleShot(0, this, SLOT(start()));
MaemoDeployEventHandler eventHandler(this, fi);
connect (&eventHandler, SIGNAL(destroyed()), this, SLOT(stop()));
}
BuildStepConfigWidget *MaemoDeployStep::createConfigWidget()
@@ -176,8 +177,8 @@ void MaemoDeployStep::stop()
} else if (!m_uploadsInProgress.isEmpty() || !m_linksInProgress.isEmpty()) {
m_uploadsInProgress.clear();
m_linksInProgress.clear();
m_uploader->closeChannel();
disconnect(m_uploader.data(), 0, this, 0);
m_uploader->closeChannel();
}
if (m_connection)
disconnect(m_connection.data(), 0, this, 0);