Merge branch 'v8'

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

Change-Id: I54e579307cbeafbbad21884218c5e797ba245c8b

diff --cc src/declarative/items/qsgcanvasitem.cpp
Simple merge

diff --cc src/declarative/items/qsgcanvasitem_p.h
Simple merge

diff --cc src/declarative/items/qsgcontext2d.cpp
Simple merge

diff --cc src/declarative/items/qsgcontext2d_p.h
Simple merge

diff --cc src/declarative/items/qsgcontext2d_p_p.h
Simple merge

diff --cc src/declarative/items/qsgitem.cpp
Simple merge

diff --cc src/declarative/items/qsgitem.h
Simple merge

diff --cc src/declarative/qml/qintrusivelist_p.h
Simple merge

diff --cc src/declarative/qml/v4/qdeclarativev4bindings.cpp
Simple merge

diff --cc src/declarative/qml/v4/qdeclarativev4irbuilder.cpp
Simple merge

diff --cc src/imports/testlib/SignalSpy.qml
Simple merge

diff --cc src/imports/testlib/TestCase.qml
Simple merge

diff --cc src/imports/testlib/main.cpp
Simple merge

diff --cc src/qmltest/quicktest.cpp
Simple merge

diff --cc tests/auto/declarative/nodes/tst_nodestest.cpp
Simple merge

diff --cc tests/auto/declarative/qsgvisualdatamodel/tst_qsgvisualdatamodel.cpp
Simple merge