diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-27 11:14:48 +0200 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-27 11:15:09 +0200 |
commit | 16a36239ab9e9be45a940aeff94f35e29bdeb944 (patch) | |
tree | ed6c159f12fa2ff80cf39b97a65eab0546ffe639 /src/printsupport/dialogs/qprintdialog_mac.mm | |
parent | e37001aad7f6e4bbad250addba033f1eaf97d566 (diff) | |
parent | 00da2e615e89c46affbc130b4df6148785724a23 (diff) |
Merge branch 'stable' into dev
Change-Id: I06694436322a7810a163b27b8a059cee2b046f06
Diffstat (limited to 'src/printsupport/dialogs/qprintdialog_mac.mm')
-rw-r--r-- | src/printsupport/dialogs/qprintdialog_mac.mm | 4 |
1 files changed, 2 insertions, 2 deletions
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 |