diff options
Diffstat (limited to 'src/app/qbs-setup-android/android-setup.cpp')
| -rw-r--r-- | src/app/qbs-setup-android/android-setup.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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, |