From 01248c6c63ee2a567bfcd84704dc5cf2410ae280 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 9 Aug 2024 10:25:40 +0200 Subject: [PATCH] Update mime database from Qt qtbase/b45141a4c6020fc20d5f06267c574f37aaf8a494 QMimeDatabasePrivate: pass QLatin1String to QStringBuilder Change-Id: I32446765bf8f492ca6f601e8c8a0577eee9f20e9 Reviewed-by: Jarek Kobus --- src/libs/utils/mimetypes2/mimedatabase.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/utils/mimetypes2/mimedatabase.cpp b/src/libs/utils/mimetypes2/mimedatabase.cpp index 3b1978c6d32..2d6f6b57d46 100644 --- a/src/libs/utils/mimetypes2/mimedatabase.cpp +++ b/src/libs/utils/mimetypes2/mimedatabase.cpp @@ -101,7 +101,7 @@ void MimeDatabasePrivate::loadProviders() const QStringList mimeDirs; #endif const auto fdoIterator = std::find_if(mimeDirs.constBegin(), mimeDirs.constEnd(), [](const QString &mimeDir) -> bool { - return QFileInfo::exists(mimeDir + QStringLiteral("/packages/freedesktop.org.xml")); } + return QFileInfo::exists(mimeDir + QLatin1String("/packages/freedesktop.org.xml")); } ); const bool needInternalDB = MimeXMLProvider::InternalDatabaseAvailable && fdoIterator == mimeDirs.constEnd(); //qDebug() << "mime dirs:" << mimeDirs; @@ -128,7 +128,7 @@ void MimeDatabasePrivate::loadProviders() for (const QString &mimeDir : mimeDirs) { - const QString cacheFile = mimeDir + QStringLiteral("/mime.cache"); + const QString cacheFile = mimeDir + QLatin1String("/mime.cache"); // Check if we already have a provider for this dir const auto predicate = [mimeDir](const std::unique_ptr &prov) {