Changeset 573 for trunk/src/gui/painting/qprinter.cpp

Timestamp:

Feb 17, 2010, 8:53:20 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Implemented support for printing through CUPS on OS/2.

File:

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

trunk/src/gui/painting/qprinter.cpp

@@ -48 +48 @@
 #include <qapplication.h>
 #include <qfileinfo.h>
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_CUPS) && )
 #include "private/qcups_p.h"
 #endif
@@ -184 +184 @@
     QPrinter::OutputFormat realOutputFormat = outputFormat;
 #if !defined (QTOPIA_PRINTENGINE)
-#if defined (Q_OS_UNIX) && ! defined (Q_WS_MAC)
+#if )
     if(outputFormat == QPrinter::NativeFormat) {
         realOutputFormat = QPrinter::PostScriptFormat;
@@ -205 +205 @@
         paintEngine = qwsEngine;
         printEngine = qwsEngine;
-#elif defined (Q_OS_UNIX)
+#elif defined (Q_OS_UNIX)
         Q_ASSERT(false);
 #endif
@@ -665 +665 @@
     d->realPaintEngine = 0;
 
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+    // 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 (QCUPSSupport::cupsVersion() >= 10200 && QCUPSSupport().currentPPD()) {
         setOutputFormat(QPrinter::PdfFormat);
@@ -825 +827 @@
     if(d->use_default_engine
         && d->outputFormat == QPrinter::NativeFormat) {
+
+
+
         if (QCUPSSupport::cupsVersion() >= 10200
             && QCUPSSupport::printerHasPPD(name.toLocal8Bit().constData()))
             setOutputFormat(QPrinter::PdfFormat);
         else
+
             setOutputFormat(QPrinter::PostScriptFormat);
         d->outputFormat = QPrinter::NativeFormat;