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

Meson: Fix compile for gcc 5.3

Browse Source 
Amends 77d7bb5014.

Change-Id: I8aca3c3a95890ec794a8f0f5cadbc6d726559f49
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Christian Stenger
2020-06-09 07:56:39 +02:00
parent 059c8edf21
commit f1b7fd81f5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/mesonprojectmanager/exewrappers/ninjawrapper.h
View File

@@ -37,7 +37,7 @@ public:
{ {
return ToolWrapper::findTool({"ninja", "ninja-build"}); return ToolWrapper::findTool({"ninja", "ninja-build"});
} }
static inline QString toolName() { return "Ninja"; }; static inline QString toolName() { return {"Ninja"}; };
}; };
template<> template<>

6
src/plugins/mesonprojectmanager/kithelper/kithelper.h
View File

@@ -42,13 +42,13 @@ inline QString expand(const ProjectExplorer::Kit *kit, const QString &macro)
inline QString cCompilerPath(const ProjectExplorer::Kit *kit) inline QString cCompilerPath(const ProjectExplorer::Kit *kit)
{ {
QTC_ASSERT(kit, return ""); QTC_ASSERT(kit, return {});
return details::expand(kit, "%{Compiler:Executable:C}"); return details::expand(kit, "%{Compiler:Executable:C}");
} }
inline QString cxxCompilerPath(const ProjectExplorer::Kit *kit) inline QString cxxCompilerPath(const ProjectExplorer::Kit *kit)
{ {
QTC_ASSERT(kit, return ""); QTC_ASSERT(kit, return {});
return details::expand(kit, "%{Compiler:Executable:Cxx}"); 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) inline QString qtVersion(const ProjectExplorer::Kit *kit)
{ {
QTC_ASSERT(kit, return ""); QTC_ASSERT(kit, return {});
return details::expand(kit, "%{Qt:Version}"); return details::expand(kit, "%{Qt:Version}");
} }