Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
authorAlan Alpert <alan.alpert@nokia.com>
Thu, 19 May 2011 08:43:59 +0000 (18:43 +1000)
committerAlan Alpert <alan.alpert@nokia.com>
Thu, 19 May 2011 08:43:59 +0000 (18:43 +1000)
commit56d80e1590877e9f6cb9de0e7a0194519fb5813c
treeac9b4595d7d78d65ea55510652bbb6cb0c8153c3
parent29017e818e2744f9d8f3b330e94f85bc7f72af38
parent13970487ff78c2794fa2300af33b536968162953
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
src/declarative/qml/qdeclarativeengine.cpp
tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp