Merge branch 'refactor'
authorGunnar Sletta <gunnar.sletta@nokia.com>
Tue, 13 Sep 2011 08:21:53 +0000 (10:21 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Tue, 13 Sep 2011 08:22:22 +0000 (10:22 +0200)
commitce5ac7d67b59deb7c0e261e9ee21a475e6cb2e41
treeed4dcec9a0e9002156e085ffb6715436bc2e27c5
parentf828bee19dee73246c09af3aad913b5540f1cbd0
parent63952084c085202e7eddca6840c518d8e07445d0
Merge branch 'refactor'

Conflicts:
src/declarative/items/context2d/qsgcanvasitem.cpp
src/declarative/items/context2d/qsgcontext2d.cpp
src/declarative/items/context2d/qsgcontext2d_p_p.h
src/declarative/particles/qsgcustomparticle.cpp
src/declarative/particles/qsgparticlesystem.cpp

Change-Id: I24e81d3652368c5031305ffa7f969f9f2c249c6c
src/declarative/items/context2d/qsgcontext2d.cpp
src/declarative/items/qsgflickable.cpp
src/declarative/items/qsgitemsmodule.cpp
src/declarative/items/qsgspriteengine.cpp
src/declarative/items/qsgspriteimage.cpp
src/declarative/particles/qsgcustomparticle.cpp
src/declarative/particles/qsgimageparticle.cpp
src/declarative/particles/qsgimageparticle_p.h
tests/auto/declarative/qsgtextinput/tst_qsgtextinput.cpp