Merge branch 'master' of git://gitorious.org/qt/qtdeclarative into api_changes
authorMatthew Vogt <matthew.vogt@nokia.com>
Sun, 11 Mar 2012 22:18:01 +0000 (08:18 +1000)
committerMatthew Vogt <matthew.vogt@nokia.com>
Sun, 11 Mar 2012 22:35:40 +0000 (08:35 +1000)
commit1f52c5430144eb7ba6baa7e3954675ca0707b947
tree22106095d5cc61c7b5625c8ff2639e1530d2c3b0
parent616bbd1988f3b92f7d980b6c9a1278f11b712573
parented74ec4c40f1476c545bcaacb12fe3a607172035
Merge branch 'master' of git://gitorious.org/qt/qtdeclarative into api_changes

Change-Id: I578b1e2f1bb374da6194e6ba04a0fd459b2632fe
src/quick/items/qquickcanvas.cpp
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp