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

ProjectExplorer: Fix assert in MakeStep

Browse Source 
... when it's part of a deploy configuration.

Change-Id: I56340ea5553a267daa04b5fd89aff382ec1d27cd
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2020-10-29 16:34:32 +01:00
parent 77b91fd4a9
commit ee96c2d9fc
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/buildstep.cpp
View File

@@ -247,7 +247,9 @@ BuildSystem *BuildStep::buildSystem() const
Environment BuildStep::buildEnvironment() const Environment BuildStep::buildEnvironment() const
{ {
if (auto bc = buildConfiguration()) if (const auto bc = qobject_cast<BuildConfiguration *>(parent()->parent()))
return bc->environment();
if (const auto bc = target()->activeBuildConfiguration())
return bc->environment(); return bc->environment();
return Environment::systemEnvironment(); return Environment::systemEnvironment();
} }

3
src/plugins/projectexplorer/makestep.cpp
View File

@@ -183,9 +183,6 @@ static const QList<ToolChain *> preferredToolChains(const Kit *kit)
FilePath MakeStep::defaultMakeCommand() const FilePath MakeStep::defaultMakeCommand() const
{ {
BuildConfiguration *bc = buildConfiguration();
if (!bc)
return {};
const Utils::Environment env = makeEnvironment(); const Utils::Environment env = makeEnvironment();
for (const ToolChain *tc : preferredToolChains(kit())) { for (const ToolChain *tc : preferredToolChains(kit())) {
FilePath make = tc->makeCommand(env); FilePath make = tc->makeCommand(env);