From daf6a270888d2f70e57a838d0ba4adae954c3d22 Mon Sep 17 00:00:00 2001 From: Martin Jones Date: Tue, 26 Jul 2011 10:34:53 +1000 Subject: QDeclarativeView/QSGView SizeRootObjectToView still resizes view Only resize view to object in SizeRootObjectToView if the view has not had a size set, i.e. at initial construction. Change-Id: Ic5ad3cbb3b071c3498047be893da2c7bf0957986 Fixes: QTBUG-15863 Reviewed-on: http://codereview.qt.nokia.com/2132 Reviewed-by: Qt Sanity Bot Reviewed-by: Michael Brasser --- src/declarative/items/qsgview.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/declarative') diff --git a/src/declarative/items/qsgview.cpp b/src/declarative/items/qsgview.cpp index 1d1118950a..416b803814 100644 --- a/src/declarative/items/qsgview.cpp +++ b/src/declarative/items/qsgview.cpp @@ -351,7 +351,8 @@ void QSGViewPrivate::setRootObject(QObject *obj) if (root) { initialSize = rootObjectSize(); - if (initialSize != q->size()) { + if ((resizeMode == QSGView::SizeViewToRootObject || !q->testAttribute(Qt::WA_Resized)) + && initialSize != q->size()) { if (!(q->parentWidget() && q->parentWidget()->layout())) { q->resize(initialSize); } -- cgit v1.2.3