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

projects / platform / upstream / qtdeclarative.git / commit

author	Oswald Buddenhagen <oswald.buddenhagen@digia.com>
	Thu, 11 Sep 2014 08:44:17 +0000 (10:44 +0200)
committer	Oswald Buddenhagen <oswald.buddenhagen@digia.com>
	Thu, 11 Sep 2014 08:44:17 +0000 (10:44 +0200)
commit	22fcb0efbe0644f5bd29e9538ebb76fa0dbc37b3
tree	523582d6d950035b90bddbfb778302abe3fb2599	tree \| snapshot
parent	57459d769e10170aea4e084917c1fb7267278aa2	commit \| diff
parent	c6a71e297447e27d49fce6a3ec3e28c303ec7042	commit \| diff

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

Conflicts:
src/quick/items/qquickpainteditem.h
src/quick/items/qquickshadereffectsource.cpp
src/quick/items/qquickshadereffectsource_p.h

Change-Id: If98096443afe85fc4370cef971eace050006a61b

69 files changed:

src/quick/items/context2d/qquickcanvasitem_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickaccessibleattached.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickaccessibleattached_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickanchors_p_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickanimatedimage_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickanimatedsprite.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickanimatedsprite_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickborderimage_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickdrag.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickdroparea_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickflickable.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickflickable_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickflickable_p_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickflipable.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickflipable_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickframebufferobject.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickgridview.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickgridview_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickimage_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickimagebase_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickimplicitsizeitem_p_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitem.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitem_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitemanimation.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitemanimation_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitemview_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitemview_p_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitemviewtransition.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicklistview.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicklistview_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickloader_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickloader_p_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickmultipointtoucharea_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickpainteditem.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickpathview_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickpathview_p_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickpincharea_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickpositioners_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickpositioners_p_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickrectangle_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickrepeater_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickshadereffect_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickshadereffectmesh_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickshadereffectnode.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickshadereffectnode_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickshadereffectsource_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicksprite_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickspriteengine_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickspritesequence.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickspritesequence_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickstateoperations_p.h	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/qquicktextcontrol_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktextedit_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktextedit_p_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktextinput_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktextinput_p_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktranslate_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickview.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickview_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickwindow.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickwindow.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickwindowmodule.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/qsgdefaultlayer.cpp	\|	diff2 \|	blob \| history
src/quick/scenegraph/qsgdefaultlayer_p.h	\|	diff2 \|	blob \| history
src/quick/scenegraph/util/qsgvertexcolormaterial.cpp	diff1 \|	diff2 \|	blob \| history
src/quickwidgets/qquickwidget.h	diff1 \|	diff2 \|	blob \| history

Domain: UI Framework / Qt;

RSS Atom

src/quick/items/context2d/qquickcanvasitem_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickaccessibleattached.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickaccessibleattached_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickanchors_p_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickanimatedimage_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickanimatedsprite.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickanimatedsprite_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickborderimage_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickdrag.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickdroparea_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickflickable.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickflickable_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickflickable_p_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickflipable.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickflipable_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickframebufferobject.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickgridview.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickgridview_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickimage_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickimagebase_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickimplicitsizeitem_p_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitem.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitem_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitemanimation.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitemanimation_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitemview_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitemview_p_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickitemviewtransition.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicklistview.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicklistview_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickloader_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickloader_p_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickmultipointtoucharea_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickpainteditem.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickpathview_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickpathview_p_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickpincharea_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickpositioners_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickpositioners_p_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickrectangle_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickrepeater_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickshadereffect_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickshadereffectmesh_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickshadereffectnode.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickshadereffectnode_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickshadereffectsource_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicksprite_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickspriteengine_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickspritesequence.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickspritesequence_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickstateoperations_p.h	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/qquicktextcontrol_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktextedit_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktextedit_p_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktextinput_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktextinput_p_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquicktranslate_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickview.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickview_p.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickwindow.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickwindow.h	diff1 \|	diff2 \|	blob \| history
src/quick/items/qquickwindowmodule.cpp	diff1 \|	diff2 \|	blob \| history
src/quick/scenegraph/qsgdefaultlayer.cpp	\|	diff2 \|	blob \| history
src/quick/scenegraph/qsgdefaultlayer_p.h	\|	diff2 \|	blob \| history
src/quick/scenegraph/util/qsgvertexcolormaterial.cpp	diff1 \|	diff2 \|	blob \| history
src/quickwidgets/qquickwidget.h	diff1 \|	diff2 \|	blob \| history