git.six.silmor.de Git - konrad/qtdeclarative.git/commit

projects / konrad/qtdeclarative.git / commit

author	Simon Hausmann <simon.hausmann@nokia.com>
	Fri, 29 Jul 2011 08:25:44 +0000 (10:25 +0200)
committer	Qt by Nokia <qt-info@nokia.com>
	Fri, 29 Jul 2011 11:00:52 +0000 (13:00 +0200)
commit	d410ad364ec0b8877797145c68a4d7c3c98ce1c0
tree	11862c21e5e465abe3275768918f82cbec2bc6e7	tree \| snapshot
parent	43b783d09e0899165bbe964a175785ccdfedf6e5	commit \| diff

Merge the QJSEngine and QJSValue development branch into

This replaces the dependency to QtScript with two new builtin classes
QJSValue and QJSEngine.

This is still work in progress, development continues now in the master branch.

Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de
Reviewed-on: http://codereview.qt.nokia.com/2299
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>

156 files changed:

modules/qt_declarative.pri		diff \| blob \| history
src/3rdparty/v8		diff \| blob \| history
src/declarative/debugger/qdeclarativedebughelper.cpp		diff \| blob \| history
src/declarative/debugger/qjsdebuggeragent.cpp		diff \| blob \| history
src/declarative/debugger/qjsdebuggeragent_p.h		diff \| blob \| history
src/declarative/declarative.pro		diff \| blob \| history
src/declarative/items/context2d/qsgcontext2d.cpp		diff \| blob \| history
src/declarative/items/context2d/qsgcontext2d_p.h		diff \| blob \| history
src/declarative/items/qsgitem.cpp		diff \| blob \| history
src/declarative/qml/qdeclarative.h		diff \| blob \| history
src/declarative/qml/qdeclarativebinding.cpp		diff \| blob \| history
src/declarative/qml/qdeclarativecompileddata.cpp		diff \| blob \| history
src/declarative/qml/qdeclarativecompiler.cpp		diff \| blob \| history
src/declarative/qml/qdeclarativecompiler_p.h		diff \| blob \| history
src/declarative/qml/qdeclarativecomponent.cpp		diff \| blob \| history
src/declarative/qml/qdeclarativecomponent.h		diff \| blob \| history
src/declarative/qml/qdeclarativecontext.cpp		diff \| blob \| history
src/declarative/qml/qdeclarativecontext.h		diff \| blob \| history
src/declarative/qml/qdeclarativecontext_p.h		diff \| blob \| history
src/declarative/qml/qdeclarativedata_p.h		diff \| blob \| history
src/declarative/qml/qdeclarativeengine.cpp		diff \| blob \| history
src/declarative/qml/qdeclarativeengine.h		diff \| blob \| history
src/declarative/qml/qdeclarativeengine_p.h		diff \| blob \| history
src/declarative/qml/qdeclarativeexpression.cpp		diff \| blob \| history
src/declarative/qml/qdeclarativemetatype.cpp		diff \| blob \| history
src/declarative/qml/qdeclarativemetatype_p.h		diff \| blob \| history
src/declarative/qml/qdeclarativeprivate.h		diff \| blob \| history
src/declarative/qml/qdeclarativepropertycache.cpp		diff \| blob \| history
src/declarative/qml/qdeclarativepropertycache_p.h		diff \| blob \| history
src/declarative/qml/qdeclarativesqldatabase_p.h		diff \| blob \| history
src/declarative/qml/qdeclarativetypeloader.cpp		diff \| blob \| history
src/declarative/qml/qdeclarativetypeloader_p.h		diff \| blob \| history
src/declarative/qml/qdeclarativetypenamecache_p.h		diff \| blob \| history
src/declarative/qml/qdeclarativevme.cpp		diff \| blob \| history
src/declarative/qml/qdeclarativevme_p.h		diff \| blob \| history
src/declarative/qml/qdeclarativevmemetaobject.cpp		diff \| blob \| history
src/declarative/qml/qdeclarativeworkerscript.cpp		diff \| blob \| history
src/declarative/qml/qdeclarativeworkerscript_p.h		diff \| blob \| history
src/declarative/qml/qdeclarativexmlhttprequest.cpp		diff \| blob \| history
src/declarative/qml/qdeclarativexmlhttprequest_p.h		diff \| blob \| history
src/declarative/qml/v4/qdeclarativev4bindings.cpp		diff \| blob \| history
src/declarative/qml/v4/qdeclarativev4irbuilder.cpp		diff \| blob \| history
src/declarative/qml/v8/qjsconverter_p.h	[new file with mode: 0644]	blob
src/declarative/qml/v8/qjsengine.cpp	[new file with mode: 0644]	blob
src/declarative/qml/v8/qjsengine.h	[new file with mode: 0644]	blob
src/declarative/qml/v8/qjsvalue.cpp	[new file with mode: 0644]	blob
src/declarative/qml/v8/qjsvalue.h	[new file with mode: 0644]	blob
src/declarative/qml/v8/qjsvalue_impl_p.h	[new file with mode: 0644]	blob
src/declarative/qml/v8/qjsvalue_p.h	[new file with mode: 0644]	blob
src/declarative/qml/v8/qjsvalueiterator.cpp	[new file with mode: 0644]	blob
src/declarative/qml/v8/qjsvalueiterator.h	[new file with mode: 0644]	blob
src/declarative/qml/v8/qscript_impl_p.h	[new file with mode: 0644]	blob
src/declarative/qml/v8/qscriptisolate_p.h	[new file with mode: 0644]	blob
src/declarative/qml/v8/qscriptoriginalglobalobject_p.h	[new file with mode: 0644]	blob
src/declarative/qml/v8/qscriptshareddata_p.h	[new file with mode: 0644]	blob
src/declarative/qml/v8/qscripttools_p.h	[new file with mode: 0644]	blob
src/declarative/qml/v8/qv8bindings.cpp		diff \| blob \| history
src/declarative/qml/v8/qv8engine.cpp		diff \| blob \| history
src/declarative/qml/v8/qv8engine_impl_p.h	[new file with mode: 0644]	blob
src/declarative/qml/v8/qv8engine_p.h		diff \| blob \| history
src/declarative/qml/v8/qv8include.cpp		diff \| blob \| history
src/declarative/qml/v8/qv8qobjectwrapper.cpp		diff \| blob \| history
src/declarative/qml/v8/qv8typewrapper.cpp		diff \| blob \| history
src/declarative/qml/v8/qv8variantwrapper.cpp		diff \| blob \| history
src/declarative/qml/v8/qv8variantwrapper_p.h		diff \| blob \| history
src/declarative/qml/v8/script.pri	[new file with mode: 0644]	blob
src/declarative/qml/v8/v8.pri		diff \| blob \| history
src/declarative/util/qdeclarativebind.cpp		diff \| blob \| history
src/declarative/util/qdeclarativelistmodel.cpp		diff \| blob \| history
src/imports/folderlistmodel/folderlistmodel.pro		diff \| blob \| history
src/imports/gestures/gestures.pro		diff \| blob \| history
src/imports/inputcontext/inputcontext.pro		diff \| blob \| history
src/imports/inputcontext/plugin.cpp		diff \| blob \| history
src/imports/testlib/main.cpp		diff \| blob \| history
src/imports/testlib/testlib.pro		diff \| blob \| history
src/qmltest/qmltest.pro		diff \| blob \| history
src/qmltest/quicktest.cpp		diff \| blob \| history
src/qtquick1/graphicsitems/qdeclarativeitem.cpp		diff \| blob \| history
src/qtquick1/qtquick1.pro		diff \| blob \| history
src/qtquick1/util/qdeclarativebind.cpp		diff \| blob \| history
src/qtquick1/util/qdeclarativelistmodel.cpp		diff \| blob \| history
src/qtquick1/util/qdeclarativelistmodel_p.h		diff \| blob \| history
src/qtquick1/util/qdeclarativelistmodel_p_p.h		diff \| blob \| history
src/qtquick1/util/qdeclarativelistmodelworkeragent_p.h		diff \| blob \| history
src/qtquick1/util/qdeclarativeview.cpp		diff \| blob \| history
src/v8/0009-Add-CallAsFunction-method-to-the-Object-class-in-the.patch	[new file with mode: 0644]	blob
src/v8/0010-Implement-CallAsConstructor-method-for-Object-in-the.patch	[new file with mode: 0644]	blob
src/v8/0011-QtScript-V8-Add-new-v8-api-to-check-if-a-value-is-an.patch	[new file with mode: 0644]	blob
tests/auto/declarative/declarative.pro		diff \| blob \| history
tests/auto/declarative/qdeclarativecomponent/qdeclarativecomponent.pro		diff \| blob \| history
tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro		diff \| blob \| history
tests/auto/declarative/qdeclarativedebug/qdeclarativedebug.pro		diff \| blob \| history
tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro		diff \| blob \| history
tests/auto/declarative/qdeclarativedebughelper/private_headers/qdeclarativedebughelper_p.h		diff \| blob \| history
tests/auto/declarative/qdeclarativedebughelper/qdeclarativedebughelper.pro		diff \| blob \| history
tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro		diff \| blob \| history
tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro		diff \| blob \| history
tests/auto/declarative/qdeclarativeecmascript/testtypes.cpp		diff \| blob \| history
tests/auto/declarative/qdeclarativeecmascript/testtypes.h		diff \| blob \| history
tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp		diff \| blob \| history
tests/auto/declarative/qdeclarativeinstruction/qdeclarativeinstruction.pro		diff \| blob \| history
tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro		diff \| blob \| history
tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro		diff \| blob \| history
tests/auto/declarative/qdeclarativeproperty/qdeclarativeproperty.pro		diff \| blob \| history
tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro		diff \| blob \| history
tests/auto/declarative/qdeclarativescriptdebugging/qdeclarativescriptdebugging.pro		diff \| blob \| history
tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro		diff \| blob \| history
tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro		diff \| blob \| history
tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro		diff \| blob \| history
tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro		diff \| blob \| history
tests/auto/declarative/qdeclarativev4/qdeclarativev4.pro		diff \| blob \| history
tests/auto/declarative/qdeclarativevaluetypes/qdeclarativevaluetypes.pro		diff \| blob \| history
tests/auto/declarative/qdeclarativeworkerscript/qdeclarativeworkerscript.pro		diff \| blob \| history
tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp		diff \| blob \| history
tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro		diff \| blob \| history
tests/auto/declarative/qjsengine/qjsengine.pro	[new file with mode: 0644]	blob
tests/auto/declarative/qjsengine/script/com/__init__.js	[new file with mode: 0644]	blob
tests/auto/declarative/qjsengine/script/com/trolltech/__init__.js	[new file with mode: 0644]	blob
tests/auto/declarative/qjsengine/script/com/trolltech/recursive/__init__.js	[new file with mode: 0644]	blob
tests/auto/declarative/qjsengine/script/com/trolltech/syntaxerror/__init__.js	[new file with mode: 0644]	blob
tests/auto/declarative/qjsengine/tst_qjsengine.cpp	[new file with mode: 0644]	blob
tests/auto/declarative/qjsvalue/qjsvalue.pro	[new file with mode: 0644]	blob
tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp	[new file with mode: 0644]	blob
tests/auto/declarative/qjsvalue/tst_qjsvalue.h	[new file with mode: 0644]	blob
tests/auto/declarative/qjsvalueiterator/qjsvalueiterator.pro	[new file with mode: 0644]	blob
tests/auto/declarative/qjsvalueiterator/tst_qjsvalueiterator.cpp	[new file with mode: 0644]	blob
tests/auto/declarative/qsganimatedimage/qsganimatedimage.pro		diff \| blob \| history
tests/auto/declarative/qsgborderimage/qsgborderimage.pro		diff \| blob \| history
tests/auto/declarative/qsgflickable/qsgflickable.pro		diff \| blob \| history
tests/auto/declarative/qsgflipable/qsgflipable.pro		diff \| blob \| history
tests/auto/declarative/qsggridview/qsggridview.pro		diff \| blob \| history
tests/auto/declarative/qsgitem2/qsgitem.pro		diff \| blob \| history
tests/auto/declarative/qsglistview/qsglistview.pro		diff \| blob \| history
tests/auto/declarative/qsgpathview/qsgpathview.pro		diff \| blob \| history
tests/auto/declarative/qsgpositioners/qsgpositioners.pro		diff \| blob \| history
tests/auto/declarative/qsgtext/qsgtext.pro		diff \| blob \| history
tests/auto/declarative/qsgtextedit/qsgtextedit.pro		diff \| blob \| history
tests/auto/declarative/qsgtextinput/qsgtextinput.pro		diff \| blob \| history
tests/auto/declarative/qsgvisualdatamodel/qsgvisualdatamodel.pro		diff \| blob \| history
tests/auto/qtquick1/qdeclarativeconnection/qdeclarativeconnection.pro		diff \| blob \| history
tests/auto/qtquick1/qdeclarativeflickable/qdeclarativeflickable.pro		diff \| blob \| history
tests/auto/qtquick1/qdeclarativeflipable/qdeclarativeflipable.pro		diff \| blob \| history
tests/auto/qtquick1/qdeclarativegridview/qdeclarativegridview.pro		diff \| blob \| history
tests/auto/qtquick1/qdeclarativelistmodel/qdeclarativelistmodel.pro		diff \| blob \| history
tests/auto/qtquick1/qdeclarativelistview/qdeclarativelistview.pro		diff \| blob \| history
tests/auto/qtquick1/qdeclarativepathview/qdeclarativepathview.pro		diff \| blob \| history
tests/auto/qtquick1/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro		diff \| blob \| history
tests/auto/qtquick1/qdeclarativespringanimation/qdeclarativespringanimation.pro		diff \| blob \| history
tests/auto/qtquick1/qdeclarativestates/qdeclarativestates.pro		diff \| blob \| history
tests/auto/qtquick1/qdeclarativetext/qdeclarativetext.pro		diff \| blob \| history
tests/auto/qtquick1/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro		diff \| blob \| history
tests/auto/qtquick1/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro		diff \| blob \| history
tests/benchmarks/declarative/holistic/holistic.pro		diff \| blob \| history
tests/benchmarks/declarative/holistic/testtypes.h		diff \| blob \| history
tests/benchmarks/declarative/script/script.pro		diff \| blob \| history
tools/qmlviewer/qml.pri		diff \| blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom