Merge remote-tracking branch 'origin/api_changes'
authorLars Knoll <lars.knoll@nokia.com>
Tue, 17 Apr 2012 14:35:19 +0000 (16:35 +0200)
committerLars Knoll <lars.knoll@nokia.com>
Tue, 17 Apr 2012 20:32:42 +0000 (22:32 +0200)
commit7d3a56f3cf717a06823c33b031ea4f590e14002d
treeb5d2845e8353ba2de3028a9f32749ca622e115da
parentf92c3aecd08eef468f9a47f2e970f22beecc8216
parente5f45d9b57bb0542ec47e5a8a4e57388b6d59d35
Merge remote-tracking branch 'origin/api_changes'

Change-Id: I39905acde16ba6bb0ba39401cb73082a73dd9167
src/qml/qml/v4/qv4bindings.cpp
src/qml/qml/v8/qv8qobjectwrapper.cpp
src/quick/items/qquickcanvas.cpp
src/quick/util/qquickanimation.cpp
sync.profile
tests/auto/quick/qquickcanvas/tst_qquickcanvas.cpp
tests/auto/quick/qquickpositioners/qquickpositioners.pro
tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp
tests/auto/quick/qquicktext/tst_qquicktext.cpp