review.tizen.org Git - platform/upstream/qtdeclarative.git/commit

projects / platform / upstream / qtdeclarative.git / commit

author	Lars Knoll <lars.knoll@digia.com>
	Fri, 24 May 2013 13:25:20 +0000 (15:25 +0200)
committer	Simon Hausmann <simon.hausmann@digia.com>
	Fri, 24 May 2013 15:04:01 +0000 (17:04 +0200)
commit	7d326bd4d1fb61663c72dbf1fc6fd57e639cfb17
tree	4589949c490017ad01ff77a64cdf0fa2971c27b5	tree \| snapshot
parent	876f6d028d3c3934ca644cd369b2329dd613efb5	commit \| diff

Port Qt.include() over to v4

Still doesn't quite work as it should, but that's no regression to
before neither. The reason is that the context handling is still v8
based and needs to be rewritten.

Change-Id: I51216f93d6db4ba26f8adddaeb39d8a8c62df7ee
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

src/qml/qml/qqmlcomponent.cpp		diff \| blob \| history
src/qml/qml/qqmlengine.cpp		diff \| blob \| history
src/qml/qml/v4/qv4include.cpp	[moved from src/qml/qml/v8/qv8include.cpp with 63% similarity]	diff \| blob \| history
src/qml/qml/v4/qv4include_p.h	[moved from src/qml/qml/v8/qv8include_p.h with 84% similarity]	diff \| blob \| history
src/qml/qml/v4/v4.pri		diff \| blob \| history
src/qml/qml/v8/qv8engine.cpp		diff \| blob \| history
src/qml/qml/v8/v8.pri		diff \| blob \| history
tests/auto/qml/qqmlecmascript/data/include.js		diff \| blob \| history

Domain: UI Framework / Qt;

RSS Atom