From 371113810e74f44f30a056ac5f28b7ec9bc9b28d Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Tue, 11 Jun 2024 20:44:01 +0200 Subject: [PATCH] SQL/QSqlField: move deprecated functions decls to correct place Don't move them around during deprecation. Change-Id: I647fec5a440ea063463dc285def5d793726a9e61 Reviewed-by: Axel Spoerl (cherry picked from commit 70475a652a9a44651c25126f6615770e8b43ca1b) Reviewed-by: Qt Cherry-pick Bot --- src/sql/kernel/qsqlfield.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/sql/kernel/qsqlfield.h b/src/sql/kernel/qsqlfield.h index 96ace6a359f..6404253be62 100644 --- a/src/sql/kernel/qsqlfield.h +++ b/src/sql/kernel/qsqlfield.h @@ -82,6 +82,10 @@ public: void setLength(int fieldLength); void setPrecision(int precision); void setDefaultValue(const QVariant &value); +#if QT_DEPRECATED_SINCE(6, 8) + QT_DEPRECATED_VERSION_X_6_8("This internal value is no longer used.") + void setSqlType(int type); +#endif void setGenerated(bool gen); void setAutoValue(bool autoVal); @@ -89,15 +93,13 @@ public: int length() const; int precision() const; QVariant defaultValue() 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 + bool isGenerated() const; + bool isValid() const; + private: void detach(); // ### Qt7: move to private class