Merge branch 'master' into refactor
authorGunnar Sletta <gunnar.sletta@nokia.com>
Thu, 11 Aug 2011 14:03:12 +0000 (16:03 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Thu, 11 Aug 2011 14:03:12 +0000 (16:03 +0200)
commitf9949f501890a7f8289fcbda85d3a4085bdbb21a
tree759e57bb3ed156e46a98c3a4223951c3edc55d43
parent1ddef09c351f2899b1662ddd1de190c0d0a8b7bf
parent3e0c19d5ba0e4826c3f036c3172d8ea0e30530a6
Merge branch 'master' into refactor

Conflicts:
src/declarative/declarative.pro
src/imports/gestures/gestures.pro
src/imports/inputcontext/inputcontext.pro
src/qtquick1/graphicsitems/qdeclarativeitem.cpp
src/qtquick1/qtquick1.pro

Change-Id: I782be7090d8b6da9c890bc8e778722da93da8037
src/declarative/declarative.pro
src/declarative/items/context2d/qsgcontext2d.cpp
src/declarative/items/qsgitem.cpp
src/declarative/qml/qdeclarativeengine.cpp
src/declarative/qml/qdeclarativemetatype.cpp
src/imports/gestures/gestures.pro
src/imports/inputcontext/inputcontext.pro
src/imports/inputcontext/plugin.cpp
src/qtquick1/graphicsitems/qdeclarativeitem.cpp
src/qtquick1/qtquick1.pro
src/qtquick1/util/qdeclarativeview.cpp