feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

winrt: Fix potential race condition when filling mapping file content

Browse Source 
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>
This commit is contained in:
Oliver Wolff
2019-01-29 14:48:26 +01:00
parent e109ff6e5f
commit ba00dbbe22
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/winrt/winrtpackagedeploymentstep.cpp
View File

@@ -109,8 +109,6 @@ bool WinRtPackageDeploymentStep::init(QList<const BuildStep *> &earlierSteps)
void WinRtPackageDeploymentStep::run(QFutureInterface<bool> &fi) void WinRtPackageDeploymentStep::run(QFutureInterface<bool> &fi)
{ {
AbstractProcessStep::run(fi);
const QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(target()->kit()); const QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(target()->kit());
if (!qt) if (!qt)
return; return;
@@ -137,6 +135,8 @@ void WinRtPackageDeploymentStep::run(QFutureInterface<bool> &fi)
} }
} }
} }
AbstractProcessStep::run(fi);
} }
bool WinRtPackageDeploymentStep::processSucceeded(int exitCode, QProcess::ExitStatus status) bool WinRtPackageDeploymentStep::processSucceeded(int exitCode, QProcess::ExitStatus status)