whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QComboxBox: Silence warnings about deprecated API 

Fix:

widgets/qcombobox.cpp: In member function 'void QComboBoxPrivate::emitActivated(const QModelIndex&)':
widgets/qcombobox.cpp:1369:22: warning: 'void QComboBox::activated(const QString&)' is deprecated: Use textActivated() instead [-Wdeprecated-declarations]
In file included from widgets/qcombobox.cpp:40:0:
widgets/qcombobox.h:234:10: note: declared here
widgets/qcombobox.cpp: In member function 'void QComboBoxPrivate::_q_emitHighlighted(const QModelIndex&)':
widgets/qcombobox.cpp:1382:24: warning: 'void QComboBox::highlighted(const QString&)' is deprecated: Use textHighlighted() instead [-Wdeprecated-declarations]

Change-Id: I11bdbbeeaa05f1e1bd91351eba329ce9895951f9
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
bb10
Friedemann Kleint 2019-03-06 12:55:18 +01:00
parent ca037c0631
commit 329e3d4ec4
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1366,7 +1366,10 @@ void QComboBoxPrivate::emitActivated(const QModelIndex &index)
emit q->activated(index.row());
emit q->textActivated(text);
#if QT_DEPRECATED_SINCE(5, 15)
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED
emit q->activated(text);
QT_WARNING_POP
#endif
}
@ -1379,7 +1382,10 @@ void QComboBoxPrivate::_q_emitHighlighted(const QModelIndex &index)
emit q->highlighted(index.row());
emit q->textHighlighted(text);
#if QT_DEPRECATED_SINCE(5, 15)
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED
emit q->highlighted(text);
QT_WARNING_POP
#endif
}