Changeset 578

Timestamp:

Feb 18, 2010, 3:27:14 PM (16 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

Files:

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

trunk/configure.cmd

@@ -41 +41 @@
 
 /* All defines that express the limited functionality of the OS/2 version of Qt
- * (mostly because the relevant features are not yet implemented) */
+ * (mostly because the relevant features are not yet implemented).
+ *
+ * NOTE: These defines affect the value of QT_BUILD_KEY (QLibraryInfo::buildKey())
+ * which deals with binary compatibility, so use with care! If you only want the
+ * QT_NO_ defne to appear in qconfig.h but not in the build key, use
+ * G.QCONFIG_FLAGS instead.
+ */
 G.LIMITATION_DEFS   =,
     "QT_NO_TABLET",
     "QT_NO_SYSTEMSEMAPHORE QT_NO_SHAREDMEMORY",
-    "QT_NO_IM QT_NO_ACCESSIBILITY QT_NO_IPV6"
+    "QT_NO_IM QT_NO_ACCESSIBILITY QT_NO_IPV6 QT_NO_LPR"
+
+G.QCONFIG_FLAGS     = G.LIMITATION_DEFS
 
 G.QT_DEFAULT_BUILD_PARTS = "libs tools qmake" /* examples demos docs translations */
@@ -316 +324 @@
     G.L_FLAGS = ""
     G.l_FLAGS = ""
-    G.QCONFIG_FLAGS = G.LIMITATION_DEFS
     G.XPLATFORM = "" /* This seems to be the QMAKESPEC, like "linux-g++" */
     G.PLATFORM = GetEnv("QMAKESPEC")
@@ -1282 +1289 @@
      * to be included in the build key */
     DEFS = ""
-    ALL_D_FLAGS = G.D_FLAGS G.QCONFIG_FLAGS
     do i = 1 to words(G.D_FLAGS)
         opt = strip(word(G.D_FLAGS, i))

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