Changeset 578
- Timestamp:
- Feb 18, 2010, 3:27:14 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/configure.cmd
r577 r578 41 41 42 42 /* All defines that express the limited functionality of the OS/2 version of Qt 43 * (mostly because the relevant features are not yet implemented) */ 43 * (mostly because the relevant features are not yet implemented). 44 * 45 * NOTE: These defines affect the value of QT_BUILD_KEY (QLibraryInfo::buildKey()) 46 * which deals with binary compatibility, so use with care! If you only want the 47 * QT_NO_ defne to appear in qconfig.h but not in the build key, use 48 * G.QCONFIG_FLAGS instead. 49 */ 44 50 G.LIMITATION_DEFS =, 45 51 "QT_NO_TABLET", 46 52 "QT_NO_SYSTEMSEMAPHORE QT_NO_SHAREDMEMORY", 47 "QT_NO_IM QT_NO_ACCESSIBILITY QT_NO_IPV6" 53 "QT_NO_IM QT_NO_ACCESSIBILITY QT_NO_IPV6 QT_NO_LPR" 54 55 G.QCONFIG_FLAGS = G.LIMITATION_DEFS 48 56 49 57 G.QT_DEFAULT_BUILD_PARTS = "libs tools qmake" /* examples demos docs translations */ … … 316 324 G.L_FLAGS = "" 317 325 G.l_FLAGS = "" 318 G.QCONFIG_FLAGS = G.LIMITATION_DEFS319 326 G.XPLATFORM = "" /* This seems to be the QMAKESPEC, like "linux-g++" */ 320 327 G.PLATFORM = GetEnv("QMAKESPEC") … … 1282 1289 * to be included in the build key */ 1283 1290 DEFS = "" 1284 ALL_D_FLAGS = G.D_FLAGS G.QCONFIG_FLAGS1285 1291 do i = 1 to words(G.D_FLAGS) 1286 1292 opt = strip(word(G.D_FLAGS, i)) -
trunk/src/gui/dialogs/qprintdialog_unix.cpp
r575 r578 685 685 } else { 686 686 #endif 687 #ifndef Q _WS_PM687 #ifndef QT_NO_LPR 688 688 currentPrinterIndex = qt_getLprPrinters(lprPrinters); 689 689 // populating printer combo -
trunk/src/gui/painting/qpdf.cpp
r574 r578 1693 1693 pr = printerName; 1694 1694 int fds[2]; 1695 #ifdef Q_WS_PM1696 if (::pipe(fds) != 0) {1697 #else1698 1695 if (qt_safe_pipe(fds) != 0) { 1699 #endif1700 1696 qWarning("QPdfPrinter: Could not open pipe to print"); 1701 1697 return false; … … 1718 1714 ::_exit(0); 1719 1715 } 1720 #ifdef Q_WS_PM1721 ::dup2(fds[0], 0);1722 #else1723 1716 qt_safe_dup2(fds[0], 0, 0); 1724 #endif1725 1717 1726 1718 closeAllOpenFds(); … … 1799 1791 QT_CLOSE(fds[0]); 1800 1792 fd = fds[1]; 1801 #ifdef Q_WS_PM1802 (void)::waitpid(pid, 0, 0);1803 #else1804 1793 (void)qt_safe_waitpid(pid, 0, 0); 1805 #endif 1794 1806 1795 if (fd < 0) 1807 1796 return false; -
trunk/src/gui/painting/qprinterinfo_unix.cpp
r561 r578 727 727 } 728 728 729 #ifndef QT_NO_LPR 729 730 int qt_getLprPrinters(QList<QPrinterDescription>& printers) 730 731 { … … 819 820 return best; 820 821 } 822 #endif 821 823 822 824 ///////////////////////////////////////////////////////////////////////////// -
trunk/src/gui/painting/qprinterinfo_unix_p.h
r561 r578 117 117 void qt_parseSpoolInterface(QList<QPrinterDescription> *printers); 118 118 void qt_parseQconfig(QList<QPrinterDescription> *printers); 119 #ifndef QT_NO_LPR 119 120 int qt_getLprPrinters(QList<QPrinterDescription>& printers); 121 #endif 120 122 121 123 #endif // QT_NO_PRINTER
Note:
See TracChangeset
for help on using the changeset viewer.