From d3121e3888ae43a7dc074f5d8acc26b1973a7726 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Fri, 16 Mar 2018 17:01:54 +0100 Subject: [PATCH] Fix QPageLayout() not initializing units by using the other QPageLayout constructor Task-number: QTBUG-47551 Change-Id: I9c3635d4a460437febefdfb9d259d508b61c1f29 Reviewed-by: David Faure --- src/gui/painting/qpagelayout.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/gui/painting/qpagelayout.cpp b/src/gui/painting/qpagelayout.cpp index f3f7f5f956..2634a448a5 100644 --- a/src/gui/painting/qpagelayout.cpp +++ b/src/gui/painting/qpagelayout.cpp @@ -123,7 +123,6 @@ class QPageLayoutPrivate : public QSharedData { public: - QPageLayoutPrivate(); QPageLayoutPrivate(const QPageSize &pageSize, QPageLayout::Orientation orientation, const QMarginsF &margins, QPageLayout::Unit units, const QMarginsF &minMargins); @@ -166,12 +165,6 @@ private: QMarginsF m_maxMargins; }; -QPageLayoutPrivate::QPageLayoutPrivate() - : m_orientation(QPageLayout::Landscape), - m_mode(QPageLayout::StandardMode) -{ -} - QPageLayoutPrivate::QPageLayoutPrivate(const QPageSize &pageSize, QPageLayout::Orientation orientation, const QMarginsF &margins, QPageLayout::Unit units, const QMarginsF &minMargins) @@ -356,7 +349,7 @@ QRectF QPageLayoutPrivate::paintRect() const */ QPageLayout::QPageLayout() - : d(new QPageLayoutPrivate()) + : QPageLayout(QPageSize(), QPageLayout::Landscape, QMarginsF()) { }