diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-02-10 16:57:11 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-02-10 16:57:11 +0000 |
| commit | 0866680bd904aff4fe2a643a2b81c460cbb99c77 (patch) | |
| tree | 242dae052199994a35f5e68578661175241a0a71 /src/widgets/kernel/qwindowcontainer.cpp | |
| parent | 34ea269b3b173498312b0203d6875ef3b4ba0253 (diff) | |
| parent | fc35f714340d5361231506dfbead132122f59460 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Diffstat (limited to 'src/widgets/kernel/qwindowcontainer.cpp')
| -rw-r--r-- | src/widgets/kernel/qwindowcontainer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/kernel/qwindowcontainer.cpp b/src/widgets/kernel/qwindowcontainer.cpp index 34cfb2d99f3..5460a43ef49 100644 --- a/src/widgets/kernel/qwindowcontainer.cpp +++ b/src/widgets/kernel/qwindowcontainer.cpp @@ -64,7 +64,7 @@ public: void updateGeometry() { Q_Q(QWindowContainer); - if (q->geometry().bottom() <= 0 || q->geometry().right() <= 0) + if (!q->isWindow() && (q->geometry().bottom() <= 0 || q->geometry().right() <= 0)) /* Qt (e.g. QSplitter) sometimes prefer to hide a widget by *not* calling setVisible(false). This is often done by setting its coordinates to a sufficiently negative value so that its clipped outside the parent. Since a QWindow is not clipped |