diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-07-17 09:54:19 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-21 03:17:23 +0200 |
| commit | 3ef9138efd0e74283a9092a7ecae77c61d345048 (patch) | |
| tree | 050410725ee2a1c7347b3244dbb9d1f60245d8d1 /src/printsupport | |
| parent | 13b1395924032e35b678b3254a5b8315b6862f6a (diff) | |
QtPrintSupport: Replace remaining Q_WS_ conditionals by name checks.
Change-Id: Ic772e2187b3c93c5e0cdee6681289ab81e2c2f65
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/printsupport')
| -rw-r--r-- | src/printsupport/dialogs/qabstractpagesetupdialog.cpp | 6 | ||||
| -rw-r--r-- | src/printsupport/dialogs/qpagesetupdialog.cpp | 2 | ||||
| -rw-r--r-- | src/printsupport/kernel/qprinter.cpp | 12 |
3 files changed, 4 insertions, 16 deletions
diff --git a/src/printsupport/dialogs/qabstractpagesetupdialog.cpp b/src/printsupport/dialogs/qabstractpagesetupdialog.cpp index 0bf31c6b45..783d0dc5fc 100644 --- a/src/printsupport/dialogs/qabstractpagesetupdialog.cpp +++ b/src/printsupport/dialogs/qabstractpagesetupdialog.cpp @@ -44,7 +44,7 @@ #ifndef QT_NO_PRINTDIALOG -#include <QtCore/qcoreapplication.h> +#include <QtGui/qguiapplication.h> #include <QtPrintSupport/qprinter.h> QT_BEGIN_NAMESPACE @@ -106,10 +106,8 @@ void QAbstractPageSetupDialogPrivate::setPrinter(QPrinter *newPrinter) printer = new QPrinter; ownsPrinter = true; } -#ifndef Q_WS_X11 - if (printer->outputFormat() != QPrinter::NativeFormat) + if (printer->outputFormat() != QPrinter::NativeFormat && QGuiApplication::platformName() == QLatin1String("xcb")) qWarning("QPageSetupDialog: Cannot be used on non-native printers"); -#endif } /*! diff --git a/src/printsupport/dialogs/qpagesetupdialog.cpp b/src/printsupport/dialogs/qpagesetupdialog.cpp index 3c3362c550..404d5d9ec2 100644 --- a/src/printsupport/dialogs/qpagesetupdialog.cpp +++ b/src/printsupport/dialogs/qpagesetupdialog.cpp @@ -115,7 +115,7 @@ void QPageSetupDialog::open(QObject *receiver, const char *member) QDialog::open(); } -#if defined(Q_WS_MAC) || defined(Q_OS_WIN) +#if defined(Q_OS_MAC) || defined(Q_OS_WIN) /*! \fn void QPageSetupDialog::setVisible(bool visible) \reimp */ diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp index 176d1ad5f6..b70866465c 100644 --- a/src/printsupport/kernel/qprinter.cpp +++ b/src/printsupport/kernel/qprinter.cpp @@ -55,9 +55,6 @@ #include <private/qpagedpaintdevice_p.h> -#if defined(Q_WS_X11) -#include <private/qt_x11_p.h> -#endif #ifndef QT_NO_PDF #include "qprintengine_pdf_p.h" @@ -514,11 +511,7 @@ QPrinter::QPrinter(const QPrinterInfo& printer, PrinterMode mode) void QPrinterPrivate::init(QPrinter::PrinterMode mode) { -#if !defined(Q_WS_X11) if (!QCoreApplication::instance()) { -#else - if (!QCoreApplication::instance() || !X11) { -#endif qFatal("QPrinter: Must construct a QApplication before a QPaintDevice"); return; } @@ -712,11 +705,8 @@ void QPrinter::setPrinterName(const QString &name) bool QPrinter::isValid() const { Q_D(const QPrinter); -#if defined(Q_WS_X11) - if (!qApp || !X11) { + if (!qApp) return false; - } -#endif return d->validPrinter; } |