Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
This commit is contained in:
commit
3d258a12af
@ -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();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user