diff options
Diffstat (limited to 'src/widgets/widgets/qcombobox.cpp')
| -rw-r--r-- | src/widgets/widgets/qcombobox.cpp | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index fd82384c03..c236ab434b 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -385,16 +385,6 @@ 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); @@ -422,10 +412,6 @@ QSize QComboBoxPrivate::recomputeSizeHint(QSize &sh) const } } break; - case deprecatedAdjustToMinimumContentsLength(): - for (int i = 0; i < count && !hasIcon; ++i) - hasIcon = !q->itemIcon(i).isNull(); - break; case QComboBox::AdjustToMinimumContentsLengthWithIcon: ; } @@ -905,8 +891,8 @@ QStyleOptionComboBox QComboBoxPrivateContainer::comboStyleOption() const \value AdjustToContents The combobox will always adjust to the contents \value AdjustToContentsOnFirstShow The combobox will adjust to its contents the first time it is shown. - \omitvalue AdjustToMinimumContentsLength - \value AdjustToMinimumContentsLengthWithIcon The combobox will adjust to \l minimumContentsLength plus space for an icon. For performance reasons use this policy on large models. + \value AdjustToMinimumContentsLengthWithIcon The combobox will adjust to \l minimumContentsLength plus space for an icon. + For performance reasons use this policy on large models. */ /*! @@ -1753,8 +1739,7 @@ void QComboBox::setMinimumContentsLength(int characters) d->minimumContentsLength = characters; if (d->sizeAdjustPolicy == AdjustToContents - || d->sizeAdjustPolicy == deprecatedAdjustToMinimumContentsLength() - || d->sizeAdjustPolicy == AdjustToMinimumContentsLengthWithIcon) { + || d->sizeAdjustPolicy == AdjustToMinimumContentsLengthWithIcon) { d->sizeHint = QSize(); d->adjustComboBoxSize(); updateGeometry(); |