Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	mkspecs/qnx-armv7le-qcc/qplatformdefs.h
	src/printsupport/kernel/qcups.cpp
	src/widgets/styles/qstyle.h
	tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp

Change-Id: Ia41e13051169a6d4a8a1267548e7d47b859bb267

1 files changed, 17 insertions, 13 deletions

diff --git a/src/gui/painting/qpagelayout.h b/src/gui/painting/qpagelayout.h
index 86e430e311..e63f6f4d39 100644
--- a/src/gui/painting/qpagelayout.h
+++ b/src/gui/painting/qpagelayout.h
@@ -79,8 +79,8 @@ public:
     };
 
     QPageLayout();
-    QPageLayout(const QPageSize &pageSize, QPageLayout::Orientation orientation,
-                const QMarginsF &margins, QPageLayout::Unit units = QPageLayout::Point,
+    QPageLayout(const QPageSize &pageSize, Orientation orientation,
+                const QMarginsF &margins, Unit units = Point,
                 const QMarginsF &minMargins = QMarginsF(0, 0, 0, 0));
     QPageLayout(const QPageLayout &other);
     ~QPageLayout();
@@ -92,23 +92,23 @@ public:
 
     void swap(QPageLayout &other) { d.swap(other.d); }
 
-    bool operator==(const QPageLayout &other) const;
+    friend Q_GUI_EXPORT bool operator==(const QPageLayout &lhs, const QPageLayout &rhs);
     bool isEquivalentTo(const QPageLayout &other) const;
 
     bool isValid() const;
 
-    void setMode(QPageLayout::Mode mode);
-    QPageLayout::Mode mode() const;
+    void setMode(Mode mode);
+    Mode mode() const;
 
     void setPageSize(const QPageSize &pageSize,
                      const QMarginsF &minMargins = QMarginsF(0, 0, 0, 0));
     QPageSize pageSize() const;
 
-    void setOrientation(QPageLayout::Orientation orientation);
-    QPageLayout::Orientation orientation() const;
+    void setOrientation(Orientation orientation);
+    Orientation orientation() const;
 
-    void setUnits(QPageLayout::Unit units);
-    QPageLayout::Unit units() const;
+    void setUnits(Unit units);
+    Unit units() const;
 
     bool setMargins(const QMarginsF &margins);
     bool setLeftMargin(qreal leftMargin);
@@ -117,7 +117,7 @@ public:
     bool setBottomMargin(qreal bottomMargin);
 
     QMarginsF margins() const;
-    QMarginsF margins(QPageLayout::Unit units) const;
+    QMarginsF margins(Unit units) const;
     QMargins marginsPoints() const;
     QMargins marginsPixels(int resolution) const;
 
@@ -126,22 +126,26 @@ public:
     QMarginsF maximumMargins() const;
 
     QRectF fullRect() const;
-    QRectF fullRect(QPageLayout::Unit units) const;
+    QRectF fullRect(Unit units) const;
     QRect fullRectPoints() const;
     QRect fullRectPixels(int resolution) const;
 
     QRectF paintRect() const;
-    QRectF paintRect(QPageLayout::Unit units) const;
+    QRectF paintRect(Unit units) const;
     QRect paintRectPoints() const;
     QRect paintRectPixels(int resolution) const;
 
 private:
     friend class QPageLayoutPrivate;
-    QSharedDataPointer<QPageLayoutPrivate> d;
+    QExplicitlySharedDataPointer<QPageLayoutPrivate> d;
 };
 
 Q_DECLARE_SHARED(QPageLayout)
 
+Q_GUI_EXPORT bool operator==(const QPageLayout &lhs, const QPageLayout &rhs);
+inline bool operator!=(const QPageLayout &lhs, const QPageLayout &rhs)
+{ return !operator==(lhs, rhs); }
+
 #ifndef QT_NO_DEBUG_STREAM
 Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QPageLayout &pageLayout);
 #endif