Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
authorLars Knoll <lars.knoll@digia.com>
Thu, 30 Oct 2014 08:13:04 +0000 (09:13 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 30 Oct 2014 08:13:04 +0000 (09:13 +0100)
commit970ff81a14c93c4f41f384026220d4baad8eec70
treeb99ff97b74be8ddcddd5b5037f172aea06623581
parent4b73acd49cc4f08a5169efba8169f968094063e0
parent4e33b069c426c975319d91e11223114fd0d8ad40
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
src/quick/items/qquickitem.cpp
src/quick/items/qquickitem_p.h
src/quick/items/qquickwindow.cpp