8 files changed, 75 insertions, 75 deletions

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");