From 03dbba9a62ea6391639c54ccc89ea75d4a872597 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lund=20Martsum?= <tmartsum@gmail.com>
Date: Fri, 16 Mar 2012 07:00:45 +0100
Subject: QLayoutItem - make controlTypes a virtual function.

Just implementing the ### Qt5 suggestion about making
controlTypes a virtual function.

Change-Id: Ic1db47fe488f089de965438e456e9b48e0b96f32
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
---
 tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'tests/auto/widgets')

diff --git a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
index 764d777cea..647376412f 100644
--- a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
+++ b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
@@ -52,6 +52,7 @@
 #include <QtWidgets/QFrame>
 #include <QtWidgets/QWindowsStyle>
 #include <QtWidgets/QSizePolicy>
+#include <QtWidgets/QComboBox>
 #include <QPushButton>
 #include <QRadioButton>
 #include <private/qlayoutengine_p.h>
@@ -77,6 +78,7 @@ private slots:
     void layoutItemRect();
     void warnIfWrongParent();
     void controlTypes();
+    void controlTypes2();
     void adjustSizeShouldMakeSureLayoutIsActivated();
 };
 
@@ -310,7 +312,16 @@ void tst_QLayout::controlTypes()
     QCOMPARE(layout.controlTypes(), QSizePolicy::DefaultType);
     QSizePolicy p;
     QCOMPARE(p.controlType(),QSizePolicy::DefaultType);
+}
 
+void tst_QLayout::controlTypes2()
+{
+    QWidget main;
+    QVBoxLayout *const layout = new QVBoxLayout(&main);
+    layout->setMargin(0);
+    QComboBox *combo = new QComboBox(&main);
+    layout->addWidget(combo);
+    QCOMPARE(layout->controlTypes(), QSizePolicy::ComboBox);
 }
 
 void tst_QLayout::adjustSizeShouldMakeSureLayoutIsActivated()
-- 
cgit v1.2.3