diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-17 11:51:14 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-05-06 09:54:08 +0200 |
| commit | d39fefc0ebc8481dd695be031d9479a6ee397612 (patch) | |
| tree | 425c00d5adfc57c2957afbf5ae9b4d95d305e20e /src/widgets/widgets/qcombobox.h | |
| parent | 55b470e41120a5878a7cdbb792f12e63e603ea68 (diff) | |
QComboBox: Remove deprecated auto-completion properties
The replacement is to set, and configure, a QCompleter directly via
setCompleter. With the removal of the separate properties in QComboBox,
the configuration of the completer is not maintained if the line edit
is replaced. A QCompleter is created and set implicitly when the line
edit is set, unless the line edit came with a completer. This is what
the auto test verifies as well.
Change-Id: I9a4c73db5e39a2558aad346c0904be6deb4f1cd2
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/widgets/widgets/qcombobox.h')
| -rw-r--r-- | src/widgets/widgets/qcombobox.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h index 38000e336b..1e518fb2c0 100644 --- a/src/widgets/widgets/qcombobox.h +++ b/src/widgets/widgets/qcombobox.h @@ -72,14 +72,6 @@ class Q_WIDGETS_EXPORT QComboBox : public QWidget Q_PROPERTY(int minimumContentsLength READ minimumContentsLength WRITE setMinimumContentsLength) Q_PROPERTY(QSize iconSize READ iconSize WRITE setIconSize) Q_PROPERTY(QString placeholderText READ placeholderText WRITE setPlaceholderText) - -#if QT_CONFIG(completer) -#if QT_DEPRECATED_SINCE(5, 13) - Q_PROPERTY(bool autoCompletion READ autoCompletion WRITE setAutoCompletion DESIGNABLE false) - Q_PROPERTY(Qt::CaseSensitivity autoCompletionCaseSensitivity READ autoCompletionCaseSensitivity WRITE setAutoCompletionCaseSensitivity DESIGNABLE false) -#endif -#endif // QT_CONFIG(completer) - Q_PROPERTY(bool duplicatesEnabled READ duplicatesEnabled WRITE setDuplicatesEnabled) Q_PROPERTY(bool frame READ hasFrame WRITE setFrame) Q_PROPERTY(int modelColumn READ modelColumn WRITE setModelColumn) @@ -95,19 +87,6 @@ public: void setMaxCount(int max); int maxCount() const; -#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 - bool duplicatesEnabled() const; void setDuplicatesEnabled(bool enable); |