git.six.silmor.de Git - konrad/qtdeclarative.git/commit

projects / konrad/qtdeclarative.git / commit

author	Gunnar Sletta <gunnar.sletta@nokia.com>
	Mon, 12 Sep 2011 06:12:58 +0000 (08:12 +0200)
committer	Gunnar Sletta <gunnar.sletta@nokia.com>
	Mon, 12 Sep 2011 06:12:58 +0000 (08:12 +0200)
commit	d77218522eb480c8d528de18049cd7b604cdeb2a
tree	a6433a8e9205a95006eae10b53285a0e3487423d	tree \| snapshot
parent	589c8445e2623ef8e0b8294d7c558a2948b2a5e3	commit \| diff
parent	d5686fa2ac2248d5a31237573fa08697f18f035f	commit \| diff

Merge branch 'master' into refactor

Conflicts:
examples/declarative/cppextensions/qwidgets/qwidgets.pro
examples/declarative/minehunt/main.cpp
examples/declarative/minehunt/minehunt.pro
src/declarative/items/context2d/qsgcontext2d.cpp
src/declarative/items/qsgflickable.cpp
src/declarative/items/qsgtextedit.cpp
src/declarative/items/qsgtextinput.cpp
src/declarative/particles/qsgangleddirection.cpp
src/declarative/particles/qsgcumulativedirection.cpp
src/declarative/particles/qsgcumulativedirection_p.h
src/declarative/particles/qsgfollowemitter.cpp
src/declarative/particles/qsgmodelparticle.cpp
src/declarative/particles/qsgparticlesystem.cpp
src/qtquick1/util/qdeclarativeview.h
tests/auto/declarative/examples/examples.pro
tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp

Change-Id: Ib4be2a5e742dee1a399d73da97161736f77448e5

43 files changed:

examples/declarative/minehunt/main.cpp	diff1 \|	diff2 \|	blob \| history
examples/declarative/qtquick1/cppextensions/qwidgets/qwidgets.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/debugger/qdeclarativedebugserver.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/declarative.pro	diff1 \|	diff2 \|	blob \| history
src/declarative/items/context2d/qsgcontext2d.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsganimation.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgcanvas.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgflickable.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgflickable_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgflickable_p_p.h	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/qsgitem_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgitemsmodule.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgshadereffect.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgshadereffect_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgshadereffectmesh_p.h	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/qsgview.h	diff1 \|	diff2 \|	blob \| history
src/declarative/particles/qsgcustomparticle.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/particles/qsgimageparticle.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/particles/qsgimageparticle_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/particles/qsgparticlesystem.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/ftw/qdeclarativepool_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativecomponent.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativeengine.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativevme.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/v8/qv8qobjectwrapper.cpp	diff1 \|	diff2 \|	blob \| history
src/qtquick1/graphicsitems/qdeclarativetextedit.cpp	diff1 \|	diff2 \|	blob \| history
src/qtquick1/graphicsitems/qdeclarativetextinput.cpp	diff1 \|	diff2 \|	blob \| history
src/qtquick1/util/qdeclarativeview.h	diff1 \|	diff2 \|	blob \| history
tests/auto/declarative/declarative.pro	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/qsgfocusscope/tst_qsgfocusscope.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/declarative/qsggridview/tst_qsggridview.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/declarative/qsglistview/tst_qsglistview.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/declarative/qsgtextedit/tst_qsgtextedit.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qtquick1/qdeclarativetextinput/tst_qdeclarativetextinput.cpp	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

examples/declarative/minehunt/main.cpp	diff1 \|	diff2 \|	blob \| history
examples/declarative/qtquick1/cppextensions/qwidgets/qwidgets.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/debugger/qdeclarativedebugserver.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/declarative.pro	diff1 \|	diff2 \|	blob \| history
src/declarative/items/context2d/qsgcontext2d.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsganimation.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgcanvas.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgflickable.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgflickable_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgflickable_p_p.h	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/qsgitem_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgitemsmodule.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgshadereffect.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgshadereffect_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/items/qsgshadereffectmesh_p.h	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/qsgview.h	diff1 \|	diff2 \|	blob \| history
src/declarative/particles/qsgcustomparticle.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/particles/qsgimageparticle.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/particles/qsgimageparticle_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/particles/qsgparticlesystem.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/ftw/qdeclarativepool_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativecomponent.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativeengine.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativevme.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/v8/qv8qobjectwrapper.cpp	diff1 \|	diff2 \|	blob \| history
src/qtquick1/graphicsitems/qdeclarativetextedit.cpp	diff1 \|	diff2 \|	blob \| history
src/qtquick1/graphicsitems/qdeclarativetextinput.cpp	diff1 \|	diff2 \|	blob \| history
src/qtquick1/util/qdeclarativeview.h	diff1 \|	diff2 \|	blob \| history
tests/auto/declarative/declarative.pro	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/qsgfocusscope/tst_qsgfocusscope.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/declarative/qsggridview/tst_qsggridview.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/declarative/qsglistview/tst_qsglistview.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/declarative/qsgtextedit/tst_qsgtextedit.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp	diff1 \|	diff2 \|	blob \| history
tests/auto/qtquick1/qdeclarativetextinput/tst_qdeclarativetextinput.cpp	diff1 \|	diff2 \|	blob \| history