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 10:39:33 +0200 |
commit | 6fd20defb95f0f3a7d1162641bd4ae9e0ed91bcc (patch) | |
tree | 2d8c70bc359810f926374ffebd649576345a9c7f /src/widgets/widgets/qcombobox.cpp | |
parent | d72ea9cbd3c2bde4645745c5aeba7cc052d87f0d (diff) | |
parent | 4bb975717b0ba2c7b41e1a44192c2d54c919cfee (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/corelib/time/qdatetime.cpp
src/widgets/widgets/qcombobox.h
Change-Id: Ib84352e8fe34aed2986a1c94e7346a46a71c803b
Diffstat (limited to 'src/widgets/widgets/qcombobox.cpp')
-rw-r--r-- | src/widgets/widgets/qcombobox.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index 0b52747b6a..d0261d6653 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -896,11 +896,6 @@ QStyleOptionComboBox QComboBoxPrivateContainer::comboStyleOption() const \fn void QComboBox::currentIndexChanged(const QString &text) \since 4.1 - \obsolete - - Use currentTextChanged(const QString &) or currentIndexChanged(int) - instead. - This signal is sent whenever the currentIndex in the combobox changes either through user interaction or programmatically. The item's \a text is passed. |