1 files changed, 29 insertions, 17 deletions

diff --git a/src/sql/kernel/qsqlrecord.h b/src/sql/kernel/qsqlrecord.h
index 76e6ee982d..8f653ba5e1 100644
--- a/src/sql/kernel/qsqlrecord.h
+++ b/src/sql/kernel/qsqlrecord.h
@@ -5,6 +5,7 @@
 #define QSQLRECORD_H
 
 #include <QtSql/qtsqlglobal.h>
+#include <QtCore/qshareddata.h>
 #include <QtCore/qstring.h>
 
 QT_BEGIN_NAMESPACE
@@ -13,51 +14,60 @@ QT_BEGIN_NAMESPACE
 class QSqlField;
 class QVariant;
 class QSqlRecordPrivate;
+QT_DECLARE_QESDP_SPECIALIZATION_DTOR_WITH_EXPORT(QSqlRecordPrivate, Q_SQL_EXPORT)
 
 class Q_SQL_EXPORT QSqlRecord
 {
 public:
     QSqlRecord();
-    QSqlRecord(const QSqlRecord& other);
-    QSqlRecord(QSqlRecord &&other) noexcept
-        : d{std::exchange(other.d, nullptr)} {}
-    QSqlRecord& operator=(const QSqlRecord& other);
+    QSqlRecord(const QSqlRecord &other);
+    QSqlRecord(QSqlRecord &&other) noexcept = default;
+    QSqlRecord& operator=(const QSqlRecord &other);
     QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_MOVE_AND_SWAP(QSqlRecord)
     ~QSqlRecord();
 
-    void swap(QSqlRecord &other) noexcept { qt_ptr_swap(d, other.d); }
+    void swap(QSqlRecord &other) noexcept { d.swap(other.d); }
 
     bool operator==(const QSqlRecord &other) const;
     inline bool operator!=(const QSqlRecord &other) const { return !operator==(other); }
 
     QVariant value(int i) const;
-    QVariant value(const QString& name) const;
-    void setValue(int i, const QVariant& val);
-    void setValue(const QString& name, const QVariant& val);
+    QVariant value(const QString &name) const;
+    QVariant value(QStringView name) const;
+    void setValue(int i, const QVariant &val);
+    void setValue(const QString &name, const QVariant &val);
+    void setValue(QStringView name, const QVariant &val);
 
     void setNull(int i);
-    void setNull(const QString& name);
+    void setNull(const QString &name);
+    void setNull(QStringView name);
     bool isNull(int i) const;
-    bool isNull(const QString& name) const;
+    bool isNull(const QString &name) const;
+    bool isNull(QStringView name) const;
 
     int indexOf(const QString &name) const;
+    int indexOf(QStringView name) const;
     QString fieldName(int i) const;
 
     QSqlField field(int i) const;
     QSqlField field(const QString &name) const;
+    QSqlField field(QStringView name) const;
 
     bool isGenerated(int i) const;
-    bool isGenerated(const QString& name) const;
-    void setGenerated(const QString& name, bool generated);
+    bool isGenerated(const QString &name) const;
+    bool isGenerated(QStringView name) const;
+    void setGenerated(const QString &name, bool generated);
+    void setGenerated(QStringView name, bool generated);
     void setGenerated(int i, bool generated);
 
-    void append(const QSqlField& field);
-    void replace(int pos, const QSqlField& field);
-    void insert(int pos, const QSqlField& field);
+    void append(const QSqlField &field);
+    void replace(int pos, const QSqlField &field);
+    void insert(int pos, const QSqlField &field);
     void remove(int pos);
 
     bool isEmpty() const;
-    bool contains(const QString& name) const;
+    bool contains(const QString &name) const;
+    bool contains(QStringView name) const;
     void clear();
     void clearValues();
     int count() const;
@@ -65,9 +75,11 @@ public:
 
 private:
     void detach();
-    QSqlRecordPrivate* d;
+    QExplicitlySharedDataPointer<QSqlRecordPrivate> d;
 };
 
+Q_DECLARE_SHARED(QSqlRecord)
+
 #ifndef QT_NO_DEBUG_STREAM
 Q_SQL_EXPORT QDebug operator<<(QDebug, const QSqlRecord &);
 #endif