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

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

Change-Id: Iac01729ad954bb1c7af5867d982eb243b2139ee6

4 files changed, 7 insertions, 9 deletions

diff --git a/src/gui/animation/qguivariantanimation.cpp b/src/gui/animation/qguivariantanimation.cpp
index b72764e048..a5b6d8b95c 100644
--- a/src/gui/animation/qguivariantanimation.cpp
+++ b/src/gui/animation/qguivariantanimation.cpp
@@ -38,8 +38,6 @@
 ****************************************************************************/
 #include <QtGui/qtguiglobal.h>
 
-#ifndef QT_NO_ANIMATION
-
 #include <QtCore/qvariantanimation.h>
 #include <private/qvariantanimation_p.h>
 #include <QtGui/qcolor.h>
@@ -90,5 +88,3 @@ static void qUnregisterGuiGetInterpolator()
 Q_DESTRUCTOR_FUNCTION(qUnregisterGuiGetInterpolator)
 
 QT_END_NAMESPACE
-
-#endif //QT_NO_ANIMATION
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index 759d6f3cbf..06c9cd3939 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -45,7 +45,7 @@ include(painting/painting.pri)
 include(util/util.pri)
 include(math3d/math3d.pri)
 include(opengl/opengl.pri)
-include(animation/animation.pri)
+qtConfig(animation): include(animation/animation.pri)
 include(itemmodels/itemmodels.pri)
 include(vulkan/vulkan.pri)
 
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);
     }
 
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 34f453341f..e5657000cf 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -211,7 +211,7 @@ QInputDeviceManager *QGuiApplicationPrivate::m_inputDeviceManager = 0;
 static qreal fontSmoothingGamma = 1.7;
 
 extern void qRegisterGuiVariant();
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
 extern void qRegisterGuiGetInterpolator();
 #endif
 
@@ -1528,7 +1528,7 @@ void QGuiApplicationPrivate::init()
     // trigger registering of QVariant's GUI types
     qRegisterGuiVariant();
 
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
     // trigger registering of animation interpolators
     qRegisterGuiGetInterpolator();
 #endif