Merge branch 'origin/5.4' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 21 Aug 2014 12:26:09 +0000 (14:26 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 21 Aug 2014 12:30:29 +0000 (14:30 +0200)
commitcc1b216c52d42964c9ac816302414cc6ec376dfe
tree4e282f89572881e963ca4aaf1f1dae44ec2d334a
parent0fadb710e5639dac9f17d6655eb9edeaadbcbc33
parent0af61d773fc7263573afc6b7a973451783bf7424
Merge branch 'origin/5.4' into dev

This merges 0af61d773fc7263573afc6b7a973451783bf7424 since there is a
circular dependency introduced with a111b1b108f2d3344cb2b2b677e738fd9dd68945
in qtquickcontrols.

Change-Id: Ia4fcad8df69326fba3f6b5927151e9d98206e872
src/quick/items/qquickimagebase_p.h
src/quick/items/qquickitem.h
src/quick/items/qquickpathview_p_p.h
src/quick/items/qquickshadereffectnode.cpp
src/quick/items/qquickshadereffectnode_p.h
src/quick/items/qquickwindow.cpp
src/quick/items/qquickwindow.h