Merge remote-tracking branch 'origin/5.11' into 5.12

 Conflicts:
	src/plugins/platformthemes/platformthemes.pro
	src/printsupport/kernel/qplatformprintdevice.cpp

Change-Id: Iac01729ad954bb1c7af5867d982eb243b2139ee6

1 files changed, 4 insertions, 2 deletions

diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index 14a0248600..c362d0dc3f 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -47,8 +47,10 @@
 #include "private/qiconloader_p.h"
 #include "qpainter.h"
 #include "qfileinfo.h"
+#if QT_CONFIG(mimetype)
 #include <qmimedatabase.h>
 #include <qmimetype.h>
+#endif
 #include "qpixmapcache.h"
 #include "qvariant.h"
 #include "qcache.h"
@@ -1079,10 +1081,10 @@ void QIcon::addFile(const QString &fileName, const QSize &size, Mode mode, State
 
         QFileInfo info(fileName);
         QIconEngine *engine = iconEngineFromSuffix(fileName, info.suffix());
-#ifndef QT_NO_MIMETYPE
+#if QT_CONFIG(mimetype)
         if (!engine)
             engine = iconEngineFromSuffix(fileName, QMimeDatabase().mimeTypeForFile(info).preferredSuffix());
-#endif // !QT_NO_MIMETYPE
+#endif // mimetype
         d = new QIconPrivate(engine ? engine : new QPixmapIconEngine);
     }