Use QStringLiteral more where it is possible

Change-Id: I7419cc3fbc1e8776de3943852dcedab4c95d1c32
Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

19 files changed, 173 insertions, 174 deletions

diff --git a/src/app/config-ui/commandlineparser.cpp b/src/app/config-ui/commandlineparser.cpp
index d38c34e55..5f7265046 100644
--- a/src/app/config-ui/commandlineparser.cpp
+++ b/src/app/config-ui/commandlineparser.cpp
@@ -45,10 +45,10 @@
 
 using qbs::Internal::Tr;
 
-static QString helpOptionShort() { return QLatin1String("-h"); }
-static QString helpOptionLong() { return QLatin1String("--help"); }
-static QString settingsDirOption() { return QLatin1String("--settings-dir"); }
-static QString systemOption() { return QLatin1String("--system"); }
+static QString helpOptionShort() { return QStringLiteral("-h"); }
+static QString helpOptionLong() { return QStringLiteral("--help"); }
+static QString settingsDirOption() { return QStringLiteral("--settings-dir"); }
+static QString systemOption() { return QStringLiteral("--system"); }
 
 void CommandLineParser::parse(const QStringList &commandLine)
 {
diff --git a/src/app/qbs-create-project/create-project-main.cpp b/src/app/qbs-create-project/create-project-main.cpp
index 8c3721232..f26df3dbf 100644
--- a/src/app/qbs-create-project/create-project-main.cpp
+++ b/src/app/qbs-create-project/create-project-main.cpp
@@ -56,17 +56,17 @@ int main(int argc, char *argv[])
     using qbs::Internal::Tr;
 
     QCoreApplication app(argc, argv);
-    const QCommandLineOption flatOpt(QLatin1String("flat"),
+    const QCommandLineOption flatOpt(QStringLiteral("flat"),
             Tr::tr("Do not create nested project files, even if there are subdirectories and "
                    "the top-level directory does not contain any files."));
-    const QCommandLineOption whiteListOpt(QLatin1String("whitelist"),
+    const QCommandLineOption whiteListOpt(QStringLiteral("whitelist"),
             Tr::tr("Only consider files whose names match these patterns. The list entries "
                    "can contain wildcards and are separated by commas. By default, all files "
-                   "are considered."), QLatin1String("whitelist"));
-    const QCommandLineOption blackListOpt(QLatin1String("blacklist"),
+                   "are considered."), QStringLiteral("whitelist"));
+    const QCommandLineOption blackListOpt(QStringLiteral("blacklist"),
             Tr::tr("Ignore files whose names match these patterns. The list entries "
                    "can contain wildcards and are separated by commas. By default, no files "
-                   "are ignored."), QLatin1String("blacklist"));
+                   "are ignored."), QStringLiteral("blacklist"));
     QCommandLineParser parser;
     parser.setApplicationDescription(Tr::tr("This tool creates a qbs project from an existing "
                                             "source tree.\nNote: The resulting project file(s) "
diff --git a/src/app/qbs-setup-android/android-setup.cpp b/src/app/qbs-setup-android/android-setup.cpp
index 8c7373652..0a95dfd68 100644
--- a/src/app/qbs-setup-android/android-setup.cpp
+++ b/src/app/qbs-setup-android/android-setup.cpp
@@ -145,7 +145,7 @@ static QtInfoPerArch getQtAndroidInfo(const QString &qtSdkDir)
         return archs;
 
     QStringList qtDirs(qtSdkDir);
-    QDirIterator dit(qtSdkDir, QStringList() << QLatin1String("android_*"), QDir::Dirs);
+    QDirIterator dit(qtSdkDir, QStringList() << QStringLiteral("android_*"), QDir::Dirs);
     while (dit.hasNext())
         qtDirs << dit.next();
     for (auto it = qtDirs.cbegin(); it != qtDirs.cend(); ++it) {
@@ -183,7 +183,7 @@ static QString getToolchainType(const QString &ndkDirPath)
 {
     QFile sourceProperties(ndkDirPath + qls("/source.properties"));
     if (!sourceProperties.open(QIODevice::ReadOnly))
-        return QLatin1String("gcc"); // <= r10
+        return QStringLiteral("gcc"); // <= r10
     while (!sourceProperties.atEnd()) {
         const QByteArray curLine = sourceProperties.readLine().simplified();
         static const QByteArray prefix = "Pkg.Revision = ";
@@ -194,12 +194,12 @@ static QString getToolchainType(const QString &ndkDirPath)
         if (!ndkVersion.isValid()) {
             qWarning("Unexpected format of NDK revision string in '%s'",
                      qPrintable(sourceProperties.fileName()));
-            return QLatin1String("clang");
+            return QStringLiteral("clang");
         }
         return qls(ndkVersion.majorVersion() >= 18 ? "clang" : "gcc");
     }
     qWarning("No revision entry found in '%s'", qPrintable(sourceProperties.fileName()));
-    return QLatin1String("clang");
+    return QStringLiteral("clang");
 }
 
 static void setupNdk(qbs::Settings *settings, const QString &profileName, const QString &ndkDirPath,
diff --git a/src/app/qbs-setup-android/commandlineparser.cpp b/src/app/qbs-setup-android/commandlineparser.cpp
index df84f5332..0aecc8773 100644
--- a/src/app/qbs-setup-android/commandlineparser.cpp
+++ b/src/app/qbs-setup-android/commandlineparser.cpp
@@ -50,12 +50,12 @@ CommandLineParser::CommandLineParser()
 
 using qbs::Internal::Tr;
 
-static QString helpOptionShort() { return QLatin1String("-h"); }
-static QString helpOptionLong() { return QLatin1String("--help"); }
-static QString settingsDirOption() { return QLatin1String("--settings-dir"); }
-static QString sdkDirOption() { return QLatin1String("--sdk-dir"); }
-static QString ndkDirOption() { return QLatin1String("--ndk-dir"); }
-static QString qtSdkDirOption() { return QLatin1String("--qt-dir"); }
+static QString helpOptionShort() { return QStringLiteral("-h"); }
+static QString helpOptionLong() { return QStringLiteral("--help"); }
+static QString settingsDirOption() { return QStringLiteral("--settings-dir"); }
+static QString sdkDirOption() { return QStringLiteral("--sdk-dir"); }
+static QString ndkDirOption() { return QStringLiteral("--ndk-dir"); }
+static QString qtSdkDirOption() { return QStringLiteral("--qt-dir"); }
 
 void CommandLineParser::parse(const QStringList &commandLine)
 {
diff --git a/src/app/qbs-setup-qt/commandlineparser.cpp b/src/app/qbs-setup-qt/commandlineparser.cpp
index 8444faa77..3bfe9bb6b 100644
--- a/src/app/qbs-setup-qt/commandlineparser.cpp
+++ b/src/app/qbs-setup-qt/commandlineparser.cpp
@@ -45,11 +45,11 @@
 
 using qbs::Internal::Tr;
 
-static QString helpOptionShort() { return QLatin1String("-h"); }
-static QString helpOptionLong() { return QLatin1String("--help"); }
-static QString detectOption() { return QLatin1String("--detect"); }
-static QString settingsDirOption() { return QLatin1String("--settings-dir"); }
-static QString systemOption() { return QLatin1String("--system"); }
+static QString helpOptionShort() { return QStringLiteral("-h"); }
+static QString helpOptionLong() { return QStringLiteral("--help"); }
+static QString detectOption() { return QStringLiteral("--detect"); }
+static QString settingsDirOption() { return QStringLiteral("--settings-dir"); }
+static QString systemOption() { return QStringLiteral("--system"); }
 
 void CommandLineParser::parse(const QStringList &commandLine)
 {
diff --git a/src/app/qbs-setup-qt/setupqt.cpp b/src/app/qbs-setup-qt/setupqt.cpp
index c22700a95..498b73d99 100644
--- a/src/app/qbs-setup-qt/setupqt.cpp
+++ b/src/app/qbs-setup-qt/setupqt.cpp
@@ -122,13 +122,13 @@ std::vector<QtEnvironment> SetupQt::fetchEnvironments()
 static QStringList qbsToolchainFromDirName(const QString &dir)
 {
     if (dir.startsWith(QLatin1String("msvc")))
-        return QStringList(QLatin1String("msvc"));
+        return QStringList(QStringLiteral("msvc"));
     if (dir.startsWith(QLatin1String("mingw")))
-        return QStringList{QLatin1String("mingw"), QLatin1String("gcc")};
+        return QStringList{QStringLiteral("mingw"), QStringLiteral("gcc")};
     if (dir.startsWith(QLatin1String("clang")))
-        return QStringList{QLatin1String("clang"), QLatin1String("llvm"), QLatin1String("gcc")};
+        return QStringList{QStringLiteral("clang"), QStringLiteral("llvm"), QStringLiteral("gcc")};
     if (dir.startsWith(QLatin1String("gcc")))
-        return QStringList(QLatin1String("gcc"));
+        return QStringList(QStringLiteral("gcc"));
     return QStringList();
 }
 
@@ -156,20 +156,20 @@ static QString archFromDirName(const QString &dir)
         return QString();
     const QString arch = QString::fromStdString(match[1]);
     if (arch == QLatin1String("32"))
-        return QLatin1String("x86");
+        return QStringLiteral("x86");
     if (arch == QLatin1String("64"))
-        return QLatin1String("x86_64");
+        return QStringLiteral("x86_64");
     if (arch.contains(QLatin1String("arm64")))
-        return QLatin1String("arm64");
+        return QStringLiteral("arm64");
     return arch;
 }
 
 static QString platformFromDirName(const QString &dir)
 {
     if (dir.startsWith(QLatin1String("android")))
-        return QLatin1String("android");
+        return QStringLiteral("android");
     if (dir == QLatin1String("Boot2Qt"))
-        return QLatin1String("linux");
+        return QStringLiteral("linux");
     return QString::fromStdString(HostOsInfo::hostOSIdentifier());
 }
 
@@ -184,7 +184,7 @@ QtEnvironment SetupQt::fetchEnvironment(const QString &qmakePath)
         env.msvcVersion = msvcVersionFromDirName(qtDir.dirName());
         env.architecture = archFromDirName(qtDir.dirName());
         if (env.msvcVersion.isValid() && env.architecture.isEmpty())
-            env.architecture = QLatin1String("x86");
+            env.architecture = QStringLiteral("x86");
         env.targetPlatform = platformFromDirName(qtDir.dirName());
         qtDir.cdUp();
         env.qtVersion = Version::fromString(qtDir.dirName());
@@ -196,9 +196,9 @@ static bool isToolchainProfile(const Profile &profile)
 {
     const auto actual = Internal::Set<QString>::fromList(
                 profile.allKeys(Profile::KeySelectionRecursive));
-    Internal::Set<QString> expected = Internal::Set<QString> { QLatin1String("qbs.toolchain") };
+    Internal::Set<QString> expected = Internal::Set<QString> { QStringLiteral("qbs.toolchain") };
     if (HostOsInfo::isMacosHost())
-        expected.insert(QLatin1String("qbs.targetPlatform")); // match only Xcode profiles
+        expected.insert(QStringLiteral("qbs.targetPlatform")); // match only Xcode profiles
     return Internal::Set<QString>(actual).unite(expected) == actual;
 }
 
@@ -231,7 +231,7 @@ static Match compatibility(const QtEnvironment &env, const Profile &toolchainPro
     Match match = MatchFull;
 
     const auto toolchainNames = Internal::Set<QString>::fromList(
-                toolchainProfile.value(QLatin1String("qbs.toolchain")).toStringList());
+                toolchainProfile.value(QStringLiteral("qbs.toolchain")).toStringList());
     const auto qtToolchainNames = Internal::Set<QString>::fromList(env.qbsToolchain);
     if (areProfilePropertiesIncompatible(toolchainNames, qtToolchainNames)) {
         auto intersection = toolchainNames;
@@ -243,11 +243,11 @@ static Match compatibility(const QtEnvironment &env, const Profile &toolchainPro
     }
 
     const auto targetPlatform = toolchainProfile.value(
-                QLatin1String("qbs.targetPlatform")).toString();
+                QStringLiteral("qbs.targetPlatform")).toString();
     if (!targetPlatform.isEmpty() && targetPlatform != env.targetPlatform)
         return MatchNone;
 
-    const QString toolchainArchitecture = toolchainProfile.value(QLatin1String("qbs.architecture"))
+    const QString toolchainArchitecture = toolchainProfile.value(QStringLiteral("qbs.architecture"))
             .toString();
     if (areProfilePropertiesIncompatible(canonicalArchitecture(env.architecture),
                                          canonicalArchitecture(toolchainArchitecture)))
@@ -257,7 +257,7 @@ static Match compatibility(const QtEnvironment &env, const Profile &toolchainPro
         // We want to know for sure that MSVC compiler versions match,
         // because it's especially important for this toolchain
         const Version compilerVersion = Version::fromString(
-            toolchainProfile.value(QLatin1String("cpp.compilerVersion")).toString());
+            toolchainProfile.value(QStringLiteral("cpp.compilerVersion")).toString());
 
         static const Version vs2017Version{19, 10};
         if (env.msvcVersion >= vs2017Version) {
@@ -314,7 +314,7 @@ void SetupQt::saveToQbsSettings(const QString &qtVersionName,
 
     Profile profile(cleanQtVersionName, settings);
     profile.removeProfile();
-    profile.setValue(QLatin1String("moduleProviders.Qt.qmakeFilePaths"),
+    profile.setValue(QStringLiteral("moduleProviders.Qt.qmakeFilePaths"),
                      QStringList(qtEnvironment.qmakeFilePath));
     if (!profile.baseProfile().isEmpty())
         return;
diff --git a/src/app/qbs-setup-toolchains/commandlineparser.cpp b/src/app/qbs-setup-toolchains/commandlineparser.cpp
index d96e18b7d..bf3937a2f 100644
--- a/src/app/qbs-setup-toolchains/commandlineparser.cpp
+++ b/src/app/qbs-setup-toolchains/commandlineparser.cpp
@@ -45,12 +45,12 @@
 
 using qbs::Internal::Tr;
 
-static QString helpOptionShort() { return QLatin1String("-h"); }
-static QString helpOptionLong() { return QLatin1String("--help"); }
-static QString detectOption() { return QLatin1String("--detect"); }
-static QString typeOption() { return QLatin1String("--type"); }
-static QString settingsDirOption() { return QLatin1String("--settings-dir"); }
-static QString systemOption() { return QLatin1String("--system"); }
+static QString helpOptionShort() { return QStringLiteral("-h"); }
+static QString helpOptionLong() { return QStringLiteral("--help"); }
+static QString detectOption() { return QStringLiteral("--detect"); }
+static QString typeOption() { return QStringLiteral("--type"); }
+static QString settingsDirOption() { return QStringLiteral("--settings-dir"); }
+static QString systemOption() { return QStringLiteral("--system"); }
 
 void CommandLineParser::parse(const QStringList &commandLine)
 {
diff --git a/src/app/qbs-setup-toolchains/msvcprobe.cpp b/src/app/qbs-setup-toolchains/msvcprobe.cpp
index 967d443a2..267f9628d 100644
--- a/src/app/qbs-setup-toolchains/msvcprobe.cpp
+++ b/src/app/qbs-setup-toolchains/msvcprobe.cpp
@@ -92,9 +92,9 @@ static void addMSVCPlatform(Settings *settings, QList<Profile> &profiles, QStrin
     qbsInfo() << Tr::tr("Setting up profile '%1'.").arg(name);
     Profile p(name, settings);
     p.removeProfile();
-    p.setValue(QLatin1String("qbs.targetPlatform"), QLatin1String("windows"));
-    p.setValue(QLatin1String("qbs.toolchain"), QStringList(QLatin1String("msvc")));
-    p.setValue(QLatin1String("cpp.toolchainInstallPath"), msvc->binPath);
+    p.setValue(QStringLiteral("qbs.targetPlatform"), QStringLiteral("windows"));
+    p.setValue(QStringLiteral("qbs.toolchain"), QStringList(QStringLiteral("msvc")));
+    p.setValue(QStringLiteral("cpp.toolchainInstallPath"), msvc->binPath);
     setQtHelperProperties(p, msvc);
     profiles.push_back(p);
 }
@@ -154,7 +154,7 @@ static std::vector<MSVCArchInfo> findSupportedArchitectures(const MSVC &msvc)
 static QString wow6432Key()
 {
 #ifdef Q_OS_WIN64
-    return QLatin1String("\\Wow6432Node");
+    return QStringLiteral("\\Wow6432Node");
 #else
     return QString();
 #endif
@@ -351,7 +351,7 @@ void msvcProbe(Settings *settings, QList<Profile> &profiles)
     const QSettings sdkRegistry(QLatin1String("HKEY_LOCAL_MACHINE\\SOFTWARE") + wow6432Key()
                                 + QLatin1String("\\Microsoft\\Microsoft SDKs\\Windows"),
                                 QSettings::NativeFormat);
-    const QString defaultSdkPath = sdkRegistry.value(QLatin1String("CurrentInstallFolder")).toString();
+    const QString defaultSdkPath = sdkRegistry.value(QStringLiteral("CurrentInstallFolder")).toString();
     if (!defaultSdkPath.isEmpty()) {
         const auto sdkKeys = sdkRegistry.childGroups();
         for (const QString &sdkKey : sdkKeys) {
diff --git a/src/app/qbs-setup-toolchains/probe.cpp b/src/app/qbs-setup-toolchains/probe.cpp
index 390b539a4..9ae8eac94 100644
--- a/src/app/qbs-setup-toolchains/probe.cpp
+++ b/src/app/qbs-setup-toolchains/probe.cpp
@@ -101,16 +101,16 @@ static QStringList validMinGWMachines()
 {
     // List of MinGW machine names (gcc -dumpmachine) recognized by Qbs
     return QStringList()
-            << QLatin1String("mingw32") << QLatin1String("mingw64")
-            << QLatin1String("i686-w64-mingw32") << QLatin1String("x86_64-w64-mingw32")
-            << QLatin1String("i686-w64-mingw32.shared") << QLatin1String("x86_64-w64-mingw32.shared")
-            << QLatin1String("i686-w64-mingw32.static") << QLatin1String("x86_64-w64-mingw32.static")
-            << QLatin1String("i586-mingw32msvc") << QLatin1String("amd64-mingw32msvc");
+            << 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 { QLatin1String("icc8051"), QLatin1String("iccarm"), QLatin1String("iccavr") };
+    return { QStringLiteral("icc8051"), QStringLiteral("iccarm"), QStringLiteral("iccavr") };
 }
 
 static bool isIarCompiler(const QString &compilerName)
@@ -135,25 +135,25 @@ static bool isKeilCompiler(const QString &compilerName)
 static QStringList toolchainTypeFromCompilerName(const QString &compilerName)
 {
     if (compilerName == QLatin1String("cl.exe"))
-        return canonicalToolchain(QLatin1String("msvc"));
-    const auto types = { QLatin1String("clang"), QLatin1String("llvm"),
-                         QLatin1String("mingw"), QLatin1String("gcc") };
+        return canonicalToolchain(QStringLiteral("msvc"));
+    const auto types = { QStringLiteral("clang"), QStringLiteral("llvm"),
+                         QStringLiteral("mingw"), QStringLiteral("gcc") };
     for (const auto &type : types) {
         if (compilerName.contains(type))
             return canonicalToolchain(type);
     }
     if (compilerName == QLatin1String("g++"))
-        return canonicalToolchain(QLatin1String("gcc"));
+        return canonicalToolchain(QStringLiteral("gcc"));
     if (isIarCompiler(compilerName))
-        return canonicalToolchain(QLatin1String("iar"));
+        return canonicalToolchain(QStringLiteral("iar"));
     if (isKeilCompiler(compilerName))
-        return canonicalToolchain(QLatin1String("keil"));
+        return canonicalToolchain(QStringLiteral("keil"));
     return QStringList();
 }
 
 static QString gccMachineName(const QString &compilerFilePath)
 {
-    return qsystem(compilerFilePath, QStringList() << QLatin1String("-dumpmachine")).trimmed();
+    return qsystem(compilerFilePath, QStringList() << QStringLiteral("-dumpmachine")).trimmed();
 }
 
 static QStringList standardCompilerFileNames()
@@ -176,15 +176,15 @@ static void setCommonProperties(Profile &profile, const QString &compilerFilePat
 
     const QString prefix = compilerName.left(compilerName.lastIndexOf(QLatin1Char('-')) + 1);
     if (!prefix.isEmpty())
-        profile.setValue(QLatin1String("cpp.toolchainPrefix"), prefix);
+        profile.setValue(QStringLiteral("cpp.toolchainPrefix"), prefix);
 
-    profile.setValue(QLatin1String("cpp.toolchainInstallPath"), cfi.absolutePath());
-    profile.setValue(QLatin1String("qbs.toolchain"), toolchainTypes);
+    profile.setValue(QStringLiteral("cpp.toolchainInstallPath"), cfi.absolutePath());
+    profile.setValue(QStringLiteral("qbs.toolchain"), toolchainTypes);
 
     const QString suffix = compilerName.right(compilerName.size() - prefix.size());
     if (!standardCompilerFileNames().contains(suffix))
         qWarning("%s", qPrintable(
-                     QString::fromLatin1("'%1' is not a standard compiler file name; "
+                     QStringLiteral("'%1' is not a standard compiler file name; "
                                             "you must set the cpp.cCompilerName and "
                                             "cpp.cxxCompilerName properties of this profile "
                                             "manually").arg(compilerName)));
@@ -205,9 +205,8 @@ public:
             return;
         const QString toolFilePath = findExecutable(toolFileName);
         if (toolFilePath.isEmpty()) {
-            qWarning("%s", qPrintable(
-                         QString(QLatin1String("'%1' exists neither in '%2' nor in PATH."))
-                            .arg(toolFileName, m_compilerDirPath)));
+            qWarning("%s", qPrintable(QStringLiteral("'%1' exists neither in '%2' nor in PATH.")
+                     .arg(toolFileName, m_compilerDirPath)));
         }
         m_profile->setValue(propertyName, toolFilePath);
     }
@@ -251,14 +250,14 @@ static Profile createGccProfile(const QString &compilerFilePath, Settings *setti
     const ToolPathSetup toolPathSetup(&profile, compilerDirPath,
                                       profile.value(QStringLiteral("cpp.toolchainPrefix"))
                                       .toString());
-    toolPathSetup.apply(QLatin1String("ar"), QLatin1String("cpp.archiverPath"));
-    toolPathSetup.apply(QLatin1String("as"), QLatin1String("cpp.assemblerPath"));
-    toolPathSetup.apply(QLatin1String("nm"), QLatin1String("cpp.nmPath"));
+    toolPathSetup.apply(QStringLiteral("ar"), QStringLiteral("cpp.archiverPath"));
+    toolPathSetup.apply(QStringLiteral("as"), QStringLiteral("cpp.assemblerPath"));
+    toolPathSetup.apply(QStringLiteral("nm"), QStringLiteral("cpp.nmPath"));
     if (doesProfileTargetOS(profile, QStringLiteral("darwin")))
-        toolPathSetup.apply(QLatin1String("dsymutil"), QLatin1String("cpp.dsymutilPath"));
+        toolPathSetup.apply(QStringLiteral("dsymutil"), QStringLiteral("cpp.dsymutilPath"));
     else
-        toolPathSetup.apply(QLatin1String("objcopy"), QLatin1String("cpp.objcopyPath"));
-    toolPathSetup.apply(QLatin1String("strip"), QLatin1String("cpp.stripPath"));
+        toolPathSetup.apply(QStringLiteral("objcopy"), QStringLiteral("cpp.objcopyPath"));
+    toolPathSetup.apply(QStringLiteral("strip"), QStringLiteral("cpp.stripPath"));
 
     qStdout << Tr::tr("Profile '%1' created for '%2'.").arg(profile.name(), compilerFilePath)
             << endl;
@@ -269,11 +268,11 @@ static QString guessIarArchitecture(const QFileInfo &compiler)
 {
     const auto baseName = compiler.baseName();
     if (baseName == QLatin1String("icc8051"))
-        return QLatin1String("mcs51");
+        return QStringLiteral("mcs51");
     if (baseName == QLatin1String("iccarm"))
-        return QLatin1String("arm");
+        return QStringLiteral("arm");
     if (baseName == QLatin1String("iccavr"))
-        return QLatin1String("avr");
+        return QStringLiteral("avr");
     return {};
 }
 
@@ -350,7 +349,7 @@ static void mingwProbe(Settings *settings, QList<Profile> &profiles)
     // List of possible compiler binary names for this platform
     QStringList compilerNames;
     if (HostOsInfo::isWindowsHost()) {
-        compilerNames << QLatin1String("gcc");
+        compilerNames << QStringLiteral("gcc");
     } else {
         const auto machineNames = validMinGWMachines();
         for (const QString &machineName : machineNames) {
@@ -363,7 +362,7 @@ static void mingwProbe(Settings *settings, QList<Profile> &profiles)
                 = findExecutable(HostOsInfo::appendExecutableSuffix(compilerName));
         if (!gccPath.isEmpty())
             profiles.push_back(createGccProfile(gccPath, settings,
-                                                canonicalToolchain(QLatin1String("mingw"))));
+                                                canonicalToolchain(QStringLiteral("mingw"))));
     }
 }
 
@@ -409,8 +408,8 @@ void probe(Settings *settings)
     if (HostOsInfo::isWindowsHost()) {
         msvcProbe(settings, profiles);
     } else {
-        gccProbe(settings, profiles, QLatin1String("gcc"));
-        gccProbe(settings, profiles, QLatin1String("clang"));
+        gccProbe(settings, profiles, QStringLiteral("gcc"));
+        gccProbe(settings, profiles, QStringLiteral("clang"));
 
         if (HostOsInfo::isMacosHost()) {
             xcodeProbe(settings, profiles);
@@ -426,7 +425,7 @@ void probe(Settings *settings)
     } else if (profiles.size() == 1 && settings->defaultProfile().isEmpty()) {
         const QString profileName = profiles.front().name();
         qStdout << Tr::tr("Making profile '%1' the default.").arg(profileName) << endl;
-        settings->setValue(QLatin1String("defaultProfile"), profileName);
+        settings->setValue(QStringLiteral("defaultProfile"), profileName);
     }
 }
 
diff --git a/src/app/qbs-setup-toolchains/xcodeprobe.cpp b/src/app/qbs-setup-toolchains/xcodeprobe.cpp
index 2cb54f5b9..277d14d0a 100644
--- a/src/app/qbs-setup-toolchains/xcodeprobe.cpp
+++ b/src/app/qbs-setup-toolchains/xcodeprobe.cpp
@@ -99,8 +99,8 @@ bool XcodeProbe::addDeveloperPath(const QString &path)
 void XcodeProbe::detectDeveloperPaths()
 {
     QProcess selectedXcode;
-    QString program = QLatin1String("/usr/bin/xcode-select");
-    QStringList arguments(QLatin1String("--print-path"));
+    QString program = QStringLiteral("/usr/bin/xcode-select");
+    QStringList arguments(QStringLiteral("--print-path"));
     selectedXcode.start(program, arguments, QProcess::ReadOnly);
     if (!selectedXcode.waitForFinished(-1) || selectedXcode.exitCode()) {
         qbsInfo() << Tr::tr("Could not detect selected Xcode with /usr/bin/xcode-select");
@@ -111,8 +111,8 @@ void XcodeProbe::detectDeveloperPaths()
     addDeveloperPath(defaultDeveloperPath);
 
     QProcess launchServices;
-    program = QLatin1String("/usr/bin/mdfind");
-    arguments = QStringList(QLatin1String("kMDItemCFBundleIdentifier == 'com.apple.dt.Xcode'"));
+    program = QStringLiteral("/usr/bin/mdfind");
+    arguments = QStringList(QStringLiteral("kMDItemCFBundleIdentifier == 'com.apple.dt.Xcode'"));
     launchServices.start(program, arguments, QProcess::ReadOnly);
     if (!launchServices.waitForFinished(-1) || launchServices.exitCode()) {
         qbsInfo() << Tr::tr("Could not detect additional Xcode installations with /usr/bin/mdfind");
@@ -172,10 +172,10 @@ void XcodeProbe::setupDefaultToolchains(const QString &devPath, const QString &x
     Profile installationProfile(xcodeName, settings);
     installationProfile.removeProfile();
     installationProfile.setValue(QStringLiteral("qbs.toolchain"), QStringList()
-                                 << QLatin1String("xcode")
-                                 << QLatin1String("clang")
-                                 << QLatin1String("llvm")
-                                 << QLatin1String("gcc"));
+                                 << QStringLiteral("xcode")
+                                 << QStringLiteral("clang")
+                                 << QStringLiteral("llvm")
+                                 << QStringLiteral("gcc"));
     if (devPath != defaultDeveloperPath)
         installationProfile.setValue(QStringLiteral("xcode.developerPath"), devPath);
     profiles.push_back(installationProfile);
@@ -212,7 +212,7 @@ void XcodeProbe::detectAll()
     int i = 1;
     detectDeveloperPaths();
     for (const QString &developerPath : developerPaths) {
-        QString profileName = QLatin1String("xcode");
+        QString profileName = QStringLiteral("xcode");
         if (developerPath != defaultDeveloperPath) {
             const auto devPath = developerPath.toStdString();
             std::smatch match;
diff --git a/src/app/qbs/application.cpp b/src/app/qbs/application.cpp
index e22a0e9cc..2e6543241 100644
--- a/src/app/qbs/application.cpp
+++ b/src/app/qbs/application.cpp
@@ -47,9 +47,9 @@ namespace qbs {
 Application::Application(int &argc, char **argv)
     : QCoreApplication(argc, argv), m_clFrontend(nullptr), m_canceled(false)
 {
-    setApplicationName(QLatin1String("qbs"));
-    setOrganizationName(QLatin1String("QtProject"));
-    setOrganizationDomain(QLatin1String("qt-project.org"));
+    setApplicationName(QStringLiteral("qbs"));
+    setOrganizationName(QStringLiteral("QtProject"));
+    setOrganizationDomain(QStringLiteral("qt-project.org"));
 }
 
 Application *Application::instance()
diff --git a/src/app/qbs/commandlinefrontend.cpp b/src/app/qbs/commandlinefrontend.cpp
index b2bb5df62..1a8e1757d 100644
--- a/src/app/qbs/commandlinefrontend.cpp
+++ b/src/app/qbs/commandlinefrontend.cpp
@@ -156,9 +156,9 @@ void CommandLineFrontend::start()
         const auto buildConfigs = m_parser.buildConfigurations();
         for (const QVariantMap &buildConfig : buildConfigs) {
             QVariantMap userConfig = buildConfig;
-            const QString configurationKey = QLatin1String("qbs.configurationName");
-            const QString profileKey = QLatin1String("qbs.profile");
-            const QString installRootKey = QLatin1String("qbs.installRoot");
+            const QString configurationKey = QStringLiteral("qbs.configurationName");
+            const QString profileKey = QStringLiteral("qbs.profile");
+            const QString installRootKey = QStringLiteral("qbs.installRoot");
             QString installRoot = userConfig.value(installRootKey).toString();
             if (!installRoot.isEmpty() && QFileInfo(installRoot).isRelative()) {
                 installRoot.prepend(QLatin1Char('/')).prepend(QDir::currentPath());
@@ -316,7 +316,7 @@ void CommandLineFrontend::handleProcessResultReport(const qbs::ProcessResult &re
 
     LogWriter w = result.success() ? qbsInfo() : qbsError();
     w << shellQuote(QDir::toNativeSeparators(result.executableFilePath()), result.arguments())
-      << (hasOutput ? QString::fromLatin1("\n") : QString())
+      << (hasOutput ? QStringLiteral("\n") : QString())
       << (result.stdOut().empty() ? QString() : result.stdOut().join(QLatin1Char('\n')));
     if (!result.stdErr().empty())
         w << result.stdErr().join(QLatin1Char('\n')) << MessageTag(QStringLiteral("stdErr"));
@@ -593,7 +593,7 @@ void CommandLineFrontend::listProducts()
         QString productInfo = p.fullDisplayName();
         if (!p.isEnabled())
             productInfo.append(QLatin1Char(' ')).append(Tr::tr("[disabled]"));
-        else if (!p.properties().value(QLatin1String("builtByDefault")).toBool())
+        else if (!p.properties().value(QStringLiteral("builtByDefault")).toBool())
             productInfo.append(QLatin1Char(' ')).append(Tr::tr("[not built by default]"));
         output += productInfo;
     }
diff --git a/src/app/qbs/consoleprogressobserver.cpp b/src/app/qbs/consoleprogressobserver.cpp
index b49723a64..e6ab9db74 100644
--- a/src/app/qbs/consoleprogressobserver.cpp
+++ b/src/app/qbs/consoleprogressobserver.cpp
@@ -111,7 +111,7 @@ void ConsoleProgressObserver::updateProgressBarIfNecessary()
 
 void ConsoleProgressObserver::writePercentageString()
 {
-    std::cout << QString::fromLatin1(" %1%").arg(m_percentage).toLocal8Bit().constData();
+    std::cout << QStringLiteral(" %1%").arg(m_percentage).toLocal8Bit().constData();
 }
 
 } // namespace qbs
diff --git a/src/app/qbs/parser/commandlineoption.cpp b/src/app/qbs/parser/commandlineoption.cpp
index dc5b4e440..0c13662f0 100644
--- a/src/app/qbs/parser/commandlineoption.cpp
+++ b/src/app/qbs/parser/commandlineoption.cpp
@@ -84,12 +84,12 @@ QString FileOption::description(CommandType command) const
 
 QString FileOption::shortRepresentation() const
 {
-    return QLatin1String("-f");
+    return QStringLiteral("-f");
 }
 
 QString FileOption::longRepresentation() const
 {
-    return QLatin1String("--file");
+    return QStringLiteral("--file");
 }
 
 void FileOption::doParse(const QString &representation, QStringList &input)
@@ -114,22 +114,22 @@ QString BuildDirectoryOption::description(CommandType command) const
 
 QString BuildDirectoryOption::shortRepresentation() const
 {
-    return QLatin1String("-d");
+    return QStringLiteral("-d");
 }
 
 QString BuildDirectoryOption::longRepresentation() const
 {
-    return QLatin1String("--build-directory");
+    return QStringLiteral("--build-directory");
 }
 
 QString BuildDirectoryOption::magicProjectString()
 {
-    return QLatin1String("@project");
+    return QStringLiteral("@project");
 }
 
 QString BuildDirectoryOption::magicProjectDirString()
 {
-    return QLatin1String("@path");
+    return QStringLiteral("@path");
 }
 
 void BuildDirectoryOption::doParse(const QString &representation, QStringList &input)
@@ -147,12 +147,12 @@ QString GeneratorOption::description(CommandType command) const
 
 QString GeneratorOption::shortRepresentation() const
 {
-    return QLatin1String("-g");
+    return QStringLiteral("-g");
 }
 
 QString GeneratorOption::longRepresentation() const
 {
-    return QLatin1String("--generator");
+    return QStringLiteral("--generator");
 }
 
 void GeneratorOption::doParse(const QString &representation, QStringList &input)
@@ -164,7 +164,7 @@ void GeneratorOption::doParse(const QString &representation, QStringList &input)
     }
 }
 
-static QString loglevelLongRepresentation() { return QLatin1String("--log-level"); }
+static QString loglevelLongRepresentation() { return QStringLiteral("--log-level"); }
 
 QString VerboseOption::description(CommandType command) const
 {
@@ -180,12 +180,12 @@ QString VerboseOption::description(CommandType command) const
 
 QString VerboseOption::shortRepresentation() const
 {
-    return QLatin1String("-v");
+    return QStringLiteral("-v");
 }
 
 QString VerboseOption::longRepresentation() const
 {
-    return QLatin1String("--more-verbose");
+    return QStringLiteral("--more-verbose");
 }
 
 QString QuietOption::description(CommandType command) const
@@ -202,12 +202,12 @@ QString QuietOption::description(CommandType command) const
 
 QString QuietOption::shortRepresentation() const
 {
-    return QLatin1String("-q");
+    return QStringLiteral("-q");
 }
 
 QString QuietOption::longRepresentation() const
 {
-    return QLatin1String("--less-verbose");
+    return QStringLiteral("--less-verbose");
 }
 
 QString JobsOption::description(CommandType command) const
@@ -221,12 +221,12 @@ QString JobsOption::description(CommandType command) const
 
 QString JobsOption::shortRepresentation() const
 {
-    return QLatin1String("-j");
+    return QStringLiteral("-j");
 }
 
 QString JobsOption::longRepresentation() const
 {
-    return QLatin1String("--jobs");
+    return QStringLiteral("--jobs");
 }
 
 void JobsOption::doParse(const QString &representation, QStringList &input)
@@ -249,12 +249,12 @@ QString KeepGoingOption::description(CommandType command) const
 
 QString KeepGoingOption::shortRepresentation() const
 {
-    return QLatin1String("-k");
+    return QStringLiteral("-k");
 }
 
 QString KeepGoingOption::longRepresentation() const
 {
-    return QLatin1String("--keep-going");
+    return QStringLiteral("--keep-going");
 }
 
 QString DryRunOption::description(CommandType command) const
@@ -268,12 +268,12 @@ QString DryRunOption::description(CommandType command) const
 
 QString DryRunOption::shortRepresentation() const
 {
-    return QLatin1String("-n");
+    return QStringLiteral("-n");
 }
 
 QString DryRunOption::longRepresentation() const
 {
-    return QLatin1String("--dry-run");
+    return QStringLiteral("--dry-run");
 }
 
 QString ForceProbesOption::description(CommandType command) const
@@ -287,7 +287,7 @@ QString ForceProbesOption::description(CommandType command) const
 
 QString ForceProbesOption::longRepresentation() const
 {
-    return QLatin1String("--force-probe-execution");
+    return QStringLiteral("--force-probe-execution");
 }
 
 QString NoInstallOption::description(CommandType command) const
@@ -300,13 +300,13 @@ QString NoInstallOption::description(CommandType command) const
 
 QString NoInstallOption::longRepresentation() const
 {
-    return QLatin1String("--no-install");
+    return QStringLiteral("--no-install");
 }
 
 
 static QString logTimeRepresentation()
 {
-    return QLatin1String("--log-time");
+    return QStringLiteral("--log-time");
 }
 
 QString ShowProgressOption::description(CommandType command) const
@@ -321,7 +321,7 @@ QString ShowProgressOption::description(CommandType command) const
 
 static QString showProgressRepresentation()
 {
-    return QLatin1String("--show-progress");
+    return QStringLiteral("--show-progress");
 }
 
 QString ShowProgressOption::longRepresentation() const
@@ -354,7 +354,7 @@ QString ChangedFilesOption::description(CommandType command) const
 
 QString ChangedFilesOption::longRepresentation() const
 {
-    return QLatin1String("--changed-files");
+    return QStringLiteral("--changed-files");
 }
 
 QString ProductsOption::description(CommandType command) const
@@ -373,12 +373,12 @@ QString ProductsOption::description(CommandType command) const
 
 QString ProductsOption::shortRepresentation() const
 {
-    return QLatin1String("-p");
+    return QStringLiteral("-p");
 }
 
 QString ProductsOption::longRepresentation() const
 {
-    return QLatin1String("--products");
+    return QStringLiteral("--products");
 }
 
 static QStringList allLogLevelStrings()
@@ -433,7 +433,7 @@ QString ForceTimeStampCheckOption::description(CommandType command) const
 
 QString ForceTimeStampCheckOption::longRepresentation() const
 {
-    return QLatin1String("--check-timestamps");
+    return QStringLiteral("--check-timestamps");
 }
 
 QString ForceOutputCheckOption::description(CommandType command) const
@@ -446,7 +446,7 @@ QString ForceOutputCheckOption::description(CommandType command) const
 
 QString ForceOutputCheckOption::longRepresentation() const
 {
-    return QLatin1String("--check-outputs");
+    return QStringLiteral("--check-outputs");
 }
 
 QString BuildNonDefaultOption::description(CommandType command) const
@@ -458,7 +458,7 @@ QString BuildNonDefaultOption::description(CommandType command) const
 
 QString BuildNonDefaultOption::longRepresentation() const
 {
-    return QLatin1String("--all-products");
+    return QStringLiteral("--all-products");
 }
 
 
@@ -466,7 +466,7 @@ InstallRootOption::InstallRootOption() : m_useSysroot(false)
 {
 }
 
-static QString magicSysrootString() { return QLatin1String("@sysroot"); }
+static QString magicSysrootString() { return QStringLiteral("@sysroot"); }
 
 QString InstallRootOption::description(CommandType command) const
 {
@@ -482,7 +482,7 @@ QString InstallRootOption::description(CommandType command) const
 
 QString InstallRootOption::longRepresentation() const
 {
-    return QLatin1String("--install-root");
+    return QStringLiteral("--install-root");
 }
 
 void InstallRootOption::doParse(const QString &representation, QStringList &input)
@@ -507,7 +507,7 @@ QString RemoveFirstOption::description(CommandType command) const
 
 QString RemoveFirstOption::longRepresentation() const
 {
-    return QLatin1String("--clean-install-root");
+    return QStringLiteral("--clean-install-root");
 }
 
 
@@ -520,7 +520,7 @@ QString NoBuildOption::description(CommandType command) const
 
 QString NoBuildOption::longRepresentation() const
 {
-    return QLatin1String("--no-build");
+    return QStringLiteral("--no-build");
 }
 
 
@@ -537,7 +537,7 @@ QString LogTimeOption::description(CommandType command) const
 
 QString LogTimeOption::shortRepresentation() const
 {
-    return QLatin1String("-t");
+    return QStringLiteral("-t");
 }
 
 QString LogTimeOption::longRepresentation() const
@@ -562,7 +562,7 @@ QString SettingsDirOption::description(CommandType command) const
 
 QString SettingsDirOption::longRepresentation() const
 {
-    return QLatin1String("--settings-dir");
+    return QStringLiteral("--settings-dir");
 }
 
 void SettingsDirOption::doParse(const QString &representation, QStringList &input)
@@ -583,7 +583,7 @@ QString JobLimitsOption::description(CommandType command) const
 
 QString JobLimitsOption::longRepresentation() const
 {
-    return QLatin1String("--job-limits");
+    return QStringLiteral("--job-limits");
 }
 
 void JobLimitsOption::doParse(const QString &representation, QStringList &input)
@@ -624,7 +624,7 @@ QString RespectProjectJobLimitsOption::description(CommandType command) const
 
 QString RespectProjectJobLimitsOption::longRepresentation() const
 {
-    return QLatin1String("--enforce-project-job-limits");
+    return QStringLiteral("--enforce-project-job-limits");
 }
 
 CommandEchoModeOption::CommandEchoModeOption()
@@ -644,7 +644,7 @@ QString CommandEchoModeOption::description(CommandType command) const
 
 QString CommandEchoModeOption::longRepresentation() const
 {
-    return QLatin1String("--command-echo-mode");
+    return QStringLiteral("--command-echo-mode");
 }
 
 CommandEchoMode CommandEchoModeOption::commandEchoMode() const
@@ -678,7 +678,7 @@ QString WaitLockOption::description(CommandType command) const
 
 QString WaitLockOption::longRepresentation() const
 {
-    return QLatin1String("--wait-lock");
+    return QStringLiteral("--wait-lock");
 }
 
 QString DisableFallbackProviderOption::description(CommandType) const
@@ -689,7 +689,7 @@ QString DisableFallbackProviderOption::description(CommandType) const
 
 QString DisableFallbackProviderOption::longRepresentation() const
 {
-    return QLatin1String("--no-fallback-module-provider");
+    return QStringLiteral("--no-fallback-module-provider");
 }
 
 QString RunEnvConfigOption::description(CommandType command) const
@@ -701,7 +701,7 @@ QString RunEnvConfigOption::description(CommandType command) const
 
 QString RunEnvConfigOption::longRepresentation() const
 {
-    return QLatin1String("--setup-run-env-config");
+    return QStringLiteral("--setup-run-env-config");
 }
 
 } // namespace qbs
diff --git a/src/app/qbs/parser/commandlineparser.cpp b/src/app/qbs/parser/commandlineparser.cpp
index 32023e011..cd74210c7 100644
--- a/src/app/qbs/parser/commandlineparser.cpp
+++ b/src/app/qbs/parser/commandlineparser.cpp
@@ -135,7 +135,7 @@ void CommandLineParser::printHelp() const
         if (commandToDescribe) {
             stream << commandToDescribe->longDescription();
         } else if (!QbsTool::tryToRunTool(helpCommand->commandToDescribe(),
-                                          QStringList(QLatin1String("--help")))) {
+                                          QStringList(QStringLiteral("--help")))) {
             throw ErrorInfo(Tr::tr("No such command '%1'.\n%2")
                         .arg(helpCommand->commandToDescribe(), d->generalHelp()));
         }
@@ -299,7 +299,7 @@ QString CommandLineParser::commandDescription() const
 
 static QString getBuildConfigurationName(const QVariantMap &buildConfig)
 {
-    return buildConfig.value(QLatin1String("qbs.configurationName")).toString();
+    return buildConfig.value(QStringLiteral("qbs.configurationName")).toString();
 }
 
 QList<QVariantMap> CommandLineParser::buildConfigurations() const
@@ -429,7 +429,7 @@ QString CommandLineParser::CommandLineParserPrivate::generalHelp() const
             const QString whitespace = QString(rhsIndentation - 2 - toolName.size(),
                                                QLatin1Char(' '));
             QbsTool tool;
-            tool.runTool(toolName, QStringList(QLatin1String("--help")));
+            tool.runTool(toolName, QStringList(QStringLiteral("--help")));
             if (tool.exitCode() != 0)
                 continue;
             const QString shortDescription = extractToolDescription(toolName, tool.stdOut());
@@ -480,7 +480,7 @@ void CommandLineParser::CommandLineParserPrivate::setupBuildConfigurations()
     using PropertyListItem = std::pair<QString, QVariantMap>;
     QList<PropertyListItem> propertiesPerConfiguration;
 
-    const QString configurationNameKey = QLatin1String("qbs.configurationName");
+    const QString configurationNameKey = QStringLiteral("qbs.configurationName");
     QString currentConfigurationName;
     QVariantMap currentProperties;
     const auto args = command->additionalArguments();
diff --git a/src/app/qbs/parser/parsercommand.cpp b/src/app/qbs/parser/parsercommand.cpp
index 79636ff0a..22e49b8d7 100644
--- a/src/app/qbs/parser/parsercommand.cpp
+++ b/src/app/qbs/parser/parsercommand.cpp
@@ -196,7 +196,7 @@ QString ResolveCommand::longDescription() const
 
 QString ResolveCommand::representation() const
 {
-    return QLatin1String("resolve");
+    return QStringLiteral("resolve");
 }
 
 static QList<CommandLineOption::Type> resolveOptions()
@@ -235,7 +235,7 @@ QString GenerateCommand::longDescription() const
 
 QString GenerateCommand::representation() const
 {
-    return QLatin1String("generate");
+    return QStringLiteral("generate");
 }
 
 QList<CommandLineOption::Type> GenerateCommand::supportedOptions() const
@@ -266,7 +266,7 @@ QString BuildCommand::longDescription() const
     return description += supportedOptionsDescription();
 }
 
-static QString buildCommandRepresentation() { return QLatin1String("build"); }
+static QString buildCommandRepresentation() { return QStringLiteral("build"); }
 
 QString BuildCommand::representation() const
 {
@@ -312,7 +312,7 @@ QString CleanCommand::longDescription() const
 
 QString CleanCommand::representation() const
 {
-    return QLatin1String("clean");
+    return QStringLiteral("clean");
 }
 
 QList<CommandLineOption::Type> CleanCommand::supportedOptions() const
@@ -349,7 +349,7 @@ QString InstallCommand::longDescription() const
 
 QString InstallCommand::representation() const
 {
-    return QLatin1String("install");
+    return QStringLiteral("install");
 }
 
 QList<CommandLineOption::Type> installOptions()
@@ -368,7 +368,7 @@ QList<CommandLineOption::Type> InstallCommand::supportedOptions() const
 
 QString RunCommand::shortDescription() const
 {
-    return QLatin1String("Run an executable generated by building a project.");
+    return QStringLiteral("Run an executable generated by building a project.");
 }
 
 QString RunCommand::longDescription() const
@@ -386,7 +386,7 @@ QString RunCommand::longDescription() const
 
 QString RunCommand::representation() const
 {
-    return QLatin1String("run");
+    return QStringLiteral("run");
 }
 
 QList<CommandLineOption::Type> RunCommand::supportedOptions() const
@@ -424,7 +424,7 @@ QString ShellCommand::longDescription() const
 
 QString ShellCommand::representation() const
 {
-    return QLatin1String("shell");
+    return QStringLiteral("shell");
 }
 
 QList<CommandLineOption::Type> ShellCommand::supportedOptions() const
@@ -451,7 +451,7 @@ QString StatusCommand::longDescription() const
 
 QString StatusCommand::representation() const
 {
-    return QLatin1String("status");
+    return QStringLiteral("status");
 }
 
 QList<CommandLineOption::Type> StatusCommand::supportedOptions() const
@@ -480,7 +480,7 @@ QString UpdateTimestampsCommand::longDescription() const
 
 QString UpdateTimestampsCommand::representation() const
 {
-    return QLatin1String("update-timestamps");
+    return QStringLiteral("update-timestamps");
 }
 
 QList<CommandLineOption::Type> UpdateTimestampsCommand::supportedOptions() const
@@ -508,7 +508,7 @@ QString DumpNodesTreeCommand::longDescription() const
 
 QString DumpNodesTreeCommand::representation() const
 {
-    return QLatin1String("dump-nodes-tree");
+    return QStringLiteral("dump-nodes-tree");
 }
 
 QList<CommandLineOption::Type> DumpNodesTreeCommand::supportedOptions() const
@@ -532,7 +532,7 @@ QString ListProductsCommand::longDescription() const
 
 QString ListProductsCommand::representation() const
 {
-    return QLatin1String("list-products");
+    return QStringLiteral("list-products");
 }
 
 QList<CommandLineOption::Type> ListProductsCommand::supportedOptions() const
@@ -556,7 +556,7 @@ QString HelpCommand::longDescription() const
 
 QString HelpCommand::representation() const
 {
-    return QLatin1String("help");
+    return QStringLiteral("help");
 }
 
 QList<CommandLineOption::Type> HelpCommand::supportedOptions() const
@@ -587,7 +587,7 @@ QString VersionCommand::longDescription() const
 
 QString VersionCommand::representation() const
 {
-    return QLatin1String("show-version");
+    return QStringLiteral("show-version");
 }
 
 QList<CommandLineOption::Type> VersionCommand::supportedOptions() const
diff --git a/src/app/qbs/qbstool.cpp b/src/app/qbs/qbstool.cpp
index eb70557b6..318b79638 100644
--- a/src/app/qbs/qbstool.cpp
+++ b/src/app/qbs/qbstool.cpp
@@ -47,7 +47,7 @@
 
 #include <iostream>
 
-static QString toolPrefix() { return QLatin1String("qbs-"); }
+static QString toolPrefix() { return QStringLiteral("qbs-"); }
 static QString qbsBinDir() { return QCoreApplication::applicationDirPath(); }
 
 static QString qbsToolFilePath(const QString &toolName)
@@ -93,7 +93,7 @@ QStringList QbsTool::allToolNames()
 {
     const QString suffix = QLatin1String(QBS_HOST_EXE_SUFFIX);
     const QStringList toolFileNames = QDir(qbsBinDir()).entryList(QStringList(toolPrefix()
-            + QString::fromLatin1("*%1").arg(suffix)), QDir::Files, QDir::Name);
+            + QStringLiteral("*%1").arg(suffix)), QDir::Files, QDir::Name);
     QStringList toolNames;
     const int prefixLength = toolPrefix().size();
     for (const QString &toolFileName : toolFileNames) {
diff --git a/src/app/qbs/status.cpp b/src/app/qbs/status.cpp
index 8c235010d..79a75c673 100644
--- a/src/app/qbs/status.cpp
+++ b/src/app/qbs/status.cpp
@@ -56,11 +56,11 @@ static QList<QRegExp> createIgnoreList(const QString &projectRootPath)
 {
     QList<QRegExp> ignoreRegularExpressionList {
         QRegExp(projectRootPath + QLatin1String("/build.*")),
-        QRegExp(QLatin1String("*.qbs"), Qt::CaseSensitive, QRegExp::Wildcard),
-        QRegExp(QLatin1String("*.pro"), Qt::CaseSensitive, QRegExp::Wildcard),
-        QRegExp(QLatin1String("*Makefile"), Qt::CaseSensitive, QRegExp::Wildcard),
-        QRegExp(QLatin1String("*.so*"), Qt::CaseSensitive, QRegExp::Wildcard),
-        QRegExp(QLatin1String("*.o"), Qt::CaseSensitive, QRegExp::Wildcard)
+        QRegExp(QStringLiteral("*.qbs"), Qt::CaseSensitive, QRegExp::Wildcard),
+        QRegExp(QStringLiteral("*.pro"), Qt::CaseSensitive, QRegExp::Wildcard),
+        QRegExp(QStringLiteral("*Makefile"), Qt::CaseSensitive, QRegExp::Wildcard),
+        QRegExp(QStringLiteral("*.so*"), Qt::CaseSensitive, QRegExp::Wildcard),
+        QRegExp(QStringLiteral("*.o"), Qt::CaseSensitive, QRegExp::Wildcard)
     };
     QString ignoreFilePath = projectRootPath + QLatin1String("/.qbsignore");
 
diff --git a/src/app/shared/logging/consolelogger.cpp b/src/app/shared/logging/consolelogger.cpp
index 7639fb111..63b7dc9e3 100644
--- a/src/app/shared/logging/consolelogger.cpp
+++ b/src/app/shared/logging/consolelogger.cpp
@@ -47,10 +47,10 @@
 static QHash<QString, TextColor> setupColorTable()
 {
     QHash<QString, TextColor> colorTable;
-    colorTable[QLatin1String("compiler")] = TextColorDefault;
-    colorTable[QLatin1String("linker")] = TextColorDarkGreen;
-    colorTable[QLatin1String("codegen")] = TextColorDarkYellow;
-    colorTable[QLatin1String("filegen")] = TextColorDarkYellow;
+    colorTable[QStringLiteral("compiler")] = TextColorDefault;
+    colorTable[QStringLiteral("linker")] = TextColorDarkGreen;
+    colorTable[QStringLiteral("codegen")] = TextColorDarkYellow;
+    colorTable[QStringLiteral("filegen")] = TextColorDarkYellow;
     return colorTable;
 }