From 4f5f5d75b45ec9db97377485af08d113ec8197f4 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 17 Feb 2015 16:39:29 +0100 Subject: [PATCH] MimeDatabase: Never use installed mime data. It gets in the way, e.g. "No plugin can open project type "application/ x-kicad-project"" when trying to open .pro files. Change-Id: I5d8dcb52b65b1e617fe0c6dfcdc94e2cf8fc5f5d Reviewed-by: Tim Sander Reviewed-by: Eike Ziller --- src/libs/utils/mimetypes/mimeprovider.cpp | 34 +++++++++++------------ 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/libs/utils/mimetypes/mimeprovider.cpp b/src/libs/utils/mimetypes/mimeprovider.cpp index 104c2c727cd..79fc0c07489 100644 --- a/src/libs/utils/mimetypes/mimeprovider.cpp +++ b/src/libs/utils/mimetypes/mimeprovider.cpp @@ -832,27 +832,27 @@ void MimeXMLProvider::setMagicRulesForMimeType(const MimeType &mimeType, const Q void MimeXMLProvider::ensureLoaded() { if (!m_loaded /*|| shouldCheck()*/) { - bool fdoXmlFound = false; +// bool fdoXmlFound = false; QStringList allFiles; - const QStringList packageDirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QLatin1String("mime/packages"), QStandardPaths::LocateDirectory); - //qDebug() << "packageDirs=" << packageDirs; - foreach (const QString &packageDir, packageDirs) { - QDir dir(packageDir); - const QStringList files = dir.entryList(QDir::Files | QDir::NoDotAndDotDot); - //qDebug() << static_cast(this) << Q_FUNC_INFO << packageDir << files; - if (!fdoXmlFound) - fdoXmlFound = files.contains(QLatin1String("freedesktop.org.xml")); - QStringList::const_iterator endIt(files.constEnd()); - for (QStringList::const_iterator it(files.constBegin()); it != endIt; ++it) { - allFiles.append(packageDir + QLatin1Char('/') + *it); - } - } +// const QStringList packageDirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QLatin1String("mime/packages"), QStandardPaths::LocateDirectory); +// //qDebug() << "packageDirs=" << packageDirs; +// foreach (const QString &packageDir, packageDirs) { +// QDir dir(packageDir); +// const QStringList files = dir.entryList(QDir::Files | QDir::NoDotAndDotDot); +// //qDebug() << static_cast(this) << Q_FUNC_INFO << packageDir << files; +// if (!fdoXmlFound) +// fdoXmlFound = files.contains(QLatin1String("freedesktop.org.xml")); +// QStringList::const_iterator endIt(files.constEnd()); +// for (QStringList::const_iterator it(files.constBegin()); it != endIt; ++it) { +// allFiles.append(packageDir + QLatin1Char('/') + *it); +// } +// } - if (!fdoXmlFound) { - // We could instead install the file as part of installing Qt? +// if (!fdoXmlFound) { +// // We could instead install the file as part of installing Qt? allFiles.prepend(QLatin1String(":/qt-project.org/qmime/freedesktop.org.xml")); - } +// } allFiles.append(m_additionalFiles);