diff options
author | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-03-09 21:26:01 +0100 |
---|---|---|
committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2022-03-26 01:44:05 +0100 |
commit | b6251958932be5966258f362dc9bb7c7475d2d0a (patch) | |
tree | 2b2dc46c0d097fca15bcc9e2701682919921c339 /src/corelib/global/qlibraryinfo.cpp | |
parent | 73a03a0c298461aa15d7c2757bc0b6444e5dc3dc (diff) |
QtCore: Replace remaining uses of QLatin1String with QLatin1StringView
Task-number: QTBUG-98434
Change-Id: Ib7c5fc0aaca6ef33b93c7486e99502c555bf20bc
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'src/corelib/global/qlibraryinfo.cpp')
-rw-r--r-- | src/corelib/global/qlibraryinfo.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 1a540d40f7..8e9da7a2a5 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -148,7 +148,7 @@ static QSettings *findConfiguration() #endif if (QCoreApplication::instance()) { QDir pwd(QCoreApplication::applicationDirPath()); - qtconfig = pwd.filePath(QLatin1String("qt" QT_STRINGIFY(QT_VERSION_MAJOR) ".conf")); + qtconfig = pwd.filePath(u"qt" QT_STRINGIFY(QT_VERSION_MAJOR) ".conf"_qs); if (QFile::exists(qtconfig)) return new QSettings(qtconfig, QSettings::IniFormat); qtconfig = pwd.filePath("qt.conf"_L1); @@ -529,14 +529,14 @@ QLibraryInfoPrivate::LocationInfo QLibraryInfoPrivate::locationInfo(QLibraryInfo LocationInfo result; if (int(loc) < qtConfEntries.count()) { - result.key = QLatin1String(qtConfEntries.viewAt(loc * 2)); - result.defaultValue = QLatin1String(qtConfEntries.viewAt(loc * 2 + 1)); + result.key = QLatin1StringView(qtConfEntries.viewAt(loc * 2)); + result.defaultValue = QLatin1StringView(qtConfEntries.viewAt(loc * 2 + 1)); if (result.key == u"QmlImports") result.fallbackKey = u"Qml2Imports"_qs; #ifndef Q_OS_WIN // On Windows we use the registry } else if (loc == QLibraryInfo::SettingsPath) { result.key = "Settings"_L1; - result.defaultValue = QLatin1String(dot); + result.defaultValue = QLatin1StringView(dot); #endif } |