summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBłażej Szczygieł <spaz16@wp.pl>2016-01-05 00:58:50 +0100
committerBłażej Szczygieł <spaz16@wp.pl>2016-01-06 15:58:36 +0000
commitf3114120f2d6f81f424ee542635c2711f66b516b (patch)
treee1b51be1560012a02431895f6c30a5076406c89c
parent14a5a175ae30e72d7cb19fe5297c3948f484bd4f (diff)
QtGui: Don't set a screen to a child window
This is a partial revert of eaa3a9d0108cdf692f1686cafefb7b834f0e5af6 Task-number: QTBUG-50081 Change-Id: Ic3dc4daa90d7a968a4ebf45d3029c99a12985686 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
-rw-r--r--src/gui/kernel/qwindow.cpp16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index 83e8777627..21734f1619 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -609,18 +609,20 @@ void QWindow::setParent(QWindow *parent)
}
QObject::setParent(parent);
+ d->parentWindow = parent;
- QPlatformWindow *parentPlatformWindow = parent ? parent->d_func()->platformWindow : Q_NULLPTR;
-
- if (parentPlatformWindow)
+ if (parent)
d->disconnectFromScreen();
else
d->connectToScreen(newScreen);
- if (d->platformWindow)
- d->platformWindow->setParent(parentPlatformWindow);
-
- d->parentWindow = parent;
+ if (d->platformWindow) {
+ if (parent && parent->d_func()->platformWindow) {
+ d->platformWindow->setParent(parent->d_func()->platformWindow);
+ } else {
+ d->platformWindow->setParent(0);
+ }
+ }
QGuiApplicationPrivate::updateBlockedStatus(this);
}