Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
authorAlan Alpert <alan.alpert@nokia.com>
Fri, 26 Mar 2010 08:04:10 +0000 (09:04 +0100)
committerAlan Alpert <alan.alpert@nokia.com>
Fri, 26 Mar 2010 08:04:10 +0000 (09:04 +0100)
commit43381162eac93f0fbe10e06944c59158dccb3d8c
tree6eb3ad70f0074aaf662c83dce56281613c9219bc
parenta0548f2fc01a47c1b5de4d967d0bc920bd1867f6
parentd432123cec9ac927ec9162fa8b3d16684483f994
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
src/declarative/qml/qdeclarativeengine.cpp