1 files changed, 29 insertions, 51 deletions

diff --git a/src/plugins/printsupport/cups/qppdprintdevice.cpp b/src/plugins/printsupport/cups/qppdprintdevice.cpp
index 340b1a1ff4..d2ddc4144f 100644
--- a/src/plugins/printsupport/cups/qppdprintdevice.cpp
+++ b/src/plugins/printsupport/cups/qppdprintdevice.cpp
@@ -50,13 +50,6 @@
 
 QT_BEGIN_NAMESPACE
 
-QPpdPrintDevice::QPpdPrintDevice()
-    : QPlatformPrintDevice(),
-      m_cupsDest(0),
-      m_ppd(0)
-{
-}
-
 QPpdPrintDevice::QPpdPrintDevice(const QString &id)
     : QPlatformPrintDevice(id),
       m_cupsDest(0),
@@ -69,9 +62,26 @@ QPpdPrintDevice::QPpdPrintDevice(const QString &id)
         m_cupsName = parts.at(0).toUtf8();
         if (parts.size() > 1)
             m_cupsInstance = parts.at(1).toUtf8();
-        loadPrinter();
 
-        if (m_cupsDest && m_ppd) {
+        // Get the print instance and PPD file
+        m_cupsDest = cupsGetNamedDest(CUPS_HTTP_DEFAULT, m_cupsName, m_cupsInstance.isNull() ? nullptr : m_cupsInstance.constData());
+        if (m_cupsDest) {
+            const char *ppdFile = cupsGetPPD(m_cupsName);
+            if (ppdFile) {
+                m_ppd = ppdOpenFile(ppdFile);
+                unlink(ppdFile);
+            }
+            if (m_ppd) {
+                ppdMarkDefaults(m_ppd);
+                cupsMarkOptions(m_ppd, m_cupsDest->num_options, m_cupsDest->options);
+                ppdLocalize(m_ppd);
+
+                m_minimumPhysicalPageSize = QSize(m_ppd->custom_min[0], m_ppd->custom_min[1]);
+                m_maximumPhysicalPageSize = QSize(m_ppd->custom_max[0], m_ppd->custom_max[1]);
+                m_customMargins = QMarginsF(m_ppd->custom_margins[0], m_ppd->custom_margins[3],
+                                            m_ppd->custom_margins[2], m_ppd->custom_margins[1]);
+            }
+
             m_name = printerOption("printer-info");
             m_location = printerOption("printer-location");
             m_makeAndModel = printerOption("printer-make-and-model");
@@ -87,10 +97,6 @@ QPpdPrintDevice::QPpdPrintDevice(const QString &id)
             // Cups ppd_file_t variable_sizes custom_min custom_max
             // PPD MaxMediaWidth MaxMediaHeight
             m_supportsCustomPageSizes = type & CUPS_PRINTER_VARIABLE;
-            m_minimumPhysicalPageSize = QSize(m_ppd->custom_min[0], m_ppd->custom_min[1]);
-            m_maximumPhysicalPageSize = QSize(m_ppd->custom_max[0], m_ppd->custom_max[1]);
-            m_customMargins = QMarginsF(m_ppd->custom_margins[0], m_ppd->custom_margins[3],
-                                        m_ppd->custom_margins[2], m_ppd->custom_margins[1]);
         }
     }
 }
@@ -107,7 +113,7 @@ QPpdPrintDevice::~QPpdPrintDevice()
 
 bool QPpdPrintDevice::isValid() const
 {
-    return m_cupsDest && m_ppd;
+    return m_cupsDest;
 }
 
 bool QPpdPrintDevice::isDefault() const
@@ -152,8 +158,8 @@ void QPpdPrintDevice::loadPageSizes() const
                 }
             }
         }
-        m_havePageSizes = true;
     }
+    m_havePageSizes = true;
 }
 
 QPageSize QPpdPrintDevice::defaultPageSize() const
@@ -359,14 +365,18 @@ void QPpdPrintDevice::loadDuplexModes() const
         ppd_option_t *duplexModes = ppdFindOption(m_ppd, "Duplex");
         if (duplexModes) {
             m_duplexModes.reserve(duplexModes->num_choices);
-            for (int i = 0; i < duplexModes->num_choices; ++i)
-                m_duplexModes.append(QPrintUtils::ppdChoiceToDuplexMode(duplexModes->choices[i].choice));
+            for (int i = 0; i < duplexModes->num_choices; ++i) {
+                if (ppdInstallableConflict(m_ppd, duplexModes->keyword, duplexModes->choices[i].choice) == 0) {
+                    m_duplexModes.append(QPrintUtils::ppdChoiceToDuplexMode(duplexModes->choices[i].choice));
+                }
+            }
         }
         // If no result, try just the default
         if (m_duplexModes.size() == 0) {
             duplexModes = ppdFindOption(m_ppd, "DefaultDuplex");
-            if (duplexModes)
+            if (duplexModes && (ppdInstallableConflict(m_ppd, duplexModes->keyword, duplexModes->choices[0].choice) == 0)) {
                 m_duplexModes.append(QPrintUtils::ppdChoiceToDuplexMode(duplexModes->choices[0].choice));
+            }
         }
     }
     // If still no result, or not added in PPD, then add None
@@ -417,7 +427,7 @@ QPrint::ColorMode QPpdPrintDevice::defaultColorMode() const
         ppd_option_t *colorModel = ppdFindOption(m_ppd, "DefaultColorModel");
         if (!colorModel)
             colorModel = ppdFindOption(m_ppd, "ColorModel");
-        if (!colorModel || (colorModel && !qstrcmp(colorModel->defchoice, "Gray")))
+        if (!colorModel || qstrcmp(colorModel->defchoice, "Gray") != 0)
             return QPrint::Color;
     }
     return QPrint::GrayScale;
@@ -481,38 +491,6 @@ void QPpdPrintDevice::loadMimeTypes() const
 }
 #endif
 
-void QPpdPrintDevice::loadPrinter()
-{
-    // Just to be safe, check if existing printer needs closing
-    if (m_ppd) {
-        ppdClose(m_ppd);
-        m_ppd = 0;
-    }
-    if (m_cupsDest) {
-        cupsFreeDests(1, m_cupsDest);
-        m_cupsDest = 0;
-    }
-
-    // Get the print instance and PPD file
-    m_cupsDest = cupsGetNamedDest(CUPS_HTTP_DEFAULT, m_cupsName, m_cupsInstance.isNull() ? nullptr : m_cupsInstance.constData());
-    if (m_cupsDest) {
-        const char *ppdFile = cupsGetPPD(m_cupsName);
-        if (ppdFile) {
-            m_ppd = ppdOpenFile(ppdFile);
-            unlink(ppdFile);
-        }
-        if (m_ppd) {
-            ppdMarkDefaults(m_ppd);
-            cupsMarkOptions(m_ppd, m_cupsDest->num_options, m_cupsDest->options);
-            ppdLocalize(m_ppd);
-        } else {
-            cupsFreeDests(1, m_cupsDest);
-            m_cupsDest = 0;
-            m_ppd = 0;
-        }
-    }
-}
-
 QString QPpdPrintDevice::printerOption(const QString &key) const
 {
     return cupsGetOption(key.toUtf8(), m_cupsDest->num_options, m_cupsDest->options);