diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-17 11:02:54 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-17 11:02:54 +0200 |
| commit | d90b155c6034bc16a9eb2d5794f101cde4ea9e2c (patch) | |
| tree | e648b8db6b9e8e8d7f0c765ac2953b066524eb49 /src/widgets/widgets | |
| parent | b00565bc2803bb783e8f2b0d02becfa73323e283 (diff) | |
| parent | d71bb504a635b51a85f3ccd919e0d77f869e50a8 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
mkspecs/macx-ios-clang/features/resolve_config.prf
src/testlib/qtestcase.qdoc
Change-Id: Icefa63056ffb37106f35299a8f19165535571799
Diffstat (limited to 'src/widgets/widgets')
| -rw-r--r-- | src/widgets/widgets/qcombobox.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index 728d243ce3..4287114ec3 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -1684,6 +1684,9 @@ void QComboBox::setIconSize(const QSize &size) By default, this property is \c false. The effect of editing depends on the insert policy. + \note When disabling the \a editable state, the validator and + completer are removed. + \sa InsertPolicy */ bool QComboBox::isEditable() const @@ -1837,6 +1840,8 @@ QLineEdit *QComboBox::lineEdit() const \fn void QComboBox::setValidator(const QValidator *validator) Sets the \a validator to use instead of the current validator. + + \note The validator is removed when the editable property becomes \c false. */ void QComboBox::setValidator(const QValidator *v) @@ -1870,6 +1875,8 @@ const QValidator *QComboBox::validator() const By default, for an editable combo box, a QCompleter that performs case insensitive inline completion is automatically created. + + \note The completer is removed when the \a editable property becomes \c false. */ void QComboBox::setCompleter(QCompleter *c) { |