summaryrefslogtreecommitdiffstats
path: root/src/widgets/widgets/qcombobox.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets/widgets/qcombobox.h')
-rw-r--r--src/widgets/widgets/qcombobox.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h
index 1f6e2fcdb3..56386a4b8c 100644
--- a/src/widgets/widgets/qcombobox.h
+++ b/src/widgets/widgets/qcombobox.h
@@ -170,7 +170,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);
@@ -238,12 +238,6 @@ Q_SIGNALS:
#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;