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

QbsProjectManager: Fix race condition on target switch

Browse Source 
Fixes: QTCREATORBUG-21544
Change-Id: I2a29e17ad1fd37049db16634f16e8c6916cb1093
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Christian Kandeler
2018-11-28 13:38:11 +01:00
parent ee564b2249
commit 77c729bb8a
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -1126,6 +1126,8 @@ void QbsProject::updateApplicationTargets()
bti.usesTerminal = usesTerminal; bti.usesTerminal = usesTerminal;
bti.displayName = productData.fullDisplayName(); bti.displayName = productData.fullDisplayName();
bti.runEnvModifier = [targetFile, productData, this](Utils::Environment &env, bool usingLibraryPaths) { bti.runEnvModifier = [targetFile, productData, this](Utils::Environment &env, bool usingLibraryPaths) {
if (!qbsProject().isValid())
return;
QProcessEnvironment procEnv = env.toProcessEnvironment(); QProcessEnvironment procEnv = env.toProcessEnvironment();
procEnv.insert(QLatin1String("QBS_RUN_FILE_PATH"), targetFile); procEnv.insert(QLatin1String("QBS_RUN_FILE_PATH"), targetFile);
QStringList setupRunEnvConfig; QStringList setupRunEnvConfig;