Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt
authorAaron Kennedy <aaron.kennedy@nokia.com>
Thu, 4 Aug 2011 02:12:03 +0000 (12:12 +1000)
committerAaron Kennedy <aaron.kennedy@nokia.com>
Thu, 4 Aug 2011 02:12:03 +0000 (12:12 +1000)
commitc3702db732744ea508522a96eb258d4873dd273f
treef9e3ed495fea03b5e3a04852804ad8592d29e562
parent29d988d113aac1a193d3af6247a6e8231f3f3c9e
parent920ce5ed71bc456e429b887801a8d8bea7a3db0d
Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt

Conflicts:
doc/src/declarative/qtbinding.qdoc
doc/src/declarative/qtbinding.qdoc
src/declarative/qml/qdeclarativeengine.cpp