diff options
author | Christian Stenger <christian.stenger@qt.io> | 2020-06-09 07:56:39 +0200 |
---|---|---|
committer | Christian Stenger <christian.stenger@qt.io> | 2020-06-09 06:05:06 +0000 |
commit | f1b7fd81f5112f8014440bcf6ca13f2e6773d262 (patch) | |
tree | 6ae86b56f755757383205df123b5bf81f4c87283 /src/plugins/mesonprojectmanager | |
parent | 059c8edf214a66548903c53fe476f45f6e497929 (diff) |
Meson: Fix compile for gcc 5.3
Amends 77d7bb5014a79d.
Change-Id: I8aca3c3a95890ec794a8f0f5cadbc6d726559f49
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/mesonprojectmanager')
-rw-r--r-- | src/plugins/mesonprojectmanager/exewrappers/ninjawrapper.h | 2 | ||||
-rw-r--r-- | 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 85f6476587..8566f27523 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 9f0f8295e3..02abb83f7f 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}"); } |