Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kineti...
authorAaron Kennedy <aaron.kennedy@nokia.com>
Thu, 14 Jan 2010 07:07:23 +0000 (17:07 +1000)
committerAaron Kennedy <aaron.kennedy@nokia.com>
Thu, 14 Jan 2010 07:07:23 +0000 (17:07 +1000)
commitf4f858578afe507ecfebd807f28bad025a85e1b9
tree1ad38cd654e5a86050e24c7206a0f28f60daf0c1
parentcf8c14da45187081c50b3b7f2e6e4df4068e8728
parentaa020f60e07eefb81c89a9c94b035b748a4e872c
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
src/script/bridge/qscriptdeclarativeclass.cpp
src/script/bridge/qscriptdeclarativeclass_p.h
src/script/bridge/qscriptdeclarativeobject.cpp
src/script/bridge/qscriptdeclarativeobject_p.h