diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-17 10:35:28 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-17 10:35:28 +0200 |
| commit | ccf26f6a88e116abdf8e53acdc02dbd98a4a8dc4 (patch) | |
| tree | 40aaca99471edc709d38e6f82153576bad86747f /src/corelib/mimetypes/qmimedatabase.cpp | |
| parent | 8ff1ae89bfa32c586e3b44b71dfc49d294a3e043 (diff) | |
| parent | 3eebadc1734463afa469dcd08eab8c5d2557dec6 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/plugins/platformthemes/platformthemes.pro
src/printsupport/kernel/qplatformprintdevice.cpp
Change-Id: Iac01729ad954bb1c7af5867d982eb243b2139ee6
Diffstat (limited to 'src/corelib/mimetypes/qmimedatabase.cpp')
| -rw-r--r-- | src/corelib/mimetypes/qmimedatabase.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/mimetypes/qmimedatabase.cpp b/src/corelib/mimetypes/qmimedatabase.cpp index 35ea579767..bfe9be559a 100644 --- a/src/corelib/mimetypes/qmimedatabase.cpp +++ b/src/corelib/mimetypes/qmimedatabase.cpp @@ -40,8 +40,6 @@ #include <qplatformdefs.h> // always first -#ifndef QT_NO_MIMETYPE - #include "qmimedatabase.h" #include "qmimedatabase_p.h" @@ -797,5 +795,3 @@ QList<QMimeType> QMimeDatabase::allMimeTypes() const */ QT_END_NAMESPACE - -#endif // QT_NO_MIMETYPE |