summaryrefslogtreecommitdiff
path: root/src/client/qwaylandwindow.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-10 03:03:32 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-10 03:03:32 +0100
commit47c5f14f1f4715a7ae129969ef81649d243a30da (patch)
treee8309c8c90349f6b1b54163308b1ccb362ef0055 /src/client/qwaylandwindow.cpp
parente0ceb66ebb47f693051f079d30d2e5de72fbd5b3 (diff)
parent1d0863049111926e0ff827cf17f3a7087d53c5c3 (diff)
downloadqtwayland-47c5f14f1f4715a7ae129969ef81649d243a30da.tar.gz
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I1f9418f4f5783291286417f6faf6277e0679007c
Diffstat (limited to 'src/client/qwaylandwindow.cpp')
-rw-r--r--src/client/qwaylandwindow.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index 751058d8..a6134cf4 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -426,8 +426,7 @@ void QWaylandWindow::setVisible(bool visible)
// QWaylandShmBackingStore::beginPaint().
} else {
sendExposeEvent(QRect());
- if (window()->type() == Qt::Popup)
- closePopups(this);
+ closePopups(this);
reset();
}
}