diff options
Diffstat (limited to 'src/widgets/widgets/qcombobox.h')
| -rw-r--r-- | src/widgets/widgets/qcombobox.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h index e0b213bc89..99816954fa 100644 --- a/src/widgets/widgets/qcombobox.h +++ b/src/widgets/widgets/qcombobox.h @@ -173,7 +173,7 @@ public: void setItemDelegate(QAbstractItemDelegate *delegate); QAbstractItemModel *model() const; - void setModel(QAbstractItemModel *model); + virtual void setModel(QAbstractItemModel *model); QModelIndex rootModelIndex() const; void setRootModelIndex(const QModelIndex &index); @@ -233,20 +233,8 @@ Q_SIGNALS: void textActivated(const QString &); void highlighted(int index); void textHighlighted(const QString &); -#if QT_DEPRECATED_SINCE(5, 15) - QT_DEPRECATED_VERSION_X_5_15("Use currentIndexChanged(int, const QString &) instead") - void currentIndexChanged(int index); - QT_DEPRECATED_VERSION_X_5_15("Use currentIndexChanged(int, const QString &) instead") - void currentIndexChanged(const QString &); -#endif void currentIndexChanged(int index, const QString &text); void currentTextChanged(const QString &); -#if QT_DEPRECATED_SINCE(5, 15) - QT_DEPRECATED_VERSION_X(5, 15, "Use textActivated() instead") - void activated(const QString &); - QT_DEPRECATED_VERSION_X(5, 15, "Use textHighlighted() instead") - void highlighted(const QString &); -#endif protected: void focusInEvent(QFocusEvent *e) override; |