Merge remote-tracking branch 'origin/5.3' into 5.4
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 28 Aug 2014 14:18:27 +0000 (16:18 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 28 Aug 2014 14:18:27 +0000 (16:18 +0200)
commit06c2ddc88c6d7b0cf4d90b0c373462a06a1e7b1c
tree30544a44db8dd7dd1be547225b7c021407b6db57
parent26fb6a0915ec64d30eaa78e781e7f18468bc2ed7
parentd8bc98b525c082ed7a2904a985e0daee48b406bb
Merge remote-tracking branch 'origin/5.3' into 5.4

Change-Id: I92b91cce499ed4bec64521a581276f397792e218
src/imports/window/plugin.cpp
src/quick/items/qquickscreen.cpp
src/quick/items/qquickwindow.cpp