diff options
| author | John Layt <jlayt@kde.org> | 2014-03-13 20:24:16 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-17 13:46:26 +0100 |
| commit | 833a43d56c644b2201643b1e7593b0ee86d0d258 (patch) | |
| tree | 9b41ec276f7a3a1fb6352c493e774597276a8321 /src/plugins/platforms | |
| parent | 69e9b12001be08fe2b3f2c2def0ca3468d83b675 (diff) | |
QtPrintSupport - Fix QT_NO_PRINTER build
Fix the QT_NO_PRINTER build for issues that have accumulated over last
few months, and in the new changes already approved.
Change-Id: I9aed21dee861837fd1a68a96692c873a4f5be293
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaprintdevice.h | 5 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaprintdevice.mm | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaprintdevice.h b/src/plugins/platforms/cocoa/qcocoaprintdevice.h index 3f1fa475d5..30a2155bc7 100644 --- a/src/plugins/platforms/cocoa/qcocoaprintdevice.h +++ b/src/plugins/platforms/cocoa/qcocoaprintdevice.h @@ -53,11 +53,10 @@ // We mean it. // -#include <QtCore/qfeatures.h> // Some feature dependencies might define QT_NO_PRINTER -#ifndef QT_NO_PRINTER - #include <qpa/qplatformprintdevice.h> +#ifndef QT_NO_PRINTER + #include "qt_mac_p.h" #include <cups/ppd.h> diff --git a/src/plugins/platforms/cocoa/qcocoaprintdevice.mm b/src/plugins/platforms/cocoa/qcocoaprintdevice.mm index d8b01ec07f..3061e84470 100644 --- a/src/plugins/platforms/cocoa/qcocoaprintdevice.mm +++ b/src/plugins/platforms/cocoa/qcocoaprintdevice.mm @@ -46,6 +46,8 @@ QT_BEGIN_NAMESPACE +#ifndef QT_NO_PRINTER + static QPrint::DuplexMode macToDuplexMode(const PMDuplexMode &mode) { if (mode == kPMDuplexTumble) @@ -495,4 +497,6 @@ PMPaper QCocoaPrintDevice::macPaper(const QPageSize &pageSize) const return paper; } +#endif // QT_NO_PRINTER + QT_END_NAMESPACE |