Merge branch 'v8'
authorAaron Kennedy <aaron.kennedy@nokia.com>
Fri, 8 Jul 2011 05:56:48 +0000 (15:56 +1000)
committerAaron Kennedy <aaron.kennedy@nokia.com>
Fri, 8 Jul 2011 05:56:48 +0000 (15:56 +1000)
commit26590325b5e9209df4495841b9013d04bbb35515
tree2a4e44ca1e1d4389caf999ee8801a312166bf39c
parent5a705d8951a0b23c725d99a5a3fce7902ec41374
parent438d50d63c48bbbfd185bd7e1a0d6e6174c1791e
Merge branch 'v8'

Conflicts:
src/declarative/qml/qdeclarativescarceresourcescriptclass.cpp
src/declarative/qml/qdeclarativescarceresourcescriptclass_p.h

Change-Id: I54e579307cbeafbbad21884218c5e797ba245c8b
16 files changed:
src/declarative/items/qsgcanvasitem.cpp
src/declarative/items/qsgcanvasitem_p.h
src/declarative/items/qsgcontext2d.cpp
src/declarative/items/qsgcontext2d_p.h
src/declarative/items/qsgcontext2d_p_p.h
src/declarative/items/qsgitem.cpp
src/declarative/items/qsgitem.h
src/declarative/qml/qintrusivelist_p.h
src/declarative/qml/v4/qdeclarativev4bindings.cpp
src/declarative/qml/v4/qdeclarativev4irbuilder.cpp
src/imports/testlib/SignalSpy.qml
src/imports/testlib/TestCase.qml
src/imports/testlib/main.cpp
src/qmltest/quicktest.cpp
tests/auto/declarative/nodes/tst_nodestest.cpp
tests/auto/declarative/qsgvisualdatamodel/tst_qsgvisualdatamodel.cpp