aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/mesonprojectmanager
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2020-06-10 16:17:28 +0200
committerChristian Stenger <christian.stenger@qt.io>2020-06-10 19:36:03 +0000
commit5fcbc55c2cea7133e7b21649e44cff53d65fd048 (patch)
tree57f281c57204d941d7eb45ca80236f40744c4bd9 /src/plugins/mesonprojectmanager
parent26121da90cbf1f0555cd708fa39d3e8e46d357e1 (diff)
Meson: Hopefully final build fix for older GCC
Amends 77d7bb5014a79d. Change-Id: I94df369cd8aae7d978ede631103199a3a7cb5b26 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/mesonprojectmanager')
-rw-r--r--src/plugins/mesonprojectmanager/project/mesonprojectparser.cpp3
-rw-r--r--src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp6
2 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/mesonprojectmanager/project/mesonprojectparser.cpp b/src/plugins/mesonprojectmanager/project/mesonprojectparser.cpp
index a084e337b7..3c841ae37a 100644
--- a/src/plugins/mesonprojectmanager/project/mesonprojectparser.cpp
+++ b/src/plugins/mesonprojectmanager/project/mesonprojectparser.cpp
@@ -144,7 +144,8 @@ bool MesonProjectParser::configure(const Utils::FilePath &sourcePath,
auto cmd = MesonTools::mesonWrapper(m_meson)->configure(sourcePath, buildPath, args);
// see comment near m_pendingCommands declaration
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);
}
diff --git a/src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp b/src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp
index 3a1473d4b2..5e701277dc 100644
--- a/src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp
+++ b/src/plugins/mesonprojectmanager/project/ninjabuildstep.cpp
@@ -118,10 +118,10 @@ QString NinjaBuildStep::defaultBuildTarget() const
QTC_ASSERT(bsl, return {});
const Core::Id parentId = bsl->id();
if (parentId == ProjectExplorer::Constants::BUILDSTEPS_CLEAN)
- return Constants::Targets::clean;
+ return {Constants::Targets::clean};
if (parentId == ProjectExplorer::Constants::BUILDSTEPS_DEPLOY)
- return Constants::Targets::install;
- return Constants::Targets::all;
+ return {Constants::Targets::install};
+ return {Constants::Targets::all};
}
void NinjaBuildStep::doRun()