diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-03-15 19:04:30 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-03-15 19:04:30 +0000 |
| commit | 8cc8eb8f24b9d297a25c9841326c6fa8561cf80e (patch) | |
| tree | 9f9d05bb098dc65b8a36c5db59b451573e507cb9 /src/widgets/widgets | |
| parent | 73a2e9c4098037aaa540b97ff097c660290622da (diff) | |
| parent | 32084b073362e52df597cc388cf54f5173e20b0d (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev" into refs/staging/dev
Diffstat (limited to 'src/widgets/widgets')
| -rw-r--r-- | src/widgets/widgets/qabstractspinbox.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qcombobox.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/widgets/qabstractspinbox.cpp b/src/widgets/widgets/qabstractspinbox.cpp index da4c2f98cf..54caa26fb6 100644 --- a/src/widgets/widgets/qabstractspinbox.cpp +++ b/src/widgets/widgets/qabstractspinbox.cpp @@ -688,7 +688,7 @@ QLineEdit *QAbstractSpinBox::lineEdit() const \fn void QAbstractSpinBox::setLineEdit(QLineEdit *lineEdit) Sets the line edit of the spinbox to be \a lineEdit instead of the - current line edit widget. \a lineEdit cannot be 0. + current line edit widget. \a lineEdit cannot be \nullptr. QAbstractSpinBox takes ownership of the new lineEdit diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index 7e29a417ea..932affde07 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -2046,7 +2046,7 @@ QAbstractItemModel *QComboBox::model() const } /*! - Sets the model to be \a model. \a model must not be 0. + Sets the model to be \a model. \a model must not be \nullptr. If you want to clear the contents of a model, call clear(). \sa clear() |