Merge branch 'master' of git://gitorious.org/qt/qtdeclarative into merge-master
authorMatthew Vogt <matthew.vogt@nokia.com>
Tue, 13 Mar 2012 05:06:40 +0000 (15:06 +1000)
committerMatthew Vogt <matthew.vogt@nokia.com>
Tue, 13 Mar 2012 05:22:14 +0000 (15:22 +1000)
commit784555f3032194a8923d804a8ce84957f113caf6
tree6b538cea5bf82bd5288ac180125abd1bb312ddad
parent1f52c5430144eb7ba6baa7e3954675ca0707b947
parent648c80c4c0759efb6e35fac7acc8daad5aab13e2
Merge branch 'master' of git://gitorious.org/qt/qtdeclarative into merge-master

Change-Id: Iaefec13503dadfa200539b8de7a2d80fc5bb3bcf
bin/rename-qtdeclarative-symbols.sh
src/quick/items/qquickcanvas.cpp
src/quick/items/qquickitem.cpp