summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-10-02 03:15:19 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-10-02 03:15:19 (GMT)
commitb148b182b5b48d60c2b57d8b74ad0f30272bb578 (patch)
tree43de2ac7798d4baf18f638d56cee403e70000e6b /src/declarative/util
parent6d06a9d19b4e0fc3ec2b7e32a014103c58e93ae0 (diff)
parentd1b4ce6a10267a7a7ca0fde24c2030815c96522d (diff)
downloadQt-b148b182b5b48d60c2b57d8b74ad0f30272bb578.zip
Qt-b148b182b5b48d60c2b57d8b74ad0f30272bb578.tar.gz
Qt-b148b182b5b48d60c2b57d8b74ad0f30272bb578.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util')
-rw-r--r--src/declarative/util/qmlview.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/declarative/util/qmlview.cpp b/src/declarative/util/qmlview.cpp
index 805612e..f932e4a 100644
--- a/src/declarative/util/qmlview.cpp
+++ b/src/declarative/util/qmlview.cpp
@@ -538,7 +538,11 @@ void QmlView::resizeEvent(QResizeEvent *e)
d->root->setWidth(width());
d->root->setHeight(height());
}
- setSceneRect(rect());
+ if (d->root) {
+ setSceneRect(QRectF(0, 0, d->root->width(), d->root->height()));
+ } else {
+ setSceneRect(rect());
+ }
QGraphicsView::resizeEvent(e);
}