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

Fix crash when running a qmlproject

Browse Source 
A qmlproject does not have an activeBuildConfiguration.

Change-Id: Ia36137e88144789779f0c89c1b0f29c8441d088b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Thomas Hartmann
2020-01-07 16:54:17 +01:00
parent 60a1acc0cf
commit ff61ed69d3
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/projectexplorer/buildmanager.cpp
View File

@@ -327,7 +327,8 @@ BuildForRunConfigStatus BuildManager::potentiallyBuildForRunConfig(RunConfigurat
if (!isBuilding()) { if (!isBuilding()) {
switch (settings.buildBeforeDeploy) { switch (settings.buildBeforeDeploy) {
case BuildBeforeRunMode::AppOnly: case BuildBeforeRunMode::AppOnly:
rc->target()->activeBuildConfiguration()->restrictNextBuild(rc); if (rc->target()->activeBuildConfiguration())
rc->target()->activeBuildConfiguration()->restrictNextBuild(rc);
Q_FALLTHROUGH(); Q_FALLTHROUGH();
case BuildBeforeRunMode::WholeProject: case BuildBeforeRunMode::WholeProject:
stepIds << Id(Constants::BUILDSTEPS_BUILD); stepIds << Id(Constants::BUILDSTEPS_BUILD);
@@ -342,7 +343,8 @@ BuildForRunConfigStatus BuildManager::potentiallyBuildForRunConfig(RunConfigurat
Project * const pro = rc->target()->project(); Project * const pro = rc->target()->project();
int queueCount = queue(SessionManager::projectOrder(pro), stepIds, rc); int queueCount = queue(SessionManager::projectOrder(pro), stepIds, rc);
rc->target()->activeBuildConfiguration()->restrictNextBuild(nullptr); if (rc->target()->activeBuildConfiguration())
rc->target()->activeBuildConfiguration()->restrictNextBuild(nullptr);
if (queueCount < 0) if (queueCount < 0)
return BuildForRunConfigStatus::BuildFailed; return BuildForRunConfigStatus::BuildFailed;