Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtdeclarative into newdocs
authorJerome Pasion <jerome.pasion@digia.com>
Fri, 2 Nov 2012 13:59:56 +0000 (14:59 +0100)
committerJerome Pasion <jerome.pasion@digia.com>
Fri, 2 Nov 2012 14:02:08 +0000 (15:02 +0100)
Change-Id: Icced038fbdb309d8928213d3753a27fe5a6b1137

1  2 
src/quick/items/qquickwindow.cpp

Simple merge