QtPrintSupport: Replace remaining Q_WS_ conditionals by name checks.

Change-Id: Ic772e2187b3c93c5e0cdee6681289ab81e2c2f65
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

diff --git a/src/printsupport/dialogs/qabstractpagesetupdialog.cpp b/src/printsupport/dialogs/qabstractpagesetupdialog.cpp
index 0bf31c6..783d0dc 100644 (file)
--- 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 3c3362c..404d5d9 100644 (file)
--- 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 176d1ad..b708664 100644 (file)
--- 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;
 }