summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms
diff options
context:
space:
mode:
authorArvid Nilsson <anilsson@blackberry.com>2013-11-21 11:37:31 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-23 15:45:06 +0100
commit88728897a69275299d53a094d3a5745cc6a90c6d (patch)
tree897cfd0f4966531d8ed147a0cab4cf77fb2a8343 /src/plugins/platforms
parent376ccedd1a04c196ba3cefb7d4e7d6acbceb66e8 (diff)
BlackBerry: Fixed root window size, continued
The previous patch removed a call to setGeometry, and now only calls setGeometryHelper. This means the screen window will be resized, but Qt won't know about our new window size. The scene graph of a QtQuick2 application would layout and render to the wrong target size. Fixed by adding a call to QWindowSystemInterface::handleGeometryChange if we decide to use a different geometry than suggested by the window. Task-number: QTBUG-34930 Change-Id: Ie91c2edc45c47f5bf1d45aed981b969fcc3f40dd Reviewed-by: Bernd Weimer <bweimer@blackberry.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r--src/plugins/platforms/qnx/qqnxwindow.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/platforms/qnx/qqnxwindow.cpp b/src/plugins/platforms/qnx/qqnxwindow.cpp
index 731e0e5ea7..b25c0b5b29 100644
--- a/src/plugins/platforms/qnx/qqnxwindow.cpp
+++ b/src/plugins/platforms/qnx/qqnxwindow.cpp
@@ -609,9 +609,12 @@ void QQnxWindow::initWindow()
if (window()->parent() && window()->parent()->handle())
setParent(window()->parent()->handle());
- const QRect &initialGeometry = screen()->rootWindow() == this ?
- screen()->geometry() : window()->geometry();
- setGeometryHelper(initialGeometry);
+ if (screen()->rootWindow() == this) {
+ setGeometryHelper(screen()->geometry());
+ QWindowSystemInterface::handleGeometryChange(window(), screen()->geometry());
+ } else {
+ setGeometryHelper(window()->geometry());
+ }
}
void QQnxWindow::createWindowGroup()