Changeset 578 for trunk/src

Timestamp:

Feb 18, 2010, 3:27:14 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

configure.cmd: Added QT_NO_LPR (and made Qt sources additionally use it in a couple of places) since OS/2 doesn't support LPR-like printing for now.

Location:

trunk/src/gui

Files:

• dialogs/qprintdialog_unix.cpp (modified) (1 diff)
• painting/qpdf.cpp (modified) (3 diffs)
• painting/qprinterinfo_unix.cpp (modified) (2 diffs)
• painting/qprinterinfo_unix_p.h (modified) (1 diff)

trunk/src/gui/dialogs/qprintdialog_unix.cpp

@@ -685 +685 @@
     } else {
 #endif
-#ifndef Q_WS_PM
+#ifndef QT_NO_LPR
         currentPrinterIndex = qt_getLprPrinters(lprPrinters);
         // populating printer combo

trunk/src/gui/painting/qpdf.cpp

@@ -1693 +1693 @@
             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;
@@ -1718 +1714 @@
                 ::_exit(0);
             }
-#ifdef Q_WS_PM
-            ::dup2(fds[0], 0);
-#else
             qt_safe_dup2(fds[0], 0, 0);
-#endif
 
             closeAllOpenFds();
@@ -1799 +1791 @@
         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;

trunk/src/gui/painting/qprinterinfo_unix.cpp

@@ -727 +727 @@
 }
 
+#ifndef QT_NO_LPR
 int qt_getLprPrinters(QList<QPrinterDescription>& printers)
 {
@@ -819 +820 @@
     return best;
 }
+#endif
 
 /////////////////////////////////////////////////////////////////////////////

trunk/src/gui/painting/qprinterinfo_unix_p.h

@@ -117 +117 @@
 void qt_parseSpoolInterface(QList<QPrinterDescription> *printers);
 void qt_parseQconfig(QList<QPrinterDescription> *printers);
+#ifndef QT_NO_LPR
 int qt_getLprPrinters(QList<QPrinterDescription>& printers);
+#endif
 
 #endif // QT_NO_PRINTER