aboutsummaryrefslogtreecommitdiffstats
path: root/src/app/qbs-setup-toolchains/probe.cpp
diff options
context:
space:
mode:
authorDenis Shienkov <denis.shienkov@gmail.com>2019-02-26 14:38:54 +0300
committerDenis Shienkov <denis.shienkov@gmail.com>2019-02-26 15:52:26 +0000
commit4fd17d627106fde01284075038e15cc0680611bc (patch)
tree25c5b7e8ec774d362ad97e86d0ecd1d8527fbac5 /src/app/qbs-setup-toolchains/probe.cpp
parent0b8f0b771080e51a59664782ced6b3a1cc5111ca (diff)
Return initializer list where it is possible
This fixes this clang-tidy warning: warning: avoid repeating the return type from the declaration; use a braced initializer list instead [modernize-return-braced-init-list] Change-Id: I421e1e47462fe0e97788672684d47943af7df850 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/app/qbs-setup-toolchains/probe.cpp')
-rw-r--r--src/app/qbs-setup-toolchains/probe.cpp28
1 files changed, 13 insertions, 15 deletions
diff --git a/src/app/qbs-setup-toolchains/probe.cpp b/src/app/qbs-setup-toolchains/probe.cpp
index 9ae8eac94..e90bafec2 100644
--- a/src/app/qbs-setup-toolchains/probe.cpp
+++ b/src/app/qbs-setup-toolchains/probe.cpp
@@ -80,7 +80,7 @@ static QString findExecutable(const QString &fileName)
if (QFileInfo::exists(fullPath))
return QDir::cleanPath(fullPath);
}
- return QString();
+ return {};
}
static QString qsystem(const QString &exe, const QStringList &args = QStringList())
@@ -100,17 +100,16 @@ static QString qsystem(const QString &exe, const QStringList &args = QStringList
static QStringList validMinGWMachines()
{
// List of MinGW machine names (gcc -dumpmachine) recognized by Qbs
- return QStringList()
- << QStringLiteral("mingw32") << QStringLiteral("mingw64")
- << QStringLiteral("i686-w64-mingw32") << QStringLiteral("x86_64-w64-mingw32")
- << QStringLiteral("i686-w64-mingw32.shared") << QStringLiteral("x86_64-w64-mingw32.shared")
- << QStringLiteral("i686-w64-mingw32.static") << QStringLiteral("x86_64-w64-mingw32.static")
- << QStringLiteral("i586-mingw32msvc") << QStringLiteral("amd64-mingw32msvc");
+ return {QStringLiteral("mingw32"), QStringLiteral("mingw64"),
+ QStringLiteral("i686-w64-mingw32"), QStringLiteral("x86_64-w64-mingw32"),
+ QStringLiteral("i686-w64-mingw32.shared"), QStringLiteral("x86_64-w64-mingw32.shared"),
+ QStringLiteral("i686-w64-mingw32.static"), QStringLiteral("x86_64-w64-mingw32.static"),
+ QStringLiteral("i586-mingw32msvc"), QStringLiteral("amd64-mingw32msvc")};
}
static QStringList knownIarCompilerNames()
{
- return { QStringLiteral("icc8051"), QStringLiteral("iccarm"), QStringLiteral("iccavr") };
+ return {QStringLiteral("icc8051"), QStringLiteral("iccarm"), QStringLiteral("iccavr")};
}
static bool isIarCompiler(const QString &compilerName)
@@ -122,7 +121,7 @@ static bool isIarCompiler(const QString &compilerName)
static QStringList knownKeilCompilerNames()
{
- return { QStringLiteral("c51"), QStringLiteral("armcc") };
+ return {QStringLiteral("c51"), QStringLiteral("armcc")};
}
static bool isKeilCompiler(const QString &compilerName)
@@ -148,7 +147,7 @@ static QStringList toolchainTypeFromCompilerName(const QString &compilerName)
return canonicalToolchain(QStringLiteral("iar"));
if (isKeilCompiler(compilerName))
return canonicalToolchain(QStringLiteral("keil"));
- return QStringList();
+ return {};
}
static QString gccMachineName(const QString &compilerFilePath)
@@ -158,11 +157,10 @@ static QString gccMachineName(const QString &compilerFilePath)
static QStringList standardCompilerFileNames()
{
- return QStringList()
- << HostOsInfo::appendExecutableSuffix(QStringLiteral("gcc"))
- << HostOsInfo::appendExecutableSuffix(QStringLiteral("g++"))
- << HostOsInfo::appendExecutableSuffix(QStringLiteral("clang"))
- << HostOsInfo::appendExecutableSuffix(QStringLiteral("clang++"));
+ return {HostOsInfo::appendExecutableSuffix(QStringLiteral("gcc")),
+ HostOsInfo::appendExecutableSuffix(QStringLiteral("g++")),
+ HostOsInfo::appendExecutableSuffix(QStringLiteral("clang")),
+ HostOsInfo::appendExecutableSuffix(QStringLiteral("clang++"))};
}
static void setCommonProperties(Profile &profile, const QString &compilerFilePath,