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

AndroidPackageCreationStep: Ensure right thread for handleOutput()

Browse Source 
The ::run method is run in a separate thread, yet the owner of the
buildstep is the gui thread. As such we need to use a DirectConnection
to ensure that the slot is called in the right thread.

Task-number: QTCREATORBUG-9660
Change-Id: Ia206f3256a23f70f50d31c739359ff24b952fe46
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
This commit is contained in:
Daniel Teske
2013-06-26 18:18:25 +02:00
parent c219a5b514
commit ea5aa79dca
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androidpackagecreationstep.cpp
View File

@@ -706,9 +706,9 @@ bool AndroidPackageCreationStep::createPackage()
buildProc->setProcessEnvironment(m_environment.toProcessEnvironment());
connect(buildProc, SIGNAL(readyReadStandardOutput()), this,
SLOT(handleBuildStdOutOutput()));
SLOT(handleBuildStdOutOutput()), Qt::DirectConnection);
connect(buildProc, SIGNAL(readyReadStandardError()), this,
SLOT(handleBuildStdErrOutput()));
SLOT(handleBuildStdErrOutput()), Qt::DirectConnection);
buildProc->setWorkingDirectory(m_androidDir.toString());