diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-17 09:57:01 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-27 12:22:33 +0200 |
| commit | 1a342b2db14fa92bca717f5daff950b2eef869f7 (patch) | |
| tree | b5f0c7d91554159798f8a840a2e8fcf88b0a6c88 /tests/auto/widgets | |
| parent | 6dd90afb76ab46a3d7a90bd9dec6a5f8ab42a383 (diff) | |
Remove deprecated QComboBox::SizeAdjustPolicy enum value
Change-Id: Ia8ae2eb11b86bc615e1297d7fabd1afcb821557c
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests/auto/widgets')
| -rw-r--r-- | tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp index 10430e1796..444bf9d624 100644 --- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp @@ -302,8 +302,6 @@ void tst_QComboBox::getSetCheck() QCOMPARE(QComboBox::SizeAdjustPolicy(QComboBox::AdjustToContents), obj1.sizeAdjustPolicy()); obj1.setSizeAdjustPolicy(QComboBox::SizeAdjustPolicy(QComboBox::AdjustToContentsOnFirstShow)); QCOMPARE(QComboBox::SizeAdjustPolicy(QComboBox::AdjustToContentsOnFirstShow), obj1.sizeAdjustPolicy()); - obj1.setSizeAdjustPolicy(QComboBox::SizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength)); - QCOMPARE(QComboBox::SizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength), obj1.sizeAdjustPolicy()); obj1.setSizeAdjustPolicy(QComboBox::SizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLengthWithIcon)); QCOMPARE(QComboBox::SizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLengthWithIcon), obj1.sizeAdjustPolicy()); @@ -531,19 +529,10 @@ void tst_QComboBox::sizeAdjustPolicy() testWidget->addItem("normal item"); QCOMPARE(testWidget->sizeHint(), firstShow); - // check that with minimumContentsLength/AdjustToMinimumContentsLength sizehint changes - testWidget->setMinimumContentsLength(30); - QCOMPARE(testWidget->sizeHint(), firstShow); - testWidget->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength); - QSize minimumContentsLength = testWidget->sizeHint(); - QVERIFY(minimumContentsLength.width() > firstShow.width()); - testWidget->setMinimumContentsLength(60); - QVERIFY(minimumContentsLength.width() < testWidget->sizeHint().width()); - // check that with minimumContentsLength/AdjustToMinimumContentsLengthWithIcon sizehint changes testWidget->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLengthWithIcon); testWidget->setMinimumContentsLength(30); - minimumContentsLength = testWidget->sizeHint(); + QSize minimumContentsLength = testWidget->sizeHint(); QVERIFY(minimumContentsLength.width() > firstShow.width()); testWidget->setMinimumContentsLength(60); QVERIFY(minimumContentsLength.width() < testWidget->sizeHint().width()); |