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

Merge integration refs/builds/qtci/dev/1617887904

Browse Source
This commit is contained in:
Qt CI Bot 2021-04-08 18:53:33 +00:00
commit 7d37ce8832
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui/kernel/qwindow.cpp
View File

@ -1972,17 +1972,6 @@ void QWindowPrivate::destroy()
} }
} }
if (QGuiApplicationPrivate::focus_window == q)
QGuiApplicationPrivate::focus_window = q->parent();
if (QGuiApplicationPrivate::currentMouseWindow == q)
QGuiApplicationPrivate::currentMouseWindow = q->parent();
if (QGuiApplicationPrivate::currentMousePressWindow == q)
QGuiApplicationPrivate::currentMousePressWindow = q->parent();
for (int i = 0; i < QGuiApplicationPrivate::tabletDevicePoints.size(); ++i)
if (QGuiApplicationPrivate::tabletDevicePoints.at(i).target == q)
QGuiApplicationPrivate::tabletDevicePoints[i].target = q->parent();
bool wasVisible = q->isVisible(); bool wasVisible = q->isVisible();
visibilityOnDestroy = wasVisible && platformWindow; visibilityOnDestroy = wasVisible && platformWindow;
@ -2007,6 +1996,17 @@ void QWindowPrivate::destroy()
platformWindow = nullptr; platformWindow = nullptr;
delete pw; delete pw;
if (QGuiApplicationPrivate::focus_window == q)
QGuiApplicationPrivate::focus_window = q->parent();
if (QGuiApplicationPrivate::currentMouseWindow == q)
QGuiApplicationPrivate::currentMouseWindow = q->parent();
if (QGuiApplicationPrivate::currentMousePressWindow == q)
QGuiApplicationPrivate::currentMousePressWindow = q->parent();
for (int i = 0; i < QGuiApplicationPrivate::tabletDevicePoints.size(); ++i)
if (QGuiApplicationPrivate::tabletDevicePoints.at(i).target == q)
QGuiApplicationPrivate::tabletDevicePoints[i].target = q->parent();
resizeEventPending = true; resizeEventPending = true;
receivedExpose = false; receivedExpose = false;
exposed = false; exposed = false;