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)
1  2 
src/quick/items/qquickitem.cpp
src/quick/items/qquickitem_p.h
src/quick/items/qquickwindow.cpp

Simple merge
Simple merge
Simple merge