diff options
author | Daniel Teske <[email protected]> | 2013-06-26 18:18:25 +0200 |
---|---|---|
committer | Daniel Teske <[email protected]> | 2013-06-27 11:17:45 +0200 |
commit | ea5aa79dca1fc77ee6d8dc8c26e5362e72503ef8 (patch) | |
tree | c6fd0c9d8a9bb508c903494dc24ed170f73df906 | |
parent | c219a5b5142752fab50fe761e815959cc16fabe1 (diff) |
AndroidPackageCreationStep: Ensure right thread for handleOutput()v2.7.2tqtc/v2.7.2
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 <[email protected]>
Reviewed-by: Eskil Abrahamsen Blomfeldt <[email protected]>
-rw-r--r-- | src/plugins/android/androidpackagecreationstep.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/android/androidpackagecreationstep.cpp b/src/plugins/android/androidpackagecreationstep.cpp index 5f80db9cd80..c187dc2c007 100644 --- a/src/plugins/android/androidpackagecreationstep.cpp +++ b/src/plugins/android/androidpackagecreationstep.cpp @@ -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()); |