diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-07-03 16:53:25 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-07-03 16:53:25 +0200 |
| commit | b05603a44d67d1cfa080a16ae774485d26152f4f (patch) | |
| tree | 7ecee36d5e79b657b52385d463f1906c7aa71a9f /src | |
| parent | fbdbd11aa3b5af5d3c966571ba3e44f1587c3b77 (diff) | |
| parent | 7724bd467388f6ae3b8a4cbc8609f535a94a03f1 (diff) | |
| download | qt-creator-b05603a44d67d1cfa080a16ae774485d26152f4f.tar.gz | |
Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts:
qtcreator.pri
Change-Id: I6726277830ddbd3b21391b5c5e48880929a2d725
Diffstat (limited to 'src')
| -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 0030bb78b8..1a2484f79b 100644 --- a/src/plugins/android/androidpackagecreationstep.cpp +++ b/src/plugins/android/androidpackagecreationstep.cpp @@ -690,9 +690,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()); |