aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/utils/mimetypes/mimeprovider.cpp
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@theqtcompany.com>2015-02-17 16:39:29 +0100
committerEike Ziller <eike.ziller@theqtcompany.com>2015-02-17 15:55:02 +0000
commit4f5f5d75b45ec9db97377485af08d113ec8197f4 (patch)
treee0e8d3336ba26c5d8c1c220bd2a7bb93b1140ae0 /src/libs/utils/mimetypes/mimeprovider.cpp
parent0e39023cb05b947e12cd8de984ae80e5c99a4d6c (diff)
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 <tim@krieglstein.org> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src/libs/utils/mimetypes/mimeprovider.cpp')
-rw-r--r--src/libs/utils/mimetypes/mimeprovider.cpp34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/libs/utils/mimetypes/mimeprovider.cpp b/src/libs/utils/mimetypes/mimeprovider.cpp
index 104c2c727c..79fc0c0748 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<const void *>(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<const void *>(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);