Merge "Merge branch '5.3' into dev" into refs/staging/dev
authorGunnar Sletta <gunnar.sletta@jollamobile.com>
Fri, 8 Aug 2014 09:05:12 +0000 (11:05 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 8 Aug 2014 09:05:12 +0000 (11:05 +0200)
1  2 
src/quick/items/qquickwindow.cpp
tests/auto/quick/qquicklistview/tst_qquicklistview.cpp

Simple merge