Merge branch 'master' into qtquick2

Conflicts:
	src/declarative/qml/qdeclarativeengine.cpp

diff --cc demos/declarative/flickr/flickr.qml
Simple merge

diff --cc demos/declarative/minehunt/MinehuntCore/Explosion.qml
Simple merge

diff --cc demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
Simple merge

diff --cc demos/declarative/samegame/SamegameCore/BoomBlock.qml
Simple merge

diff --cc demos/declarative/samegame/samegame.qml
Simple merge

diff --cc demos/declarative/snake/content/Cookie.qml
Simple merge

diff --cc demos/declarative/snake/content/Link.qml
Simple merge

diff --cc src/declarative/declarative.pro
Simple merge

diff --cc src/declarative/qml/qdeclarativeengine.cpp
Simple merge

diff --cc src/declarative/util/qdeclarativepixmapcache.cpp
Simple merge