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/b330016cf25ed4eae95958213b746d718ac644d2
  QMimeDatabasePrivate: deduplicate QStandardPaths uses

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

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

@@ -74,6 +74,11 @@ bool MimeDatabasePrivate::shouldCheck()
return m_forceLoad; return m_forceLoad;
} }
static QStringList locateMimeDirectories()
{
return QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("mime"), QStandardPaths::LocateDirectory);
}
#if defined(Q_OS_UNIX) && !defined(Q_OS_NACL) && !defined(Q_OS_INTEGRITY) #if defined(Q_OS_UNIX) && !defined(Q_OS_NACL) && !defined(Q_OS_INTEGRITY)
# define QT_USE_MMAP # define QT_USE_MMAP
#endif #endif
@@ -104,7 +109,7 @@ void MimeDatabasePrivate::loadProviders()
NANOTRACE_SCOPE("Utils", "MimeDatabasePrivate::loadProviders"); NANOTRACE_SCOPE("Utils", "MimeDatabasePrivate::loadProviders");
#if 0 #if 0
// We use QStandardPaths every time to check if new files appeared // We use QStandardPaths every time to check if new files appeared
const QStringList mimeDirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("mime"), QStandardPaths::LocateDirectory); const QStringList mimeDirs = locateMimeDirectories();
#else #else
// Qt Creator never uses the standard paths, they can conflict with our setup // Qt Creator never uses the standard paths, they can conflict with our setup
const QStringList mimeDirs; const QStringList mimeDirs;
@@ -270,7 +275,7 @@ void MimeDatabasePrivate::loadMimeTypePrivate(MimeTypePrivate &mimePrivate)
const QString file = mimePrivate.name + QLatin1String(".xml"); const QString file = mimePrivate.name + QLatin1String(".xml");
qWarning() << "No file found for" << file << ", even though update-mime-info said it would exist.\n" qWarning() << "No file found for" << file << ", even though update-mime-info said it would exist.\n"
"Either it was just removed, or the directory doesn't have executable permission..." "Either it was just removed, or the directory doesn't have executable permission..."
<< QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("mime"), QStandardPaths::LocateDirectory); << locateMimeDirectories();
} }
mimePrivate.loaded = true; mimePrivate.loaded = true;
} }