Merge "Merge remote-tracking branch 'origin/api_changes'" into refs/staging/master

1 files changed, 5 insertions, 11 deletions

diff --git a/src/widgets/kernel/qlayoutitem.cpp b/src/widgets/kernel/qlayoutitem.cpp
index 814b807b82..8e08f5f39f 100644
--- a/src/widgets/kernel/qlayoutitem.cpp
+++ b/src/widgets/kernel/qlayoutitem.cpp
@@ -414,17 +414,6 @@ int QLayoutItem::heightForWidth(int /* w */) const
 */
 QSizePolicy::ControlTypes QLayoutItem::controlTypes() const
 {
-    // ### Qt 5: This function should probably be virtual instead
-    if (const QWidget *widget = const_cast<QLayoutItem*>(this)->widget()) {
-        return widget->sizePolicy().controlType();
-    } else if (const QLayout *layout = const_cast<QLayoutItem*>(this)->layout()) {
-        if (layout->count() == 0)
-            return QSizePolicy::DefaultType;
-        QSizePolicy::ControlTypes types;
-        for (int i = layout->count() - 1; i >= 0; --i)
-            types |= layout->itemAt(i)->controlTypes();
-        return types;
-    }
     return QSizePolicy::DefaultType;
 }
 
@@ -688,6 +677,11 @@ bool QWidgetItem::isEmpty() const
     return wid->isHidden() || wid->isWindow();
 }
 
+QSizePolicy::ControlTypes QWidgetItem::controlTypes() const
+{
+    return wid->sizePolicy().controlType();
+}
+
 /*!
     \class QWidgetItemV2
     \internal