4 files changed, 41 insertions, 19 deletions

diff --git a/src/printsupport/kernel/qplatformprintdevice.cpp b/src/printsupport/kernel/qplatformprintdevice.cpp
index 69d984cb0c..3d76cad688 100644
--- a/src/printsupport/kernel/qplatformprintdevice.cpp
+++ b/src/printsupport/kernel/qplatformprintdevice.cpp
@@ -40,10 +40,8 @@
 #include "qplatformprintdevice.h"
 
 #include "qprintdevice_p.h"
-#if QT_CONFIG(printdialog)
-#include "qprintdialog.h"
-#endif
 
+#include <QtCore/qcoreapplication.h>
 #include <QtGui/qpagelayout.h>
 
 QT_BEGIN_NAMESPACE
@@ -165,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;
         }
@@ -173,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;
         }
@@ -188,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;
     }
@@ -202,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;
     }
@@ -235,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;
     }
@@ -291,11 +289,7 @@ QPrint::InputSlot QPlatformPrintDevice::defaultInputSlot() const
 {
     QPrint::InputSlot input;
     input.key = QByteArrayLiteral("Auto");
-#if QT_CONFIG(printdialog)
-    input.name = QPrintDialog::tr("Automatic");
-#else
-    input.name = QString::fromLatin1("Automatic");
-#endif
+    input.name = QCoreApplication::translate("Print Device Input Slot", "Automatic");
     input.id = QPrint::Auto;
     return input;
 }
@@ -315,11 +309,7 @@ QPrint::OutputBin QPlatformPrintDevice::defaultOutputBin() const
 {
     QPrint::OutputBin output;
     output.key = QByteArrayLiteral("Auto");
-#if QT_CONFIG(printdialog)
-    output.name = QPrintDialog::tr("Automatic");
-#else
-    output.name = QString::fromLatin1("Automatic");
-#endif
+    output.name = QCoreApplication::translate("Print Device Output Bin", "Automatic");
     output.id = QPrint::AutoOutputBin;
     return output;
 }
diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp
index 829a13863b..ddcd8c4702 100644
--- a/src/printsupport/kernel/qprinter.cpp
+++ b/src/printsupport/kernel/qprinter.cpp
@@ -1848,7 +1848,7 @@ QList<int> QPrinter::supportedResolutions() const
         = d->printEngine->property(QPrintEngine::PPK_SupportedResolutions).toList();
     QList<int> intlist;
     intlist.reserve(varlist.size());
-    for (auto var : varlist)
+    for (const auto &var : varlist)
         intlist << var.toInt();
     return intlist;
 }
diff --git a/src/printsupport/kernel/qprinterinfo.cpp b/src/printsupport/kernel/qprinterinfo.cpp
index 4b092dee64..167b2361ef 100644
--- a/src/printsupport/kernel/qprinterinfo.cpp
+++ b/src/printsupport/kernel/qprinterinfo.cpp
@@ -400,6 +400,35 @@ QList<QPrinter::DuplexMode> QPrinterInfo::supportedDuplexModes() const
 }
 
 /*!
+    Returns the default color mode of this printer.
+
+    \since 5.13
+*/
+
+QPrinter::ColorMode QPrinterInfo::defaultColorMode() const
+{
+    Q_D(const QPrinterInfo);
+    return QPrinter::ColorMode(d->m_printDevice.defaultColorMode());
+}
+
+/*!
+    Returns the supported color modes of this printer.
+
+    \since 5.13
+*/
+
+QList<QPrinter::ColorMode> QPrinterInfo::supportedColorModes() const
+{
+    Q_D(const QPrinterInfo);
+    QList<QPrinter::ColorMode> list;
+    const auto supportedColorModes = d->m_printDevice.supportedColorModes();
+    list.reserve(supportedColorModes.size());
+    for (QPrint::ColorMode mode : supportedColorModes)
+        list << QPrinter::ColorMode(mode);
+    return list;
+}
+
+/*!
     Returns a list of all the available Printer Names on this system.
 
     It is recommended to use this instead of availablePrinters() as
diff --git a/src/printsupport/kernel/qprinterinfo.h b/src/printsupport/kernel/qprinterinfo.h
index 8bac395ab3..7195cb76b5 100644
--- a/src/printsupport/kernel/qprinterinfo.h
+++ b/src/printsupport/kernel/qprinterinfo.h
@@ -93,6 +93,9 @@ public:
     QPrinter::DuplexMode defaultDuplexMode() const;
     QList<QPrinter::DuplexMode> supportedDuplexModes() const;
 
+    QPrinter::ColorMode defaultColorMode() const;
+    QList<QPrinter::ColorMode> supportedColorModes() const;
+
     static QStringList availablePrinterNames();
     static QList<QPrinterInfo> availablePrinters();