feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix mime type detection for Qt 5.11

Browse Source 
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 <eike.ziller@qt.io>
This commit is contained in:
Friedemann Kleint
2018-01-17 14:15:50 +01:00
parent 205387ad06
commit 9cf8ab3b3d
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/utils/mimetypes/mimeprovider.cpp
View File

@@ -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();