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>
---
 src/widgets/kernel/qlayout.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'src/widgets/kernel/qlayout.cpp')

diff --git a/src/widgets/kernel/qlayout.cpp b/src/widgets/kernel/qlayout.cpp
index 541350c35c..8c4e988411 100644
--- a/src/widgets/kernel/qlayout.cpp
+++ b/src/widgets/kernel/qlayout.cpp
@@ -524,6 +524,19 @@ bool QLayout::isEmpty() const
     return true;
 }
 
+/*!
+    \reimp
+*/
+QSizePolicy::ControlTypes QLayout::controlTypes() const
+{
+    if (count() == 0)
+        return QSizePolicy::DefaultType;
+    QSizePolicy::ControlTypes types;
+    for (int i = count() - 1; i >= 0; --i)
+        types |= itemAt(i)->controlTypes();
+    return types;
+}
+
 /*!
     \reimp
 */
-- 
cgit v1.2.3