1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"

Browse Source
This commit is contained in:
Qt Forward Merge Bot 2019-06-08 03:00:50 +02:00
commit 3d258a12af
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/wayland/qwaylandwindow.cpp
View File

@ -387,7 +387,7 @@ QWaylandScreen *QWaylandWindow::calculateScreenFromSurfaceEvents() const
void QWaylandWindow::setVisible(bool visible) void QWaylandWindow::setVisible(bool visible)
{ {
if (visible) { if (visible) {
if (window()->type() & (Qt::Popup | Qt::ToolTip)) if (window()->type() == Qt::Popup || window()->type() == Qt::ToolTip)
activePopups << this; activePopups << this;
initWindow(); initWindow();
mDisplay->flushRequests(); mDisplay->flushRequests();