From f1b7fd81f5112f8014440bcf6ca13f2e6773d262 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 9 Jun 2020 07:56:39 +0200 Subject: [PATCH] Meson: Fix compile for gcc 5.3 Amends 77d7bb5014a79d. Change-Id: I8aca3c3a95890ec794a8f0f5cadbc6d726559f49 Reviewed-by: Orgad Shaneh --- src/plugins/mesonprojectmanager/exewrappers/ninjawrapper.h | 2 +- src/plugins/mesonprojectmanager/kithelper/kithelper.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/mesonprojectmanager/exewrappers/ninjawrapper.h b/src/plugins/mesonprojectmanager/exewrappers/ninjawrapper.h index 85f64765871..8566f275239 100644 --- a/src/plugins/mesonprojectmanager/exewrappers/ninjawrapper.h +++ b/src/plugins/mesonprojectmanager/exewrappers/ninjawrapper.h @@ -37,7 +37,7 @@ public: { return ToolWrapper::findTool({"ninja", "ninja-build"}); } - static inline QString toolName() { return "Ninja"; }; + static inline QString toolName() { return {"Ninja"}; }; }; template<> diff --git a/src/plugins/mesonprojectmanager/kithelper/kithelper.h b/src/plugins/mesonprojectmanager/kithelper/kithelper.h index 9f0f8295e36..02abb83f7f7 100644 --- a/src/plugins/mesonprojectmanager/kithelper/kithelper.h +++ b/src/plugins/mesonprojectmanager/kithelper/kithelper.h @@ -42,13 +42,13 @@ inline QString expand(const ProjectExplorer::Kit *kit, const QString ¯o) inline QString cCompilerPath(const ProjectExplorer::Kit *kit) { - QTC_ASSERT(kit, return ""); + QTC_ASSERT(kit, return {}); return details::expand(kit, "%{Compiler:Executable:C}"); } inline QString cxxCompilerPath(const ProjectExplorer::Kit *kit) { - QTC_ASSERT(kit, return ""); + QTC_ASSERT(kit, return {}); return details::expand(kit, "%{Compiler:Executable:Cxx}"); } @@ -64,7 +64,7 @@ inline QString cmakePath(const ProjectExplorer::Kit *kit) inline QString qtVersion(const ProjectExplorer::Kit *kit) { - QTC_ASSERT(kit, return ""); + QTC_ASSERT(kit, return {}); return details::expand(kit, "%{Qt:Version}"); }