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)
commit47c45bb1e487b3823281683c1110d9269f144582
tree4c687d46d9aa7d90f064a25e6c7f0241ae28e16d
parent677be9a27770ff48dd771ec4fc1c66139aac4aa8
parent7d94fa8e074ba816751c60bd0ad3c63b3c0b0a27
Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtdeclarative into newdocs

Change-Id: Icced038fbdb309d8928213d3753a27fe5a6b1137
src/quick/items/qquickwindow.cpp