diff options
author | Vitalii Shastun <vitalii.shastun@globallogic.com> | 2013-09-20 18:23:33 +0300 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-26 20:42:33 +0200 |
commit | 5889b239b17b27f0c93fe4f8a56fc1cc32708e8b (patch) | |
tree | 21ce28fd24e69a2df9c46954d4889c83c5100b0a /src/printsupport | |
parent | 77dc33dcdbe0eec8ddc9059c4e0ff9dde264c5fa (diff) |
Fix QT_NO_PRINTER build on Mac
On Mac the QT_NO_PRINTER build was not implemented.
Task-number: QTBUG-33565
Change-Id: I118472f9400aa0a0d0e192ae39a11ea38a66f340
Reviewed-by: John Layt <jlayt@kde.org>
Diffstat (limited to 'src/printsupport')
-rw-r--r-- | src/printsupport/dialogs/qpagesetupdialog_mac.mm | 3 | ||||
-rw-r--r-- | src/printsupport/dialogs/qprintdialog_mac.mm | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/printsupport/dialogs/qpagesetupdialog_mac.mm b/src/printsupport/dialogs/qpagesetupdialog_mac.mm index 967f127b86..7180c01df4 100644 --- a/src/printsupport/dialogs/qpagesetupdialog_mac.mm +++ b/src/printsupport/dialogs/qpagesetupdialog_mac.mm @@ -39,11 +39,12 @@ ** ****************************************************************************/ -#ifndef QT_NO_PRINTDIALOG #include <Cocoa/Cocoa.h> #include "qpagesetupdialog.h" + +#ifndef QT_NO_PRINTDIALOG #include "qpagesetupdialog_p.h" #include <qpa/qplatformnativeinterface.h> diff --git a/src/printsupport/dialogs/qprintdialog_mac.mm b/src/printsupport/dialogs/qprintdialog_mac.mm index 37333f2593..bf1617065b 100644 --- a/src/printsupport/dialogs/qprintdialog_mac.mm +++ b/src/printsupport/dialogs/qprintdialog_mac.mm @@ -39,8 +39,6 @@ ** ****************************************************************************/ -#ifndef QT_NO_PRINTDIALOG - #include <Cocoa/Cocoa.h> #include "qprintdialog.h" @@ -52,6 +50,8 @@ #include <QtPrintSupport/qprinter.h> #include <QtPrintSupport/qprintengine.h> +#ifndef QT_NO_PRINTDIALOG + QT_BEGIN_NAMESPACE class QPrintDialogPrivate : public QAbstractPrintDialogPrivate |