From ba00dbbe223e08558421e1754d7ba3abe8cc6b77 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Tue, 29 Jan 2019 14:48:26 +0100 Subject: winrt: Fix potential race condition when filling mapping file content Before starting the process step asynchronously, we have to make sure that m_mappingFileContent is initialized properly. Change-Id: I5a2b51319a35bfe397cff994d5f3512f8d76ccf0 Reviewed-by: Joerg Bornemann Reviewed-by: Christian Kandeler --- src/plugins/winrt/winrtpackagedeploymentstep.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/winrt/winrtpackagedeploymentstep.cpp b/src/plugins/winrt/winrtpackagedeploymentstep.cpp index 177d114cab..23104a4a85 100644 --- a/src/plugins/winrt/winrtpackagedeploymentstep.cpp +++ b/src/plugins/winrt/winrtpackagedeploymentstep.cpp @@ -109,8 +109,6 @@ bool WinRtPackageDeploymentStep::init(QList &earlierSteps) void WinRtPackageDeploymentStep::run(QFutureInterface &fi) { - AbstractProcessStep::run(fi); - const QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(target()->kit()); if (!qt) return; @@ -137,6 +135,8 @@ void WinRtPackageDeploymentStep::run(QFutureInterface &fi) } } } + + AbstractProcessStep::run(fi); } bool WinRtPackageDeploymentStep::processSucceeded(int exitCode, QProcess::ExitStatus status) -- cgit v1.2.1