Changeset 573 for trunk/src/gui/dialogs/qpagesetupdialog_unix.cpp
- Timestamp:
- Feb 17, 2010, 8:53:20 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/gui/dialogs/qpagesetupdialog_unix.cpp
r561 r573 54 54 #include <private/qprinter_p.h> 55 55 56 #if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)56 #if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined(Q_WS_PM)) 57 57 # include <private/qcups_p.h> 58 58 # include <cups/cups.h> … … 225 225 226 226 QPageSetupWidget *widget; 227 #if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)227 #if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined(Q_WS_PM)) 228 228 QCUPSSupport *cups; 229 229 #endif … … 232 232 QPageSetupDialogPrivate::~QPageSetupDialogPrivate() 233 233 { 234 #if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)234 #if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined(Q_WS_PM)) 235 235 delete cups; 236 236 #endif … … 243 243 widget = new QPageSetupWidget(q); 244 244 widget->setPrinter(printer); 245 #if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)245 #if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined(Q_WS_PM)) 246 246 if (printer->outputFormat() == QPrinter::NativeFormat && QCUPSSupport::isAvailable()) { 247 247 cups = new QCUPSSupport; … … 355 355 ps = val.toInt(); 356 356 } 357 #if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)357 #if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined(Q_WS_PM)) 358 358 else if (m_cups && QCUPSSupport::isAvailable() && m_cups->currentPPD()) { 359 359 QByteArray cupsPageSize = val.toByteArray(); … … 391 391 m_cups = cups; 392 392 widget.paperSize->clear(); 393 #if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)393 #if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined(Q_WS_PM)) 394 394 if (m_cups && QCUPSSupport::isAvailable()) { 395 395 const ppd_option_t* pageSizes = m_cups->pageSizes(); … … 472 472 bool custom = size == QPrinter::Custom; 473 473 474 #if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)474 #if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined(Q_WS_PM)) 475 475 custom = custom ? !m_cups : custom; 476 476 #endif … … 486 486 } else { 487 487 Q_ASSERT(m_printer); 488 #if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)488 #if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined(Q_WS_PM)) 489 489 if (m_cups) { // combobox is filled with cups based data 490 490 QByteArray cupsPageSize = widget.paperSize->itemData(widget.paperSize->currentIndex()).toByteArray();
Note:
See TracChangeset
for help on using the changeset viewer.