diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-08 03:00:50 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-08 03:00:51 +0200 |
| commit | 0079313454e6980e8b533dc06d13e5a4f6c18461 (patch) | |
| tree | 86dd9abdcb43c4be292606cf4da6ebe7f7433e0f /src/client | |
| parent | 21a5038f8a2a6acc6dd1cc2f6bb0318d2c17f741 (diff) | |
| parent | af9ec8a76d7e62444fadb518256fc58723fe5186 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ie2469da765326e1e2da35c0311c0405b0a691bfa
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/qwaylandwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp index 4532bc236..8b2c12277 100644 --- a/src/client/qwaylandwindow.cpp +++ b/src/client/qwaylandwindow.cpp @@ -387,7 +387,7 @@ QWaylandScreen *QWaylandWindow::calculateScreenFromSurfaceEvents() const void QWaylandWindow::setVisible(bool visible) { if (visible) { - if (window()->type() & (Qt::Popup | Qt::ToolTip)) + if (window()->type() == Qt::Popup || window()->type() == Qt::ToolTip) activePopups << this; initWindow(); mDisplay->flushRequests(); |