Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
authorPeter Yard <peter.yard@nokia.com>
Tue, 27 Apr 2010 00:39:42 +0000 (10:39 +1000)
committerPeter Yard <peter.yard@nokia.com>
Tue, 27 Apr 2010 00:39:42 +0000 (10:39 +1000)
commit88b2bf18c558d0e2f8a9268802f277212f17e61e
treed41ca52003037fba9b45605aa6d2ed86f73b940a
parent4f3a7b5992b5aed67cced46d5d8c8c2f052dfb66
parent09293f1d07b019dc7bfe95afb93364cc87774e82
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
doc/src/declarative/declarativeui.qdoc
doc/src/declarative/elements.qdoc
src/declarative/qml/qdeclarativecomponent.cpp
src/declarative/util/qdeclarativeanimation.cpp
src/declarative/util/qdeclarativeconnections.cpp
src/declarative/util/qdeclarativelistmodel.cpp
src/declarative/util/qdeclarativepropertychanges.cpp
src/declarative/util/qdeclarativestate.cpp
src/declarative/util/qdeclarativestategroup.cpp
src/declarative/util/qdeclarativexmllistmodel.cpp