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

Meson: Hopefully final build fix for older GCC

Browse Source 
Amends 77d7bb5014.

Change-Id: I94df369cd8aae7d978ede631103199a3a7cb5b26
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Eike Ziller
2020-06-10 16:17:28 +02:00
committed by Christian Stenger
parent 26121da90c
commit 5fcbc55c2c
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/mesonprojectmanager/project/mesonprojectparser.cpp
View File

@@ -144,7 +144,8 @@ bool MesonProjectParser::configure(const Utils::FilePath &sourcePath,
auto cmd = MesonTools::mesonWrapper(m_meson)->configure(sourcePath, buildPath, args); auto cmd = MesonTools::mesonWrapper(m_meson)->configure(sourcePath, buildPath, args);
// see comment near m_pendingCommands declaration // see comment near m_pendingCommands declaration
m_pendingCommands.enqueue( m_pendingCommands.enqueue(
{MesonTools::mesonWrapper(m_meson)->regenerate(sourcePath, buildPath), false}); std::make_tuple(MesonTools::mesonWrapper(m_meson)->regenerate(sourcePath, buildPath),
false));
return m_process.run(cmd, m_env, m_projectName); return m_process.run(cmd, m_env, m_projectName);
} }

6
src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp
View File

@@ -118,10 +118,10 @@ QString NinjaBuildStep::defaultBuildTarget() const
QTC_ASSERT(bsl, return {}); QTC_ASSERT(bsl, return {});
const Core::Id parentId = bsl->id(); const Core::Id parentId = bsl->id();
if (parentId == ProjectExplorer::Constants::BUILDSTEPS_CLEAN) if (parentId == ProjectExplorer::Constants::BUILDSTEPS_CLEAN)
return Constants::Targets::clean; return {Constants::Targets::clean};
if (parentId == ProjectExplorer::Constants::BUILDSTEPS_DEPLOY) if (parentId == ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)
return Constants::Targets::install; return {Constants::Targets::install};
return Constants::Targets::all; return {Constants::Targets::all};
} }
void NinjaBuildStep::doRun() void NinjaBuildStep::doRun()