Merge master into api_changes
authorKent Hansen <kent.hansen@nokia.com>
Tue, 27 Mar 2012 14:43:26 +0000 (16:43 +0200)
committerKent Hansen <kent.hansen@nokia.com>
Tue, 27 Mar 2012 14:56:14 +0000 (16:56 +0200)
commit24fb8dc27eddfdd62bd2c3a6e863cbf433762cd6
tree917eff8c50fe4699547b9de852ee53257c1585cf
parent3e6a8eca00334df344a45f09afbcf8fd8e2b7c54
parentffdbf216dc80b3d781307bb6b4b7150281c874a3
Merge master into api_changes

Conflicts:
src/qml/debugger/qqmlenginedebugservice.cpp
src/qml/debugger/qqmlprofilerservice_p.h
src/qml/qml/qqmlboundsignal.cpp
src/qml/qml/qqmlpropertycache.cpp
src/quick/util/qquickimageprovider.cpp

Change-Id: I0609aa5ed54c7769f1e2773a96a7cd43a69f133c
15 files changed:
src/qml/debugger/qqmlenginedebugservice.cpp
src/qml/debugger/qqmlprofilerservice_p.h
src/qml/qml/qqmlboundsignal.cpp
src/qml/qml/qqmlengine.cpp
src/qml/qml/qqmlmetatype.cpp
src/qml/qml/qqmlproperty.cpp
src/qml/qml/qqmlpropertycache.cpp
src/qml/qml/qqmlvme.cpp
src/quick/items/qquickcanvas.cpp
src/quick/items/qquickitem.cpp
src/quick/items/qquickitem.h
src/quick/util/qquickimageprovider.cpp
tests/auto/qml/qqmlecmascript/testtypes.h
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
tests/auto/quick/qquicktext/tst_qquicktext.cpp