1 files changed, 10 insertions, 8 deletions
diff --git a/src/printsupport/kernel/qplatformprintdevice.cpp b/src/printsupport/kernel/qplatformprintdevice.cpp
index d8d568d6fa..3d76cad688 100644
--- a/src/printsupport/kernel/qplatformprintdevice.cpp
+++ b/src/printsupport/kernel/qplatformprintdevice.cpp
@@ -60,7 +60,7 @@ QPlatformPrintDevice::QPlatformPrintDevice(const QString &id)
       m_haveOutputBins(false),
       m_haveDuplexModes(false),
       m_haveColorModes(false)
-#ifndef QT_NO_MIMETYPE
+#if QT_CONFIG(mimetype)
     , m_haveMimeTypes(false)
 #endif
 {
@@ -163,7 +163,7 @@ QPageSize QPlatformPrintDevice::supportedPageSize(const QPageSize &pageSize) con
     // e.g. Windows defines DMPAPER_11X17 and DMPAPER_TABLOID with names "11x17" and "Tabloid", but both
     // map to QPageSize::Tabloid / PPD Key "Tabloid" / ANSI B Tabloid
     if (pageSize.id() != QPageSize::Custom) {
-        for (const QPageSize &ps : m_pageSizes) {
+        for (const QPageSize &ps : qAsConst(m_pageSizes)) {
             if (ps.id() == pageSize.id() && ps.name() == pageSize.name())
                 return ps;
         }
@@ -171,7 +171,7 @@ QPageSize QPlatformPrintDevice::supportedPageSize(const QPageSize &pageSize) con
 
     // Next try match on id only if not custom
     if (pageSize.id() != QPageSize::Custom) {
-        for (const QPageSize &ps : m_pageSizes) {
+        for (const QPageSize &ps : qAsConst(m_pageSizes)) {
             if (ps.id() == pageSize.id())
                 return ps;
         }
@@ -186,7 +186,7 @@ QPageSize QPlatformPrintDevice::supportedPageSize(QPageSize::PageSizeId pageSize
     if (!m_havePageSizes)
         loadPageSizes();
 
-    for (const QPageSize &ps : m_pageSizes) {
+    for (const QPageSize &ps : qAsConst(m_pageSizes)) {
         if (ps.id() == pageSizeId)
             return ps;
     }
@@ -200,7 +200,7 @@ QPageSize QPlatformPrintDevice::supportedPageSize(const QString &pageName) const
     if (!m_havePageSizes)
         loadPageSizes();
 
-    for (const QPageSize &ps : m_pageSizes) {
+    for (const QPageSize &ps : qAsConst(m_pageSizes)) {
         if (ps.name() == pageName)
             return ps;
     }
@@ -233,7 +233,7 @@ QPageSize QPlatformPrintDevice::supportedPageSizeMatch(const QPageSize &pageSize
         return pageSize;
 
     // Try to find a supported page size based on point size
-    for (const QPageSize &ps : m_pageSizes) {
+    for (const QPageSize &ps : qAsConst(m_pageSizes)) {
         if (ps.sizePoints() == pageSize.sizePoints())
             return ps;
     }
@@ -353,10 +353,11 @@ QVector<QPrint::ColorMode> QPlatformPrintDevice::supportedColorModes() const
     return m_colorModes;
 }
 
-#ifndef QT_NO_MIMETYPE
+#if QT_CONFIG(mimetype)
 void QPlatformPrintDevice::loadMimeTypes() const
 {
 }
+#endif // mimetype
 
 QVariant QPlatformPrintDevice::property(QPrintDevice::PrintDevicePropertyKey key) const
 {
@@ -381,13 +382,14 @@ bool QPlatformPrintDevice::isFeatureAvailable(QPrintDevice::PrintDevicePropertyK
     return false;
 }
 
+#if QT_CONFIG(mimetype)
 QList<QMimeType> QPlatformPrintDevice::supportedMimeTypes() const
 {
     if (!m_haveMimeTypes)
         loadMimeTypes();
     return m_mimeTypes;
 }
-#endif // QT_NO_MIMETYPE
+#endif // mimetype
 
 QPageSize QPlatformPrintDevice::createPageSize(const QString &key, const QSize &size, const QString &localizedName)
 {