QComboBox: add QT_DEPRECATED_X() for deprecated functions
QT_DEPRECATED_X() was not added with d6d33f0b80dd85043c71f71a3ed5485d6014e6c4 for the deprecated QComboBox functions - Add them now. Change-Id: I8d4ea08766ae6ff052dfccac6c3f35ecf34affb7 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
This commit is contained in:
parent
3803b41eae
commit
8bcc6f111b
@ -1509,7 +1509,7 @@ int QComboBox::maxCount() const
|
||||
/*!
|
||||
\obsolete
|
||||
|
||||
Use setCompleter() instead.
|
||||
Use completer() instead.
|
||||
*/
|
||||
bool QComboBox::autoCompletion() const
|
||||
{
|
||||
|
@ -96,10 +96,13 @@ public:
|
||||
|
||||
#if QT_CONFIG(completer)
|
||||
#if QT_DEPRECATED_SINCE(5, 13)
|
||||
QT_DEPRECATED_X("Use completer() instead.")
|
||||
bool autoCompletion() const;
|
||||
QT_DEPRECATED_X("Use setCompleter() instead.")
|
||||
void setAutoCompletion(bool enable);
|
||||
|
||||
QT_DEPRECATED_X("Use completer()->caseSensitivity() instead.")
|
||||
Qt::CaseSensitivity autoCompletionCaseSensitivity() const;
|
||||
QT_DEPRECATED_X("Use completer()->setCaseSensitivity() instead.")
|
||||
void setAutoCompletionCaseSensitivity(Qt::CaseSensitivity sensitivity);
|
||||
#endif
|
||||
#endif
|
||||
|
@ -852,8 +852,8 @@ void tst_QComboBox::autoCompletionCaseSensitivity()
|
||||
// case insensitive
|
||||
testWidget->clearEditText();
|
||||
QSignalSpy spyReturn(testWidget, SIGNAL(activated(int)));
|
||||
testWidget->setAutoCompletionCaseSensitivity(Qt::CaseInsensitive);
|
||||
QCOMPARE(testWidget->autoCompletionCaseSensitivity(), Qt::CaseInsensitive);
|
||||
testWidget->completer()->setCaseSensitivity(Qt::CaseInsensitive);
|
||||
QCOMPARE(testWidget->completer()->caseSensitivity(), Qt::CaseInsensitive);
|
||||
|
||||
QTest::keyClick(testWidget->lineEdit(), Qt::Key_A);
|
||||
qApp->processEvents();
|
||||
@ -886,8 +886,8 @@ void tst_QComboBox::autoCompletionCaseSensitivity()
|
||||
|
||||
// case sensitive
|
||||
testWidget->clearEditText();
|
||||
testWidget->setAutoCompletionCaseSensitivity(Qt::CaseSensitive);
|
||||
QCOMPARE(testWidget->autoCompletionCaseSensitivity(), Qt::CaseSensitive);
|
||||
testWidget->completer()->setCaseSensitivity(Qt::CaseSensitive);
|
||||
QCOMPARE(testWidget->completer()->caseSensitivity(), Qt::CaseSensitive);
|
||||
QTest::keyClick(testWidget->lineEdit(), Qt::Key_A);
|
||||
qApp->processEvents();
|
||||
QCOMPARE(testWidget->currentText(), QString("aww"));
|
||||
|
Loading…
x
Reference in New Issue
Block a user