diff options
Diffstat (limited to 'src/printsupport/dialogs')
-rw-r--r-- | src/printsupport/dialogs/qabstractpagesetupdialog.cpp | 6 | ||||
-rw-r--r-- | src/printsupport/dialogs/qpagesetupdialog.cpp | 2 |
2 files changed, 3 insertions, 5 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 */ |