SQL: Code cleanup - move Q_PROPERTY to the correct place

... which is directly after Q_OBJECT/Q_GADGET

Change-Id: I3fb2b2e810a68e0ae811e55b286bc5f40364295f
Reviewed-by: Volker Hilsheimer <[email protected]>
(cherry picked from commit 031eabe845c41ef98cb078d0fae0521156a75b9e)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>

5 files changed, 8 insertions, 8 deletions

diff --git a/src/sql/kernel/qsqldatabase.h b/src/sql/kernel/qsqldatabase.h
index 85d6b4d9d91..e1e5b631472 100644
--- a/src/sql/kernel/qsqldatabase.h
+++ b/src/sql/kernel/qsqldatabase.h
@@ -37,9 +37,10 @@ public:
 class Q_SQL_EXPORT QSqlDatabase
 {
     Q_GADGET
-public:
     Q_PROPERTY(QSql::NumericalPrecisionPolicy numericalPrecisionPolicy READ numericalPrecisionPolicy WRITE setNumericalPrecisionPolicy)
 
+public:
+
     QSqlDatabase();
     QSqlDatabase(const QSqlDatabase &other);
     ~QSqlDatabase();
diff --git a/src/sql/kernel/qsqldriver.h b/src/sql/kernel/qsqldriver.h
index a5fe40fa154..1c355dcea23 100644
--- a/src/sql/kernel/qsqldriver.h
+++ b/src/sql/kernel/qsqldriver.h
@@ -27,6 +27,7 @@ class Q_SQL_EXPORT QSqlDriver : public QObject
     friend class QSqlDatabase;
     friend class QSqlResultPrivate;
     Q_OBJECT
+    Q_PROPERTY(QSql::NumericalPrecisionPolicy numericalPrecisionPolicy READ numericalPrecisionPolicy WRITE setNumericalPrecisionPolicy)
     Q_DECLARE_PRIVATE(QSqlDriver)
 
 public:
@@ -55,8 +56,6 @@ public:
         MimerSQL,
     };
 
-    Q_PROPERTY(QSql::NumericalPrecisionPolicy numericalPrecisionPolicy READ numericalPrecisionPolicy WRITE setNumericalPrecisionPolicy)
-
     explicit QSqlDriver(QObject *parent = nullptr);
     ~QSqlDriver();
     virtual bool isOpen() const;
diff --git a/src/sql/kernel/qsqlfield.h b/src/sql/kernel/qsqlfield.h
index 451f70f3b6f..96ace6a359f 100644
--- a/src/sql/kernel/qsqlfield.h
+++ b/src/sql/kernel/qsqlfield.h
@@ -18,9 +18,6 @@ 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)
@@ -33,6 +30,9 @@ public:
     Q_PROPERTY(int length READ length WRITE setLength)
     Q_PROPERTY(int precision READ precision WRITE setPrecision)
 
+public:
+    enum RequiredStatus { Unknown = -1, Optional = 0, Required = 1 };
+
     explicit QSqlField(const QString& fieldName = QString(), QMetaType type = QMetaType(), const QString &tableName = QString());
 
     QSqlField(const QSqlField& other);
diff --git a/src/sql/kernel/qsqlindex.h b/src/sql/kernel/qsqlindex.h
index 3d5d95b3737..7d7eaf548f7 100644
--- a/src/sql/kernel/qsqlindex.h
+++ b/src/sql/kernel/qsqlindex.h
@@ -17,10 +17,10 @@ QT_BEGIN_NAMESPACE
 class Q_SQL_EXPORT QSqlIndex : public QSqlRecord
 {
     Q_GADGET
-public:
     Q_PROPERTY(QString name READ name WRITE setName)
     Q_PROPERTY(QString cursorName READ cursorName WRITE setCursorName)
 
+public:
     explicit QSqlIndex(const QString &cursorName = QString(), const QString &name = QString());
     QSqlIndex(const QSqlIndex &other);
     QSqlIndex(QSqlIndex &&other) noexcept = default;
diff --git a/src/sql/kernel/qsqlquery.h b/src/sql/kernel/qsqlquery.h
index bd3fea9e3e4..96ad9022127 100644
--- a/src/sql/kernel/qsqlquery.h
+++ b/src/sql/kernel/qsqlquery.h
@@ -23,11 +23,11 @@ class QSqlQueryPrivate;
 class Q_SQL_EXPORT QSqlQuery
 {
     Q_GADGET
-public:
     Q_PROPERTY(bool forwardOnly READ isForwardOnly WRITE setForwardOnly)
     Q_PROPERTY(bool positionalBindingEnabled READ isPositionalBindingEnabled WRITE setPositionalBindingEnabled)
     Q_PROPERTY(QSql::NumericalPrecisionPolicy numericalPrecisionPolicy READ numericalPrecisionPolicy WRITE setNumericalPrecisionPolicy)
 
+public:
     explicit QSqlQuery(QSqlResult *r);
     explicit QSqlQuery(const QString& query = QString(), const QSqlDatabase &db = QSqlDatabase());
     explicit QSqlQuery(const QSqlDatabase &db);