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

projects / platform / upstream / qtdeclarative.git / commit

author	Gunnar Sletta <gunnar.sletta@digia.com>
	Thu, 17 Jan 2013 21:08:56 +0000 (22:08 +0100)
committer	Gunnar Sletta <gunnar.sletta@digia.com>
	Thu, 17 Jan 2013 21:08:56 +0000 (22:08 +0100)
commit	9c54d0ef8f6442e32d5762edccef46db80b68681
tree	0fdbc2be98a2e7fd7728a3860d56c94db3e173bb	tree \| snapshot
parent	1512835ee1425a3e874d2f2dd2b01f1a1ea7b763	commit \| diff
parent	36a42ed6b11dce102d0e0f93fbd441011b003157	commit \| diff

Merge branch 'stable' into dev

Conflicts:
src/qml/doc/qtqml.qdocconf
src/quick/doc/qtquick.qdocconf

Change-Id: I087fa14720995a5e53c43567dc4a3c29eb9992a9

32 files changed:

src/qml/qml/parser/qqmljs.g	diff1 \|	diff2 \|	blob \| history
src/qml/qml/parser/qqmljsast.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/parser/qqmljsast_p.h	diff1 \|	diff2 \|	blob \| history
src/qml/qml/parser/qqmljsastfwd_p.h	diff1 \|	diff2 \|	blob \| history
src/qml/qml/parser/qqmljsastvisitor_p.h	diff1 \|	diff2 \|	blob \| history
src/qml/qml/parser/qqmljsengine_p.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/parser/qqmljsgrammar.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/parser/qqmljsgrammar_p.h	diff1 \|	diff2 \|	blob \| history
src/qml/qml/parser/qqmljskeywords_p.h	diff1 \|	diff2 \|	blob \| history
src/qml/qml/parser/qqmljslexer.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/parser/qqmljslexer_p.h	diff1 \|	diff2 \|	blob \| history
src/qml/qml/parser/qqmljsparser.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/parser/qqmljsparser_p.h	diff1 \|	diff2 \|	blob \| history
src/qml/qml/qqmlmetatype.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/qqmlvme.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/v4/qv4irbuilder.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/v4/qv4irbuilder_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitem.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitem_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickwindow.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/qsgdefaultrectanglenode.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qml/qjsengine/tst_qjsengine.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qml/qmlmin/tst_qmlmin.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquickitem/tst_qquickitem.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquickwindow/tst_qquickwindow.cpp	diff1 \|	diff2 \|	blob \| history
tools/qmlmin/main.cpp	diff1 \|	diff2 \|	blob \| history
tools/qmlscene/main.cpp	diff1 \|	diff2 \|	blob \| history

Domain: UI Framework / Qt;

RSS Atom

src/qml/qml/parser/qqmljs.g	diff1 \|	diff2 \|	blob \| history
src/qml/qml/parser/qqmljsast.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/parser/qqmljsast_p.h	diff1 \|	diff2 \|	blob \| history
src/qml/qml/parser/qqmljsastfwd_p.h	diff1 \|	diff2 \|	blob \| history
src/qml/qml/parser/qqmljsastvisitor_p.h	diff1 \|	diff2 \|	blob \| history
src/qml/qml/parser/qqmljsengine_p.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/parser/qqmljsgrammar.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/parser/qqmljsgrammar_p.h	diff1 \|	diff2 \|	blob \| history
src/qml/qml/parser/qqmljskeywords_p.h	diff1 \|	diff2 \|	blob \| history
src/qml/qml/parser/qqmljslexer.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/parser/qqmljslexer_p.h	diff1 \|	diff2 \|	blob \| history
src/qml/qml/parser/qqmljsparser.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/parser/qqmljsparser_p.h	diff1 \|	diff2 \|	blob \| history
src/qml/qml/qqmlmetatype.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/qqmlvme.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/v4/qv4irbuilder.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/v4/qv4irbuilder_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitem.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitem_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickwindow.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/qsgdefaultrectanglenode.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qml/qjsengine/tst_qjsengine.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qml/qmlmin/tst_qmlmin.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquickitem/tst_qquickitem.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquickwindow/tst_qquickwindow.cpp	diff1 \|	diff2 \|	blob \| history
tools/qmlmin/main.cpp	diff1 \|	diff2 \|	blob \| history
tools/qmlscene/main.cpp	diff1 \|	diff2 \|	blob \| history