AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QComboBox: revert deprecation of currentIndexChanged(QString)

Browse Source 
QComboBox::currentIndexChanged(QString) was deprecated due to the fact
that there is a currentTextChanged(QString) signal but this signal is
not equivalent to the other since it's also emitted when the lineedit
text changes.
Therefore revert the deprecation of this signal.

Fixes: QTBUG-76890
Change-Id: Ia314116a5ac4e43e60383da9e729e24ffb3e8b30
Reviewed-by: Albert Astals Cid <aacid@kde.org>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
This commit is contained in:
Christian Ehrlicher 2019-07-04 18:48:26 +02:00
parent 0a37378e7a
commit 298f750cdb
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/widgets/widgets/qcombobox.cpp
View File

@ -896,11 +896,6 @@ QStyleOptionComboBox QComboBoxPrivateContainer::comboStyleOption() const
\fn void QComboBox::currentIndexChanged(const QString &text) \fn void QComboBox::currentIndexChanged(const QString &text)
\since 4.1 \since 4.1
\obsolete
Use currentTextChanged(const QString &) or currentIndexChanged(int)
instead.
This signal is sent whenever the currentIndex in the combobox This signal is sent whenever the currentIndex in the combobox
changes either through user interaction or programmatically. The changes either through user interaction or programmatically. The
item's \a text is passed. item's \a text is passed.

3
src/widgets/widgets/qcombobox.h
View File

@ -227,10 +227,7 @@ Q_SIGNALS:
void highlighted(int index); void highlighted(int index);
void highlighted(const QString &); void highlighted(const QString &);
void currentIndexChanged(int index); void currentIndexChanged(int index);
#if QT_DEPRECATED_SINCE(5, 13)
QT_DEPRECATED_X("Use currentTextChanged() instead")
void currentIndexChanged(const QString &); void currentIndexChanged(const QString &);
#endif
void currentTextChanged(const QString &); void currentTextChanged(const QString &);
protected: protected: