4 files changed, 6 insertions, 8 deletions
diff --git a/src/opengl/qopengldebug.h b/src/opengl/qopengldebug.h
index f61808e4c7..34706a09dc 100644
--- a/src/opengl/qopengldebug.h
+++ b/src/opengl/qopengldebug.h
@@ -112,7 +112,7 @@ public:
     QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QOpenGLDebugMessage)
     ~QOpenGLDebugMessage();
 
-    void swap(QOpenGLDebugMessage &other) noexcept { qSwap(d, other.d); }
+    void swap(QOpenGLDebugMessage &other) noexcept { d.swap(other.d); }
 
     Source source() const;
     Type type() const;
diff --git a/src/sql/kernel/qsqlerror.h b/src/sql/kernel/qsqlerror.h
index a956a54f7b..8c1be600aa 100644
--- a/src/sql/kernel/qsqlerror.h
+++ b/src/sql/kernel/qsqlerror.h
@@ -70,7 +70,7 @@ public:
     bool operator!=(const QSqlError& other) const;
     ~QSqlError();
 
-    void swap(QSqlError &other) noexcept { qSwap(d, other.d); }
+    void swap(QSqlError &other) noexcept { qt_ptr_swap(d, other.d); }
 
     QString driverText() const;
     QString databaseText() const;
diff --git a/src/sql/kernel/qsqlquery.h b/src/sql/kernel/qsqlquery.h
index b34452c302..132bc41396 100644
--- a/src/sql/kernel/qsqlquery.h
+++ b/src/sql/kernel/qsqlquery.h
@@ -80,9 +80,7 @@ public:
     ~QSqlQuery();
 
     void swap(QSqlQuery &other) noexcept
-    {
-        qSwap(d, other.d);
-    }
+    { qt_ptr_swap(d, other.d); }
 
     bool isValid() const;
     bool isActive() const;
diff --git a/src/sql/models/qsqlrelationaltablemodel.h b/src/sql/models/qsqlrelationaltablemodel.h
index f9e3620eb6..8a37e8439a 100644
--- a/src/sql/models/qsqlrelationaltablemodel.h
+++ b/src/sql/models/qsqlrelationaltablemodel.h
@@ -60,9 +60,9 @@ public:
 
     void swap(QSqlRelation &other) noexcept
     {
-        qSwap(tName, other.tName);
-        qSwap(iColumn, other.iColumn);
-        qSwap(dColumn, other.dColumn);
+        tName.swap(other.tName);
+        iColumn.swap(other.iColumn);
+        dColumn.swap(other.dColumn);
     }
 
     inline QString tableName() const