Merge remote-tracking branch 'qt/4.8' into master-qml-team
authorKai Koehne <kai.koehne@nokia.com>
Tue, 24 May 2011 10:38:41 +0000 (12:38 +0200)
committerKai Koehne <kai.koehne@nokia.com>
Tue, 24 May 2011 10:38:41 +0000 (12:38 +0200)
commit18464b467865cb148b219b9bbe72da9fff45b99f
treed28e68fe717296638e3a9a1307bc75a78b3898b7
parent00a72cd1f5aff15d5a3a59d61efd2f5653d7dd34
parent534f5098c577f262b4b01d1c21cd0ec1af0f25f1
Merge remote-tracking branch 'qt/4.8' into master-qml-team
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