Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/gui/dialogs/qpagesetupdialog_unix.cpp

    r561 r573  
    5454#include <private/qprinter_p.h>
    5555
    56 #if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
     56#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined(Q_WS_PM))
    5757#  include <private/qcups_p.h>
    5858#  include <cups/cups.h>
     
    225225
    226226    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))
    228228    QCUPSSupport *cups;
    229229#endif
     
    232232QPageSetupDialogPrivate::~QPageSetupDialogPrivate()
    233233{
    234 #if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
     234#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined(Q_WS_PM))
    235235    delete cups;
    236236#endif
     
    243243    widget = new QPageSetupWidget(q);
    244244    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))
    246246    if (printer->outputFormat() == QPrinter::NativeFormat && QCUPSSupport::isAvailable()) {
    247247        cups = new QCUPSSupport;
     
    355355        ps = val.toInt();
    356356    }
    357 #if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
     357#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined(Q_WS_PM))
    358358    else if (m_cups && QCUPSSupport::isAvailable() && m_cups->currentPPD()) {
    359359        QByteArray cupsPageSize = val.toByteArray();
     
    391391    m_cups = cups;
    392392    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))
    394394    if (m_cups && QCUPSSupport::isAvailable()) {
    395395        const ppd_option_t* pageSizes = m_cups->pageSizes();
     
    472472    bool custom = size == QPrinter::Custom;
    473473
    474 #if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
     474#if !defined(QT_NO_CUPS) && (!defined(QT_NO_LIBRARY) || defined(Q_WS_PM))
    475475    custom = custom ? !m_cups : custom;
    476476#endif
     
    486486    } else {
    487487        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))
    489489        if (m_cups) { // combobox is filled with cups based data
    490490            QByteArray cupsPageSize = widget.paperSize->itemData(widget.paperSize->currentIndex()).toByteArray();
Note: See TracChangeset for help on using the changeset viewer.