diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2020-05-18 14:43:25 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2020-05-19 23:45:54 +0200 |
commit | 7c070ac95979609e6ba33b829dc4a2a373ef26b5 (patch) | |
tree | 9edc4cc4876a28ac45aeb0a3f036242b075c1092 /src/sql | |
parent | 857722ed8f16bb5b9e64154690f6b0bf3f880dd7 (diff) |
Sweep Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6 -> Q_DECLARE_SHARED
This is Qt 6, so Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6 is the same as
Q_DECLARE_SHARED.
Let's hope we'll collectively get better at detecting missing
Q_DECLARE_SHARED so we won't need a
Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT7 in the future.
Change-Id: I3da9faff4c66b64a3b257309012a2a10a6c6d027
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/sql')
-rw-r--r-- | src/sql/kernel/qsqlerror.h | 2 | ||||
-rw-r--r-- | src/sql/models/qsqlrelationaltablemodel.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/sql/kernel/qsqlerror.h b/src/sql/kernel/qsqlerror.h index 285ea88ee2..fd147852c0 100644 --- a/src/sql/kernel/qsqlerror.h +++ b/src/sql/kernel/qsqlerror.h @@ -93,7 +93,7 @@ private: }; }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QSqlError) +Q_DECLARE_SHARED(QSqlError) #ifndef QT_NO_DEBUG_STREAM Q_SQL_EXPORT QDebug operator<<(QDebug, const QSqlError &); diff --git a/src/sql/models/qsqlrelationaltablemodel.h b/src/sql/models/qsqlrelationaltablemodel.h index 2ebadaabd1..f9e3620eb6 100644 --- a/src/sql/models/qsqlrelationaltablemodel.h +++ b/src/sql/models/qsqlrelationaltablemodel.h @@ -76,7 +76,7 @@ public: private: QString tName, iColumn, dColumn; }; -Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QSqlRelation) +Q_DECLARE_SHARED(QSqlRelation) class QSqlRelationalTableModelPrivate; |