feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Update mime database from Qt

Browse Source 
qtbase/b45141a4c6020fc20d5f06267c574f37aaf8a494
  QMimeDatabasePrivate: pass QLatin1String to QStringBuilder

Change-Id: I32446765bf8f492ca6f601e8c8a0577eee9f20e9
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Eike Ziller
2024-08-09 10:25:40 +02:00
parent 2bb76fe034
commit 01248c6c63
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/mimetypes2/mimedatabase.cpp
View File

@@ -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<MimeProviderBase> &prov)
{