diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-11 03:00:05 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-11 03:00:05 +0200 |
| commit | cc792eba2fdddcfbcc217636379610f6e677031a (patch) | |
| tree | 48f855652af5e1def8cbf7c024e9c26c70ec29a8 | |
| parent | 8530b851b25d411f7db0499b7df8b5e8fdf95876 (diff) | |
| parent | e367643f57d0ce08759e9ec9a2e21696023036a9 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ieab9f7c86371a7c047cf9b4a527fabcc541155e4
| -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 c3bfdeaff..9a58ec39a 100644 --- a/src/client/qwaylandwindow.cpp +++ b/src/client/qwaylandwindow.cpp @@ -398,7 +398,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(); |