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

Merge branch '2.2'

Browse Source 
Conflicts:
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.h
This commit is contained in:
Bill King
2011-04-05 16:43:24 +02:00
parent 8e5ab20898 fc05015226
commit 5e372a165f
67 changed files with 8640 additions and 4721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
View File

@@ -609,10 +609,12 @@ void S60CreatePackageStep::checkForCancel()
m_timer->stop();
if (m_process) {
m_process->terminate();
m_process->waitForFinished(5000);
m_process->kill();
m_process->waitForFinished(5000); //while waiting, the process can be killed
if (m_process)
m_process->kill();
}
m_eventLoop->exit(false);
if (m_eventLoop)
m_eventLoop->exit(false);
}
}