Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 24 May 2011 23:40:54 +0000 (09:40 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 24 May 2011 23:40:54 +0000 (09:40 +1000)
commit59852c9a855e6b9963c27c9a028faf6d23ea9974
tree2b3b679a77365027886a57671fe4763987d7963d
parent534f5098c577f262b4b01d1c21cd0ec1af0f25f1
parent565bd12bdc7b73e4222de44699df9904a1cfcd81
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
  QDeclarativeDebug: Fix autotest
  Pass QList as const reference when possible
  Fixed crashes in Observer mode related to infinite bounding rects
  Doc
  QmlDirParser: Fix typeInfo accessor.
src/declarative/qml/qdeclarativedirparser.cpp
src/declarative/qml/qdeclarativeproperty.cpp
src/plugins/qmltooling/declarativeobserver/editor/liveselectionindicator.cpp
src/plugins/qmltooling/declarativeobserver/editor/liveselectionindicator_p.h
src/plugins/qmltooling/declarativeobserver/editor/subcomponentmasklayeritem.cpp
src/plugins/qmltooling/declarativeobserver/qdeclarativeviewobserver.cpp
src/plugins/qmltooling/declarativeobserver/qdeclarativeviewobserver_p.h
src/plugins/qmltooling/declarativeobserver/qdeclarativeviewobserver_p_p.h
tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp