QMacStyle: CC_ComboBox is now HITheme-free

For the time being, no more stretched QComboBox. They
were already looking bad before and nobody complained,
so it's a non-issue. In the future, we might use square
combo boxes in the same way as we do for push buttons
but for non-editable QComboBox only.

Removes what is now dead code, including some leftovers.

tst_QMacStyle updated to reflect size changes to accom-
modate the focus ring.

Change-Id: I60fac86b9acb52cc96373bca0b3cad598ec4f1e7
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp b/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp
index 2ab2fa4c86..a78ebdb2b9 100644
--- a/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp
+++ b/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp
@@ -128,12 +128,12 @@ void tst_QMacStyle::sizeHints()
     QComboBox comboBox1(&w);
     comboBox1.setEditable(false);
     comboBox1.addItem("Foo");
-    QCOMPARE(sh(&comboBox1).height(), SIZE(20, 17, 15));
+    QCOMPARE(sh(&comboBox1).height(), SIZE(26, 17, 15));
 
     QComboBox comboBox2(&w);
     comboBox2.setEditable(true);
     comboBox2.addItem("Foo");
-    QCOMPARE(sh(&comboBox2).height(), SIZE(22, 17, 15));
+    QCOMPARE(sh(&comboBox2).height(), SIZE(26, 17, 15));
 
     // Combos in toolbars use the actual widget rect to
     // avoid faulty clipping:
@@ -141,7 +141,7 @@ void tst_QMacStyle::sizeHints()
     setSize(&tb, size);
     QComboBox comboBox3(&tb);
     comboBox3.addItem("Foo");
-    QCOMPARE(sh(&comboBox3).height(), SIZE(26, -1, -1));
+    QCOMPARE(sh(&comboBox3).height(), SIZE(32, -1, -1));
 
     QSlider slider1(Qt::Horizontal, &w);
     QCOMPARE(sh(&slider1).height(), SIZE(15, 12, 10));