From ea5aa79dca1fc77ee6d8dc8c26e5362e72503ef8 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Wed, 26 Jun 2013 18:18:25 +0200 Subject: [PATCH 1/2] AndroidPackageCreationStep: Ensure right thread for handleOutput() 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 Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/plugins/android/androidpackagecreationstep.cpp | 4 ++-- 1 file 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()); From 7724bd467388f6ae3b8a4cbc8609f535a94a03f1 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Wed, 26 Jun 2013 16:18:34 +0200 Subject: [PATCH 2/2] Checkout correct branch of the binary-artifacts repository. Change-Id: I66e27b54b59874f5f69958cf9e178a5ce1b2da97 Reviewed-by: Eike Ziller --- qtcreator.pri | 1 + qtcreator.pro | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/qtcreator.pri b/qtcreator.pri index afd46883dca..13e25dca4df 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -2,6 +2,7 @@ QTCREATOR_PRI_INCLUDED = 1 QTCREATOR_VERSION = 2.7.2 +BINARY_ARTIFACTS_BRANCH = 2.7 isEqual(QT_MAJOR_VERSION, 5) { diff --git a/qtcreator.pro b/qtcreator.pro index 0836cf0685e..84d8a9d91b3 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -66,7 +66,7 @@ macx { deployqt.depends = install win32 { deployartifacts.depends = install - deployartifacts.commands = git clone "git://gitorious.org/qt-creator/binary-artifacts.git"&& xcopy /s /q /y /i "binary-artifacts\\win32" \"$(INSTALL_ROOT)$$QTC_PREFIX\"&& rmdir /s /q binary-artifacts + deployartifacts.commands = git clone "git://gitorious.org/qt-creator/binary-artifacts.git" -b $$BINARY_ARTIFACTS_BRANCH&& xcopy /s /q /y /i "binary-artifacts\\win32" \"$(INSTALL_ROOT)$$QTC_PREFIX\"&& rmdir /s /q binary-artifacts QMAKE_EXTRA_TARGETS += deployartifacts } }