From 9cf8ab3b3d44ac50a1f8d4893d8f70b8aedb18b0 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 17 Jan 2018 14:15:50 +0100 Subject: [PATCH] Fix mime type detection for Qt 5.11 Add an #ifdef for the changed path to the QtCore resource following qtbase/7a5644d6481a3c1a7416772998ca4e60c977bfbd. Task-number: QTCREATORBUG-19600 Change-Id: I8fa8bbf9a7ec91ca569f65671eaab1798b129981 Reviewed-by: Eike Ziller --- src/libs/utils/mimetypes/mimeprovider.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/libs/utils/mimetypes/mimeprovider.cpp b/src/libs/utils/mimetypes/mimeprovider.cpp index 68f69a2ed22..151da054586 100644 --- a/src/libs/utils/mimetypes/mimeprovider.cpp +++ b/src/libs/utils/mimetypes/mimeprovider.cpp @@ -802,7 +802,12 @@ void MimeXMLProvider::ensureLoaded() // if (!fdoXmlFound) { // // We could instead install the file as part of installing Qt? - allFiles.prepend(QLatin1String(":/qt-project.org/qmime/freedesktop.org.xml")); +#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)) + const char freedesktopOrgXml[] = ":/qt-project.org/qmime/packages/freedesktop.org.xml"; +#else + const char freedesktopOrgXml[] = ":/qt-project.org/qmime/freedesktop.org.xml"; +#endif + allFiles.prepend(QLatin1String(freedesktopOrgXml)); // } m_nameMimeTypeMap.clear();