Changeset 573 for trunk/src/gui/painting/qpdf.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/qpdf.cpp (modified) (9 diffs)

trunk/src/gui/painting/qpdf.cpp

@@ -941 +941 @@
 {
     Q_D(QPdfBaseEngine);
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined(Q_WS_PM))
     if (QCUPSSupport::isAvailable()) {
         QCUPSSupport cups;
@@ -1506 +1506 @@
         break;
     case PPK_NumberOfCopies:
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined(Q_WS_PM))
         if (QCUPSSupport::isAvailable())
             ret = 1;
@@ -1673 +1673 @@
         }
         outDevice = file;
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined(Q_WS_PM))
     } else if (QCUPSSupport::isAvailable()) {
         QCUPSSupport cups;
@@ -1691 +1691 @@
             pr = printerName;
         int fds[2];
+#ifdef Q_WS_PM
+        if (::pipe(fds) != 0) {
+#else
         if (qt_safe_pipe(fds) != 0) {
+#endif
             qWarning("QPdfPrinter: Could not open pipe to print");
             return false;
@@ -1712 +1716 @@
                 ::_exit(0);
             }
+#ifdef Q_WS_PM
+            ::dup2(fds[0], 0);
+#else
             qt_safe_dup2(fds[0], 0, 0);
+#endif
 
             closeAllOpenFds();
@@ -1789 +1797 @@
         QT_CLOSE(fds[0]);
         fd = fds[1];
+#ifdef Q_WS_PM
+        (void)::waitpid(pid, 0, 0);
+#else
         (void)qt_safe_waitpid(pid, 0, 0);
-
+#endif
         if (fd < 0)
             return false;
@@ -1817 +1828 @@
     outDevice = 0;
 
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined(Q_WS_PM))
     if (!cupsTempFile.isEmpty()) {
         QString tempFile = cupsTempFile;
@@ -2030 +2041 @@
         h = qRound(customPaperSize.height()*resolution/72.);
     } else {
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined(Q_WS_PM))
         if (QCUPSSupport::isAvailable() && !cupsPaperRect.isNull()) {
             QRect r = cupsPaperRect;
@@ -2058 +2069 @@
     QRect r;
 
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined(Q_WS_PM))
     if (!hasCustomPageMargins && QCUPSSupport::isAvailable() && !cupsPageRect.isNull()) {
         r = cupsPageRect;