diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2019-01-29 14:48:26 +0100 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2019-01-30 06:55:11 +0000 |
| commit | ba00dbbe223e08558421e1754d7ba3abe8cc6b77 (patch) | |
| tree | 373d9d816379bb678546d59ee51505ddb17ebccd | |
| parent | e109ff6e5fadb0044ea54e3da210f34e6ff9ffb6 (diff) | |
| download | qt-creator-ba00dbbe223e08558421e1754d7ba3abe8cc6b77.tar.gz | |
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 <joerg.bornemann@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | src/plugins/winrt/winrtpackagedeploymentstep.cpp | 4 |
1 files 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<const BuildStep *> &earlierSteps) void WinRtPackageDeploymentStep::run(QFutureInterface<bool> &fi) { - AbstractProcessStep::run(fi); - const QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(target()->kit()); if (!qt) return; @@ -137,6 +135,8 @@ void WinRtPackageDeploymentStep::run(QFutureInterface<bool> &fi) } } } + + AbstractProcessStep::run(fi); } bool WinRtPackageDeploymentStep::processSucceeded(int exitCode, QProcess::ExitStatus status) |