1 files changed, 28 insertions, 4 deletions

diff --git a/src/printsupport/kernel/qprintengine_pdf.cpp b/src/printsupport/kernel/qprintengine_pdf.cpp
index daf5010feb..3e50247186 100644
--- a/src/printsupport/kernel/qprintengine_pdf.cpp
+++ b/src/printsupport/kernel/qprintengine_pdf.cpp
@@ -104,7 +104,14 @@ void QPdfPrintEngine::setProperty(PrintEnginePropertyKey key, const QVariant &va
         d->collate = value.toBool();
         break;
     case PPK_ColorMode:
-        d->grayscale = (QPrinter::ColorMode(value.toInt()) == QPrinter::GrayScale);
+        switch (QPrinter::ColorMode(value.toInt())) {
+        case QPrinter::GrayScale:
+            d->colorModel = QPdfEngine::ColorModel::Grayscale;
+            break;
+        case QPrinter::Color:
+            d->colorModel = QPdfEngine::ColorModel::Auto;
+            break;
+        }
         break;
     case PPK_Creator:
         d->creator = value.toString();
@@ -177,7 +184,8 @@ void QPdfPrintEngine::setProperty(PrintEnginePropertyKey key, const QVariant &va
         Q_ASSERT(margins.size() == 4);
         d->m_pageLayout.setUnits(QPageLayout::Point);
         d->m_pageLayout.setMargins(QMarginsF(margins.at(0).toReal(), margins.at(1).toReal(),
-                                             margins.at(2).toReal(), margins.at(3).toReal()));
+                                             margins.at(2).toReal(), margins.at(3).toReal()),
+                                   QPageLayout::OutOfBoundsPolicy::Clamp);
         break;
     }
     case PPK_QPageSize: {
@@ -189,7 +197,7 @@ void QPdfPrintEngine::setProperty(PrintEnginePropertyKey key, const QVariant &va
     case PPK_QPageMargins: {
         QPair<QMarginsF, QPageLayout::Unit> pair = qvariant_cast<QPair<QMarginsF, QPageLayout::Unit> >(value);
         d->m_pageLayout.setUnits(pair.second);
-        d->m_pageLayout.setMargins(pair.first);
+        d->m_pageLayout.setMargins(pair.first, QPageLayout::OutOfBoundsPolicy::Clamp);
         break;
     }
     case PPK_QPageLayout: {
@@ -221,7 +229,7 @@ QVariant QPdfPrintEngine::property(PrintEnginePropertyKey key) const
         ret = d->collate;
         break;
     case PPK_ColorMode:
-        ret = d->grayscale ? QPrinter::GrayScale : QPrinter::Color;
+        ret = d->printerColorMode();
         break;
     case PPK_Creator:
         ret = d->creator;
@@ -367,6 +375,22 @@ QPdfPrintEnginePrivate::~QPdfPrintEnginePrivate()
 {
 }
 
+QPrinter::ColorMode QPdfPrintEnginePrivate::printerColorMode() const
+{
+    switch (colorModel) {
+    case QPdfEngine::ColorModel::RGB:
+    case QPdfEngine::ColorModel::CMYK:
+    case QPdfEngine::ColorModel::Auto:
+        return QPrinter::Color;
+    case QPdfEngine::ColorModel::Grayscale:
+        return QPrinter::GrayScale;
+    }
+
+    Q_UNREACHABLE();
+    return QPrinter::Color;
+}
+
+
 QT_END_NAMESPACE
 
 #endif // QT_NO_PRINTER