Merge branch 'master' into v8
authorMichael Brasser <michael.brasser@nokia.com>
Tue, 7 Jun 2011 00:15:38 +0000 (10:15 +1000)
committerMichael Brasser <michael.brasser@nokia.com>
Tue, 7 Jun 2011 00:15:38 +0000 (10:15 +1000)
commit26942a682c82bd347da65b143442d53d58533263
treecb051af61f43d609a02c8894d2e0c6a3caff781b
parent6b54de600ce74025bc8ada20bea95ad183a6cd8d
parentfafe446dfe07606100d055395360513ed4eb4ecd
Merge branch 'master' into v8

Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
src/declarative/qml/qdeclarativecontextscriptclass.cpp
src/declarative/qml/qdeclarativeengine.cpp
src/declarative/qml/qdeclarativeengine_p.h
src/declarative/qml/qdeclarativeglobalscriptclass.cpp
src/declarative/qml/qdeclarativeinclude.cpp
src/declarative/qml/qdeclarativelistscriptclass.cpp
src/declarative/qml/qdeclarativeobjectscriptclass.cpp
src/declarative/qml/qdeclarativeobjectscriptclass_p.h
src/declarative/qml/qdeclarativetypenamescriptclass.cpp
src/declarative/qml/qdeclarativevaluetypescriptclass.cpp
55 files changed:
src/declarative/declarative.pro
src/declarative/graphicsitems/qdeclarativeitem.cpp
src/declarative/graphicsitems/qdeclarativeitem.h
src/declarative/qml/qdeclarativebinding.cpp
src/declarative/qml/qdeclarativebinding_p.h
src/declarative/qml/qdeclarativeboundsignal.cpp
src/declarative/qml/qdeclarativecompiler.cpp
src/declarative/qml/qdeclarativecomponent.cpp
src/declarative/qml/qdeclarativecomponent.h
src/declarative/qml/qdeclarativecomponent_p.h
src/declarative/qml/qdeclarativecontext.cpp
src/declarative/qml/qdeclarativecontext.h
src/declarative/qml/qdeclarativecontext_p.h
src/declarative/qml/qdeclarativedata_p.h
src/declarative/qml/qdeclarativeengine.cpp
src/declarative/qml/qdeclarativeengine.h
src/declarative/qml/qdeclarativeengine_p.h
src/declarative/qml/qdeclarativeexpression.cpp
src/declarative/qml/qdeclarativeexpression.h
src/declarative/qml/qdeclarativeexpression_p.h
src/declarative/qml/qdeclarativeintegercache.cpp
src/declarative/qml/qdeclarativeintegercache_p.h
src/declarative/qml/qdeclarativemetatype.cpp
src/declarative/qml/qdeclarativeproperty.cpp
src/declarative/qml/qdeclarativepropertycache.cpp
src/declarative/qml/qdeclarativepropertycache_p.h
src/declarative/qml/qdeclarativesqldatabase.cpp
src/declarative/qml/qdeclarativesqldatabase_p.h
src/declarative/qml/qdeclarativetypeloader.cpp
src/declarative/qml/qdeclarativetypeloader_p.h
src/declarative/qml/qdeclarativetypenamecache.cpp
src/declarative/qml/qdeclarativetypenamecache_p.h
src/declarative/qml/qdeclarativevme.cpp
src/declarative/qml/qdeclarativevme_p.h
src/declarative/qml/qdeclarativevmemetaobject.cpp
src/declarative/qml/qdeclarativevmemetaobject_p.h
src/declarative/qml/qdeclarativeworkerscript.cpp
src/declarative/qml/qdeclarativeworkerscript_p.h
src/declarative/qml/qdeclarativexmlhttprequest.cpp
src/declarative/qml/qdeclarativexmlhttprequest_p.h
src/declarative/qml/qml.pri
src/declarative/qml/v8/qv8contextwrapper_p.h
src/declarative/qml/v8/qv8include_p.h
src/declarative/qml/v8/qv8typewrapper_p.h
src/declarative/qml/v8/qv8valuetypewrapper_p.h
src/declarative/qml/v8/qv8variantwrapper_p.h
src/declarative/util/qdeclarativelistmodel.cpp
src/declarative/util/qdeclarativepixmapcache.cpp
tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp
tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp
tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp
tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp
tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp
tests/auto/declarative/v8/tst_v8.cpp