diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-11-07 09:27:42 +0200 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-11-07 09:27:42 +0200 |
| commit | 1930af194c10d530f52d60be029ffe70892dedaa (patch) | |
| tree | 6bc962196ce8a284a6b86f1a01bc2a3cb1c1440c /src/widgets/kernel/qwidget.cpp | |
| parent | f73cd386c31aaa2f8a3386dd5fea00f654b209eb (diff) | |
| parent | 40b33adb7ab5d0295fa95cf66a8d3f59c8d11739 (diff) | |
Merge 5.12 into 5.12.6
Change-Id: I281538c2c9fc5d97a4b65d8add80e4eb1407ab7d
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 f5cc6bb853..db08a1d04f 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -1,4 +1,4 @@ -/**************************************************************************** +/**************************************************************************** ** ** Copyright (C) 2017 The Qt Company Ltd. ** Copyright (C) 2016 Intel Corporation. @@ -8445,6 +8445,8 @@ void QWidgetPrivate::showChildren(bool spontaneous) QList<QObject*> childList = children; for (int i = 0; i < childList.size(); ++i) { QWidget *widget = qobject_cast<QWidget*>(childList.at(i)); + if (widget && widget->windowHandle() && !widget->testAttribute(Qt::WA_WState_ExplicitShowHide)) + widget->setAttribute(Qt::WA_WState_Hidden, false); if (!widget || widget->isWindow() || widget->testAttribute(Qt::WA_WState_Hidden)) |