review.tizen.org Git - profile/ivi/qtdeclarative.git/commit

projects / profile / ivi / qtdeclarative.git / commit

author	Gunnar Sletta <gunnar.sletta@nokia.com>
	Thu, 25 Aug 2011 09:47:24 +0000 (11:47 +0200)
committer	Gunnar Sletta <gunnar.sletta@nokia.com>
	Thu, 25 Aug 2011 10:52:15 +0000 (12:52 +0200)
commit	8e6ecb56e5d61ce661422779c9d9cbf22f081a34
tree	227aeb360800a49de58472bd39bc5f4c596c1b15	tree \| snapshot
parent	c9224b6cf5cceb7d5314f7504d44bfe72bc66950	commit \| diff
parent	0d84e957297b4ffa6ab5b0b5bcf8b169d567d298	commit \| diff

Merge branch 'master' into refactor

Conflicts:
src/declarative/items/qsgcanvas.cpp
src/declarative/items/qsgitem.cpp
src/declarative/items/qsgtextnode.cpp
tests/auto/declarative/examples/examples.pro
tools/qmlviewer/qmlviewer.pro

Change-Id: Icbb0ef5dc79b658c62fd2b2c25a66c9bb3cbeb10

31 files changed:

src/declarative/items/qsgborderimage.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgcanvas.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgcanvas_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgflickable.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgimage.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgitem.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgitem.h	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgmousearea.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgpathview.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgpincharea.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgshadereffectsource.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgtext.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgtextedit.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgtextinput.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgtextnode.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/particles/qsgcustomparticle.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativeengine.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/scenegraph/coreapi/qsgnode.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/scenegraph/coreapi/qsgrenderer.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/util/qdeclarativestateoperations.cpp	diff1 \|	diff2 \|	blob \| history
src/qtquick1/graphicsitems/qdeclarativeborderimage.cpp	diff1 \|	diff2 \|	blob \| history
src/qtquick1/graphicsitems/qdeclarativeflipable.cpp	diff1 \|	diff2 \|	blob \| history
src/qtquick1/graphicsitems/qdeclarativeitem.cpp	diff1 \|	diff2 \|	blob \| history
src/qtquick1/graphicsitems/qdeclarativerectangle.cpp	diff1 \|	diff2 \|	blob \| history
src/qtquick1/util/qdeclarativestateoperations.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/declarative/examples/examples.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/declarative/examples/tst_examples.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/declarative/qsglistview/tst_qsglistview.cpp	diff1 \|	diff2 \|	blob \| history
tools/qmlscene/main.cpp	diff1 \|	diff2 \|	blob \| history
tools/qmlviewer/qmlviewer.pro	diff1 \|	diff2 \|	blob \| history

Domain: UI Framework / Uncategorized;

RSS Atom

src/declarative/items/qsgborderimage.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgcanvas.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgcanvas_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgflickable.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgimage.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgitem.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgitem.h	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgmousearea.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgpathview.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgpincharea.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgshadereffectsource.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgtext.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgtextedit.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgtextinput.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgtextnode.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/particles/qsgcustomparticle.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativeengine.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/scenegraph/coreapi/qsgnode.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/scenegraph/coreapi/qsgrenderer.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/util/qdeclarativestateoperations.cpp	diff1 \|	diff2 \|	blob \| history
src/qtquick1/graphicsitems/qdeclarativeborderimage.cpp	diff1 \|	diff2 \|	blob \| history
src/qtquick1/graphicsitems/qdeclarativeflipable.cpp	diff1 \|	diff2 \|	blob \| history
src/qtquick1/graphicsitems/qdeclarativeitem.cpp	diff1 \|	diff2 \|	blob \| history
src/qtquick1/graphicsitems/qdeclarativerectangle.cpp	diff1 \|	diff2 \|	blob \| history
src/qtquick1/util/qdeclarativestateoperations.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/declarative/examples/examples.pro	diff1 \|	diff2 \|	blob \| history
tests/auto/declarative/examples/tst_examples.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/declarative/qsglistview/tst_qsglistview.cpp	diff1 \|	diff2 \|	blob \| history
tools/qmlscene/main.cpp	diff1 \|	diff2 \|	blob \| history
tools/qmlviewer/qmlviewer.pro	diff1 \|	diff2 \|	blob \| history