diff options
| author | John Layt <jlayt@kde.org> | 2014-01-23 02:06:29 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-17 13:46:01 +0100 |
| commit | 4eb36ad5971240a9a934bef7be2c6297e092b797 (patch) | |
| tree | ed585d7052e571c78b6f8c159bedc69fbd20f419 /src/plugins/platforms/cocoa/qprintengine_mac_p.h | |
| parent | c5cbdc2cbce4d2f471836f1a1c7c963ce985ac49 (diff) | |
QPrintEngine - Switch Mac to QPageLayout
Use QPageLayout in the Mac QPaintEngine.
Change-Id: I4c160e3875d69879160e289c371c10b1ac028748
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qprintengine_mac_p.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qprintengine_mac_p.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/plugins/platforms/cocoa/qprintengine_mac_p.h b/src/plugins/platforms/cocoa/qprintengine_mac_p.h index cb68f03fdb..12a87b35e9 100644 --- a/src/plugins/platforms/cocoa/qprintengine_mac_p.h +++ b/src/plugins/platforms/cocoa/qprintengine_mac_p.h @@ -124,27 +124,18 @@ class QMacPrintEnginePrivate : public QPaintEnginePrivate public: QPrinter::PrinterMode mode; QPrinter::PrinterState state; - QPrinter::Orientation orient; QSharedDataPointer<QCocoaPrintDevice> m_printDevice; - QPageSize m_pageSize; + QPageLayout m_pageLayout; NSPrintInfo *printInfo; PMResolution resolution; QString outputFilename; QString m_creator; - bool fullPage; QPaintEngine *paintEngine; - bool hasCustomPaperSize; - QSizeF customSize; - bool hasCustomPageMargins; - qreal leftMargin; - qreal topMargin; - qreal rightMargin; - qreal bottomMargin; QHash<QMacPrintEngine::PrintEnginePropertyKey, QVariant> valueCache; QMacPrintEnginePrivate() : mode(QPrinter::ScreenResolution), state(QPrinter::Idle), - orient(QPrinter::Portrait), printInfo(0), paintEngine(0), - hasCustomPaperSize(false), hasCustomPageMargins(false) {} + m_pageLayout(QPageLayout(QPageSize(QPageSize::A4), QPageLayout::Portrait, QMarginsF(0, 0, 0, 0))), + printInfo(0), paintEngine(0) {} ~QMacPrintEnginePrivate(); void initialize(); |