Merge branch 'wip/v4' of ssh://codereview.qt-project.org/qt/qtdeclarative into dev
authorSimon Hausmann <simon.hausmann@digia.com>
Tue, 6 Aug 2013 13:57:54 +0000 (15:57 +0200)
committerSimon Hausmann <simon.hausmann@digia.com>
Tue, 6 Aug 2013 13:59:09 +0000 (15:59 +0200)
commit27deff6d2b5a9eb1d98cd7b377ab934a35086664
tree4c34e422a8a838c59de68e7017d533cfb56d8eb5
parent0cca56f30d6a0290841859a58f517cece13d8d81
parentf3cbd0b8aa96abfc4b3660df4426ed10b11b18e0
Merge branch 'wip/v4' of ssh://codereview.qt-project.org/qt/qtdeclarative into dev

Change-Id: I278524d0f43d2237201d9cf78c1c36a5ecc83d84
src/particles/qquickimageparticle.cpp
src/quick/items/context2d/qquickcontext2d.cpp