diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/widgets/qcombobox.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index b1f2d40d38..607709d218 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -385,6 +385,16 @@ int QComboBoxPrivate::computeWidthHint() const return tmp.width(); } +#if QT_DEPRECATED_SINCE(5, 15) +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED +static constexpr QComboBox::SizeAdjustPolicy deprecatedAdjustToMinimumContentsLength() +{ + return QComboBox::AdjustToMinimumContentsLength; +} +QT_WARNING_POP +#endif + QSize QComboBoxPrivate::recomputeSizeHint(QSize &sh) const { Q_Q(const QComboBox); @@ -412,10 +422,11 @@ QSize QComboBoxPrivate::recomputeSizeHint(QSize &sh) const } } break; - case QComboBox::AdjustToMinimumContentsLength: + case deprecatedAdjustToMinimumContentsLength(): for (int i = 0; i < count && !hasIcon; ++i) hasIcon = !q->itemIcon(i).isNull(); - default: + break; + case QComboBox::AdjustToMinimumContentsLengthWithIcon: ; } } else { @@ -1792,7 +1803,7 @@ void QComboBox::setMinimumContentsLength(int characters) d->minimumContentsLength = characters; if (d->sizeAdjustPolicy == AdjustToContents - || d->sizeAdjustPolicy == AdjustToMinimumContentsLength + || d->sizeAdjustPolicy == deprecatedAdjustToMinimumContentsLength() || d->sizeAdjustPolicy == AdjustToMinimumContentsLengthWithIcon) { d->sizeHint = QSize(); d->adjustComboBoxSize(); |