From 8b17f10cd45615f61ff4dda93dc300a9ad0dda38 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 24 Feb 2015 10:36:32 +0100 Subject: MimeDatabase: Fix remaining problems with overriding mime types If mime info is requested during Qt Creator's initialization cycle, the mime files might be parsed before all custom types are registered. To ensure that custom mime types override the built-in ones we must force a complete reload after they are registered. Change-Id: I94032a5efe1bbc22885cbeb1f43080270c23381c Task-number: QTCREATORBUG-13995 Reviewed-by: Christian Stenger --- src/libs/utils/mimetypes/mimeprovider.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/libs/utils/mimetypes/mimeprovider.cpp b/src/libs/utils/mimetypes/mimeprovider.cpp index 8aad4fae07..a27cd11ea7 100644 --- a/src/libs/utils/mimetypes/mimeprovider.cpp +++ b/src/libs/utils/mimetypes/mimeprovider.cpp @@ -956,8 +956,5 @@ void MimeXMLProvider::addMagicMatcher(const MimeMagicRuleMatcher &matcher) void MimeXMLProvider::addFile(const QString &filePath) { m_additionalFiles.append(filePath); - if (m_loaded) { - m_allFiles.append(filePath); - load(filePath); - } // else: will be loaded in ensureLoaded() + m_loaded = false; // force reload to ensure correct load order for overridden mime types } -- cgit v1.2.3