1 files changed, 31 insertions, 4 deletions
diff --git a/src/sql/kernel/qsqlfield.h b/src/sql/kernel/qsqlfield.h
index 67aed772bd..451f70f3b6 100644
--- a/src/sql/kernel/qsqlfield.h
+++ b/src/sql/kernel/qsqlfield.h
@@ -5,6 +5,7 @@
 #define QSQLFIELD_H
 
 #include <QtSql/qtsqlglobal.h>
+#include <QtCore/qshareddata.h>
 #include <QtCore/qvariant.h>
 #include <QtCore/qstring.h>
 
@@ -12,19 +13,38 @@ QT_BEGIN_NAMESPACE
 
 
 class QSqlFieldPrivate;
+QT_DECLARE_QESDP_SPECIALIZATION_DTOR_WITH_EXPORT(QSqlFieldPrivate, Q_SQL_EXPORT)
 
 class Q_SQL_EXPORT QSqlField
 {
+    Q_GADGET
 public:
     enum RequiredStatus { Unknown = -1, Optional = 0, Required = 1 };
 
+    Q_PROPERTY(QVariant value READ value WRITE setValue)
+    Q_PROPERTY(QVariant defaultValue READ defaultValue WRITE setDefaultValue)
+    Q_PROPERTY(QString name READ name WRITE setName)
+    Q_PROPERTY(QString tableName READ tableName WRITE setTableName)
+    Q_PROPERTY(QMetaType metaType READ metaType WRITE setMetaType)
+    Q_PROPERTY(RequiredStatus requiredStatus READ requiredStatus WRITE setRequiredStatus)
+    Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
+    Q_PROPERTY(bool generated READ isGenerated WRITE setGenerated)
+    Q_PROPERTY(bool autoValue READ isAutoValue WRITE setAutoValue)
+    Q_PROPERTY(int length READ length WRITE setLength)
+    Q_PROPERTY(int precision READ precision WRITE setPrecision)
+
     explicit QSqlField(const QString& fieldName = QString(), QMetaType type = QMetaType(), const QString &tableName = QString());
 
     QSqlField(const QSqlField& other);
     QSqlField& operator=(const QSqlField& other);
+    QSqlField(QSqlField &&other) noexcept = default;
+    QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_MOVE_AND_SWAP(QSqlField)
+    ~QSqlField();
+
+    void swap(QSqlField &other) noexcept { val.swap(other.val); d.swap(other.d); }
+
     bool operator==(const QSqlField& other) const;
     inline bool operator!=(const QSqlField &other) const { return !operator==(other); }
-    ~QSqlField();
 
     void setValue(const QVariant& value);
     inline QVariant value() const
@@ -62,7 +82,6 @@ public:
     void setLength(int fieldLength);
     void setPrecision(int precision);
     void setDefaultValue(const QVariant &value);
-    void setSqlType(int type);
     void setGenerated(bool gen);
     void setAutoValue(bool autoVal);
 
@@ -70,16 +89,24 @@ public:
     int length() const;
     int precision() const;
     QVariant defaultValue() const;
-    int typeID() const;
     bool isGenerated() const;
     bool isValid() const;
 
+#if QT_DEPRECATED_SINCE(6, 8)
+    QT_DEPRECATED_VERSION_X_6_8("This internal value is no longer used.")
+    void setSqlType(int type);
+    QT_DEPRECATED_VERSION_X_6_8("This internal value is no longer used.")
+    int typeID() const;
+#endif
 private:
     void detach();
+    // ### Qt7: move to private class
     QVariant val;
-    QSqlFieldPrivate* d;
+    QExplicitlySharedDataPointer<QSqlFieldPrivate> d;
 };
 
+Q_DECLARE_SHARED(QSqlField)
+
 #ifndef QT_NO_DEBUG_STREAM
 Q_SQL_EXPORT QDebug operator<<(QDebug, const QSqlField &);
 #endif