diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-08-27 14:11:14 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-09-06 12:54:54 +0000 |
commit | deab54f84f5771755c714e52b4587f152de09446 (patch) | |
tree | eef5aac60d3151c8ec53995b5787c0f91efc7e1c /src/widgets | |
parent | d115196010efb4ac55be998ffe7ed00db0cbffaf (diff) |
Fix crash when setting Qt::WA_StaticContents on a transient child
Bail out of QWidgetBackingStore::updateLists() when a
top level transient child is encountered, preventing from
adding children of other top level windows to its list.
Task-number: QTBUG-70085
Change-Id: Ibd748ab959af9bfe7fe0622494936b0c109ab25a
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/kernel/qwidgetbackingstore.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/kernel/qwidgetbackingstore.cpp b/src/widgets/kernel/qwidgetbackingstore.cpp index cbf949be92..53769ef9ed 100644 --- a/src/widgets/kernel/qwidgetbackingstore.cpp +++ b/src/widgets/kernel/qwidgetbackingstore.cpp @@ -760,7 +760,7 @@ void QWidgetBackingStore::updateLists(QWidget *cur) QList<QObject*> children = cur->children(); for (int i = 0; i < children.size(); ++i) { QWidget *child = qobject_cast<QWidget*>(children.at(i)); - if (!child) + if (!child || child->isWindow()) continue; updateLists(child); |