diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-10 01:00:41 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-10 17:01:22 +0200 |
| commit | 85d3061c1cd4617ef09cb381320611c27da205a5 (patch) | |
| tree | 2e4755ff4804008f982480d1669ba7659c3685a6 /src/widgets/widgets/qcombobox.h | |
| parent | ca6a037d95ed1915773bf28f9190a012164c6443 (diff) | |
| parent | 6fd20defb95f0f3a7d1162641bd4ae9e0ed91bcc (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
Diffstat (limited to 'src/widgets/widgets/qcombobox.h')
| -rw-r--r-- | src/widgets/widgets/qcombobox.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h index 3b48b151a1..286772c091 100644 --- a/src/widgets/widgets/qcombobox.h +++ b/src/widgets/widgets/qcombobox.h @@ -227,11 +227,8 @@ Q_SIGNALS: void highlighted(int index); void textHighlighted(const QString &); void currentIndexChanged(int index); - void currentTextChanged(const QString &); -#if QT_DEPRECATED_SINCE(5, 13) - QT_DEPRECATED_VERSION_X(5, 13, "Use currentTextChanged() instead") void currentIndexChanged(const QString &); -#endif + void currentTextChanged(const QString &); #if QT_DEPRECATED_SINCE(5, 15) QT_DEPRECATED_VERSION_X(5, 15, "Use textActivated() instead") void activated(const QString &); |