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

projects / platform / upstream / qtdeclarative.git / commit

author	Simon Hausmann <simon.hausmann@theqtcompany.com>
	Tue, 9 Dec 2014 14:09:20 +0000 (15:09 +0100)
committer	Simon Hausmann <simon.hausmann@theqtcompany.com>
	Tue, 9 Dec 2014 14:09:26 +0000 (15:09 +0100)
commit	ff466a1881435f927f5df9ce1e5eac07d5591904
tree	760e068743e6a8e1cc4ec63bb2f8e7dcef88b3e2	tree \| snapshot
parent	e04822f3c2a6b69b7d75e2039256aa2433c59dd2	commit \| diff
parent	4a3f6e58b591f2fe2204f7cbc1efc8abb0aade74	commit \| diff

Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
src/qml/jsruntime/qv4arraydata.cpp
src/qml/jsruntime/qv4context_p.h
src/qml/jsruntime/qv4globalobject.cpp
src/qml/jsruntime/qv4internalclass.cpp
src/quick/items/qquicktext_p.h
src/quick/items/qquicktextedit_p.h
src/quick/items/qquicktextinput_p.h

Change-Id: If07e483e03197cb997ef47a9c647a479cdb09f4c

31 files changed:

src/particles/qquickparticlesystem.cpp	diff1 \|	diff2 \|	blob \| history
src/particles/qquickv4particledata.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/debugger/qqmldebugserver.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/jit/qv4isel_masm.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/jsapi/qjsengine.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/jsruntime/qv4context_p.h	diff1 \|	diff2 \|	blob \| history
src/qml/jsruntime/qv4debugging.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/jsruntime/qv4globalobject.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/jsruntime/qv4internalclass.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/jsruntime/qv4mm.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/qqmlengine.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/types/qqmldelegatemodel.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickanimatedsprite.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickborderimage_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickimagebase_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitem.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktext_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktext_p_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktextedit.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktextedit_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktextinput.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktextinput_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickview.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickwindow.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickwindow.h	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/qsgadaptationlayer.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/qsgcontext.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/qsgwindowsrenderloop.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/util/qsgsimpletexturenode.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qml/qjsengine/tst_qjsengine.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquickgridview/tst_qquickgridview.cpp	diff1 \|	diff2 \|	blob \| history

Domain: UI Framework / Qt;

RSS Atom

src/particles/qquickparticlesystem.cpp	diff1 \|	diff2 \|	blob \| history
src/particles/qquickv4particledata.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/debugger/qqmldebugserver.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/jit/qv4isel_masm.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/jsapi/qjsengine.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/jsruntime/qv4context_p.h	diff1 \|	diff2 \|	blob \| history
src/qml/jsruntime/qv4debugging.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/jsruntime/qv4globalobject.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/jsruntime/qv4internalclass.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/jsruntime/qv4mm.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/qml/qqmlengine.cpp	diff1 \|	diff2 \|	blob \| history
src/qml/types/qqmldelegatemodel.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickanimatedsprite.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickborderimage_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickimagebase_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitem.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktext_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktext_p_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktextedit.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktextedit_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktextinput.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktextinput_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickview.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickwindow.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickwindow.h	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/qsgadaptationlayer.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/qsgcontext.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/qsgwindowsrenderloop.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/util/qsgsimpletexturenode.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qml/qjsengine/tst_qjsengine.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/quick/qquickgridview/tst_qquickgridview.cpp	diff1 \|	diff2 \|	blob \| history