Merge master into api_changes
authorKent Hansen <kent.hansen@nokia.com>
Mon, 19 Mar 2012 11:29:32 +0000 (12:29 +0100)
committerKent Hansen <kent.hansen@nokia.com>
Mon, 19 Mar 2012 11:37:03 +0000 (12:37 +0100)
commit4821058f10118be55a541ad39e25ec9165cca3b3
tree167973e3c68fc442b0e37d6f628f3fdbe759f15a
parent83f11e33745180e9370d484cbcedd0bac020c9dd
parent26d5f2e833f0e3686aaa27e695bbfab5fbd808ad
Merge master into api_changes

Conflicts:
src/qml/debugger/qqmlenginedebugservice.cpp
src/qml/qml/v8/qv8qobjectwrapper.cpp
src/quick/util/qquickimageprovider.cpp
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp

Change-Id: Ie78ba2fabd32f4812bcae9dbdd66ed289dc11dcb
21 files changed:
doc/src/qml/basictypes.qdoc
doc/src/qml/javascriptblocks.qdoc
doc/src/qml/propertybinding.qdoc
src/qml/debugger/qqmlenginedebugservice.cpp
src/qml/qml/qml.pri
src/qml/qml/qqmlengine.cpp
src/qml/qml/qqmlproperty.cpp
src/qml/qml/qqmlvme.cpp
src/qml/qml/qqmlvmemetaobject.cpp
src/qml/qml/v8/qqmlbuiltinfunctions.cpp
src/qml/qml/v8/qv8qobjectwrapper.cpp
src/qml/qml/v8/qv8valuetypewrapper.cpp
src/quick/items/qquickcanvas.cpp
src/quick/items/qquickitem.cpp
src/quick/items/qquickshadereffect.cpp
src/quick/util/qquickimageprovider.cpp
src/quick/util/qquickpixmapcache.cpp
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp
tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp
tests/auto/quick/quick.pro