diff options
author | Thorbjørn Lund Martsum <tmartsum@gmail.com> | 2012-03-16 07:00:45 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-13 10:17:44 +0200 |
commit | 03dbba9a62ea6391639c54ccc89ea75d4a872597 (patch) | |
tree | f006bc6f19e616d585a0966ac8d84c8bc439c91e /src/widgets/kernel/qlayout.cpp | |
parent | aec8bac3130c3c11333978b89c9fc5cf586c9bd0 (diff) |
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>
Diffstat (limited to 'src/widgets/kernel/qlayout.cpp')
-rw-r--r-- | src/widgets/kernel/qlayout.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
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 @@ -527,6 +527,19 @@ bool QLayout::isEmpty() const /*! \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 +*/ void QLayout::setGeometry(const QRect &r) { Q_D(QLayout); |