aboutsummaryrefslogtreecommitdiffstats
path: root/src/qtquick1/util/qdeclarativeview.cpp
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2011-07-26 13:48:45 +1000
committerQt by Nokia <qt-info@nokia.com>2011-07-26 08:00:31 +0200
commite06211e4c67c0c7470fdac86c3fa6d50792516c5 (patch)
treefc672331a442d93f714c962efc47cbeb6b23dd3c /src/qtquick1/util/qdeclarativeview.cpp
parente5be1482c81fb3a502e2e5f8e56f11f182c2adab (diff)
qmlviewer resizes the root object multiple times.
In SizeRootObjectToView mode on initial load the view was set to root object size, then the sceneResized() slot would resize back, then we would finally reset back to the correct value in statusChanged(true). Now react directly to the initial size being set. Change-Id: Ib6977cf7bad3fe79b9ac80bb6d916fb0f57c5f5e Fixes: QTBUG-16499 Reviewed-on: http://codereview.qt.nokia.com/2148 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/qtquick1/util/qdeclarativeview.cpp')
-rw-r--r--src/qtquick1/util/qdeclarativeview.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/qtquick1/util/qdeclarativeview.cpp b/src/qtquick1/util/qdeclarativeview.cpp
index ae7e07d0ce..cc19828c40 100644
--- a/src/qtquick1/util/qdeclarativeview.cpp
+++ b/src/qtquick1/util/qdeclarativeview.cpp
@@ -248,6 +248,10 @@ void QDeclarativeViewPrivate::itemGeometryChanged(QDeclarativeItem *resizeItem,
This signal is emitted when the component's current \a status changes.
*/
+/*! \fn void QDeclarativeView::initialSizeChanged(QSize size)
+ \internal
+*/
+
/*!
\fn QDeclarativeView::QDeclarativeView(QWidget *parent)
@@ -609,6 +613,7 @@ void QDeclarativeView::setRootObject(QObject *obj)
resize(d->initialSize);
}
}
+ emit initialSizeChanged(d->initialSize);
d->initResize();
}
}