Changeset 782 for trunk/src

Timestamp:

Aug 11, 2010, 3:16:44 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Send PDF data to a CUPS printer on OS/2 by default if CUPS is version 1.4.4 or above (where printing PDF data was fixed).

File:

• trunk/src/gui/painting/qprinter.cpp (modified) (2 diffs)

trunk/src/gui/painting/qprinter.cpp

@@ -666 +666 @@
     d->realPaintEngine = 0;
 
-    // Note: On OS/2, sending PDF data doesn't yet work with the current eCUPS
-    // (which is version 1.3.11 of CUPS), so don't force the PDF format there
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY) && !defined(Q_WS_PM)
+#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined(Q_WS_PM))
+    // Note: On OS/2, sending PDF data to eCUPS only works starting from
+    // version 1.4.4 of CUPS
+#if defined(Q_WS_PM)
+    if (QCUPSSupport::cupsVersion() >= 10404 && QCUPSSupport().currentPPD()) {
+#else
     if (QCUPSSupport::cupsVersion() >= 10200 && QCUPSSupport().currentPPD()) {
+
         setOutputFormat(QPrinter::PdfFormat);
         d->outputFormat = QPrinter::NativeFormat;
@@ -825 +829 @@
     ABORT_IF_ACTIVE("QPrinter::setPrinterName");
 
-#if defined(Q_OS_UNIX) && !defined(QT_NO_CUPS)
+#if ) && !defined(QT_NO_CUPS)
     if(d->use_default_engine
         && d->outputFormat == QPrinter::NativeFormat) {
-        // Note: On OS/2, sending PDF data doesn't yet work with the current eCUPS
-        // (which is version 1.3.11 of CUPS), so don't force the PDF format there
-#ifndef Q_WS_PM
+        // Note: On OS/2, sending PDF data to eCUPS only works starting from
+        // version 1.4.4 of CUPS
+#if defined(Q_WS_PM)
+        if (QCUPSSupport::cupsVersion() >= 10404
+#else
         if (QCUPSSupport::cupsVersion() >= 10200
+
             && QCUPSSupport::printerHasPPD(name.toLocal8Bit().constData()))
             setOutputFormat(QPrinter::PdfFormat);
         else
-#endif
             setOutputFormat(QPrinter::PostScriptFormat);
         d->outputFormat = QPrinter::NativeFormat;