diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-29 00:38:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-29 00:38:01 +0200 |
| commit | cdb56c42fc1145ad25560720fb95df2bfa760a20 (patch) | |
| tree | 4dbe524a511b9343464e8509bd5352715aebdfa9 /src/widgets/kernel/qwidget.cpp | |
| parent | 87583738f960e83918da3b66e455e75c144fbf8e (diff) | |
| parent | e918334045612ec2c7c6203845ad05c4a1972e87 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
mkspecs/features/uikit/xcodebuild.mk
tests/auto/other/lancelot/tst_lancelot.cpp
tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
Change-Id: Ia0ae2de86094120281abd445138877c2cc3e882c
Diffstat (limited to 'src/widgets/kernel/qwidget.cpp')
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 28f4cd34ce..51e1ef9aaf 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -5226,8 +5226,10 @@ static void sendResizeEvents(QWidget *target) const QObjectList children = target->children(); for (int i = 0; i < children.size(); ++i) { + if (!children.at(i)->isWidgetType()) + continue; QWidget *child = static_cast<QWidget*>(children.at(i)); - if (child->isWidgetType() && !child->isWindow() && child->testAttribute(Qt::WA_PendingResizeEvent)) + if (!child->isWindow() && child->testAttribute(Qt::WA_PendingResizeEvent)) sendResizeEvents(child); } } |