diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-17 14:15:50 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-17 13:50:34 +0000 |
| commit | 9cf8ab3b3d44ac50a1f8d4893d8f70b8aedb18b0 (patch) | |
| tree | e54738598860ee18fa17e8706d86b3f275bbe9f6 | |
| parent | 205387ad0695eece1102d7e06e9308f2fc510f3d (diff) | |
| download | qt-creator-9cf8ab3b3d44ac50a1f8d4893d8f70b8aedb18b0.tar.gz | |
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 <eike.ziller@qt.io>
| -rw-r--r-- | src/libs/utils/mimetypes/mimeprovider.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/libs/utils/mimetypes/mimeprovider.cpp b/src/libs/utils/mimetypes/mimeprovider.cpp index 68f69a2ed2..151da05458 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(); |