diff options
Diffstat (limited to 'src/sql/kernel/qsqlfield.h')
| -rw-r--r-- | src/sql/kernel/qsqlfield.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/sql/kernel/qsqlfield.h b/src/sql/kernel/qsqlfield.h index 27ad47ca35..80b412a973 100644 --- a/src/sql/kernel/qsqlfield.h +++ b/src/sql/kernel/qsqlfield.h @@ -54,13 +54,6 @@ class Q_SQL_EXPORT QSqlField public: enum RequiredStatus { Unknown = -1, Optional = 0, Required = 1 }; -#if QT_DEPRECATED_SINCE(6, 0) - QT_DEPRECATED_VERSION_X_6_0("Use the constructor using a QMetaType instead") - QSqlField(const QString& fieldName, QVariant::Type type, const QString &tableName = QString()) - : QSqlField(fieldName, QMetaType(type), tableName) - {} -#endif - explicit QSqlField(const QString& fieldName = QString(), QMetaType type = QMetaType(), const QString &tableName = QString()); QSqlField(const QSqlField& other); @@ -86,10 +79,17 @@ public: void setMetaType(QMetaType type); #if QT_DEPRECATED_SINCE(6, 0) + QT_WARNING_PUSH + QT_WARNING_DISABLE_DEPRECATED + QT_DEPRECATED_VERSION_X_6_0("Use the constructor using a QMetaType instead") + QSqlField(const QString& fieldName, QVariant::Type type, const QString &tableName = QString()) + : QSqlField(fieldName, QMetaType(type), tableName) + {} QT_DEPRECATED_VERSION_X_6_0("Use metaType() instead") QVariant::Type type() const { return QVariant::Type(metaType().id()); }; QT_DEPRECATED_VERSION_X_6_0("Use setMetaType() instead") void setType(QVariant::Type type) { setMetaType(QMetaType(int(type))); } + QT_WARNING_POP #endif void setRequiredStatus(RequiredStatus status); |