diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-11 20:23:12 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-11 20:23:12 +0100 |
| commit | c53f8c038c0736aeb208bcd69bf3b5e2816c29ae (patch) | |
| tree | db26e488f8d165fa10d2ccd26ec2d029b0088d75 /src/widgets/widgets/qcombobox.h | |
| parent | 9bab556005e4d0475eeaf1b279c1da9ddac398f3 (diff) | |
| parent | c9e67a7926c2932217f6d484ea69219d077ef176 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: Ia0f7f0f1511f9f593c6d4585c859d1bf1353540d
Diffstat (limited to 'src/widgets/widgets/qcombobox.h')
| -rw-r--r-- | src/widgets/widgets/qcombobox.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h index 1b80f90c74..19bdf39233 100644 --- a/src/widgets/widgets/qcombobox.h +++ b/src/widgets/widgets/qcombobox.h @@ -233,12 +233,6 @@ Q_SIGNALS: void currentIndexChanged(int index); void currentIndexChanged(const QString &); 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; |