7 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/painting/qbrush.h b/src/gui/painting/qbrush.h
index b5bdd9fb24..fb97284c4f 100644
--- a/src/gui/painting/qbrush.h
+++ b/src/gui/painting/qbrush.h
@@ -83,7 +83,7 @@ public:
     QBrush &operator=(const QBrush &brush);
     QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QBrush)
     inline void swap(QBrush &other) noexcept
-    { qSwap(d, other.d); }
+    { d.swap(other.d); }
 
     operator QVariant() const;
 
diff --git a/src/gui/painting/qcolorspace.h b/src/gui/painting/qcolorspace.h
index 43ae2257c0..59deca3a28 100644
--- a/src/gui/painting/qcolorspace.h
+++ b/src/gui/painting/qcolorspace.h
@@ -112,7 +112,7 @@ public:
     QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_MOVE_AND_SWAP(QColorSpace)
 
     void swap(QColorSpace &colorSpace) noexcept
-    { qSwap(d_ptr, colorSpace.d_ptr); }
+    { d_ptr.swap(colorSpace.d_ptr); }
 
     Primaries primaries() const noexcept;
     TransferFunction transferFunction() const noexcept;
diff --git a/src/gui/painting/qpagelayout.h b/src/gui/painting/qpagelayout.h
index 469436ce59..8d45241106 100644
--- a/src/gui/painting/qpagelayout.h
+++ b/src/gui/painting/qpagelayout.h
@@ -85,7 +85,7 @@ public:
     QPageLayout &operator=(const QPageLayout &other);
     ~QPageLayout();
 
-    void swap(QPageLayout &other) noexcept { qSwap(d, other.d); }
+    void swap(QPageLayout &other) noexcept { d.swap(other.d); }
 
     bool isEquivalentTo(const QPageLayout &other) const;
 
diff --git a/src/gui/painting/qpageranges.h b/src/gui/painting/qpageranges.h
index d525124a62..11a30a95a5 100644
--- a/src/gui/painting/qpageranges.h
+++ b/src/gui/painting/qpageranges.h
@@ -65,7 +65,7 @@ public:
     QPageRanges(QPageRanges &&other) noexcept = default;
     QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QPageRanges)
     void swap(QPageRanges &other) noexcept
-    { qSwap(d, other.d); }
+    { d.swap(other.d); }
 
     friend bool operator==(const QPageRanges &lhs, const QPageRanges &rhs) noexcept
     { return lhs.isEqual(rhs); }
diff --git a/src/gui/painting/qpagesize.h b/src/gui/painting/qpagesize.h
index f4e7af0f6c..569008f166 100644
--- a/src/gui/painting/qpagesize.h
+++ b/src/gui/painting/qpagesize.h
@@ -237,7 +237,7 @@ public:
     ~QPageSize();
 
 
-    void swap(QPageSize &other) noexcept { qSwap(d, other.d); }
+    void swap(QPageSize &other) noexcept { d.swap(other.d); }
 
     friend Q_GUI_EXPORT bool operator==(const QPageSize &lhs, const QPageSize &rhs);
     bool isEquivalentTo(const QPageSize &other) const;
diff --git a/src/gui/painting/qpen.h b/src/gui/painting/qpen.h
index db280c765b..326467ad6f 100644
--- a/src/gui/painting/qpen.h
+++ b/src/gui/painting/qpen.h
@@ -73,7 +73,7 @@ public:
     QPen(QPen &&other) noexcept
         : d(qExchange(other.d, nullptr)) {}
     QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QPen)
-    void swap(QPen &other) noexcept { qSwap(d, other.d); }
+    void swap(QPen &other) noexcept { qt_ptr_swap(d, other.d); }
 
     Qt::PenStyle style() const;
     void setStyle(Qt::PenStyle);
diff --git a/src/gui/painting/qregion.h b/src/gui/painting/qregion.h
index 12a3a4e502..ab4c2112ad 100644
--- a/src/gui/painting/qregion.h
+++ b/src/gui/painting/qregion.h
@@ -75,7 +75,7 @@ public:
     ~QRegion();
     QRegion &operator=(const QRegion &);
     QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QRegion)
-    inline void swap(QRegion &other) noexcept { qSwap(d, other.d); }
+    void swap(QRegion &other) noexcept { qt_ptr_swap(d, other.d); }
     bool isEmpty() const;
     bool isNull() const;