diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-09 12:13:01 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-09 12:13:02 +0200 |
| commit | 1f1e2aa57b480f0b227e11d0cff0b3cfcffb1f39 (patch) | |
| tree | 9d5a045b3fea13486cf6108fd9ef641f3a1f5135 /src/widgets | |
| parent | 3bac18da8ef9f5750207ddf47192b5db3137c4ac (diff) | |
| parent | 9da5b6f7432dc1d87cec94040ede69cb2f7ff537 (diff) | |
Merge remote-tracking branch 'origin/5.11.2' into 5.11
Change-Id: I2fa26fa061cbf5d2bded203a299a19b7d1c31d0a
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/widgets/qmaccocoaviewcontainer_mac.mm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm b/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm index 98ee90deb7..0b64b2a2bb 100644 --- a/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm +++ b/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm @@ -165,6 +165,11 @@ void QMacCocoaViewContainer::setCocoaView(NSView *view) Q_ASSERT(window->handle()); [oldView release]; + + // The QWindow::destroy()) call above will explicitly hide this widget. + // Clear the hidden state here so it can be implicitly shown again. + setAttribute(Qt::WA_WState_Hidden, false); + } QT_END_NAMESPACE |