projects / profile / ivi / qtdeclarative.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 414b91a) | patch
QDeclarativeView/QSGView SizeRootObjectToView still resizes view
authorMartin Jones <martin.jones@nokia.com>
Tue, 26 Jul 2011 00:34:53 +0000 (10:34 +1000)
committerQt by Nokia <qt-info@nokia.com>
Tue, 26 Jul 2011 04:29:54 +0000 (06:29 +0200)
commitdaf6a270888d2f70e57a838d0ba4adae954c3d22
tree36eb0366bdfa11eb25ba050191040c55ad644a22tree | snapshot
parent414b91ab7f11efaf89afb237d682507caec05effcommit | diff
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 <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
src/declarative/items/qsgview.cpp diff | blob | history
src/qtquick1/util/qdeclarativeview.cpp diff | blob | history
tests/auto/declarative/qsgview/data/error1.qml [new file with mode: 0644] blob
tests/auto/declarative/qsgview/data/resizemodeitem.qml [new file with mode: 0644] blob
tests/auto/declarative/qsgview/qsgview.pro [new file with mode: 0644] blob
tests/auto/declarative/qsgview/tst_qsgview.cpp [new file with mode: 0644] blob
tests/auto/qtquick1/qdeclarativeview/tst_qdeclarativeview.cpp diff | blob | history
Domain: UI Framework / Uncategorized;