Merge branch 'newdocs'
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Tue, 20 Nov 2012 09:17:47 +0000 (10:17 +0100)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Tue, 20 Nov 2012 09:19:32 +0000 (10:19 +0100)
commit5e975a312412b63cb4993931923360bfe5a105b4
tree5d8f3b4ffe05ed5fb036b84ec1b7820fdab0964a
parent48b2d386399341307027efb151f59873c5372407
parent61d35829eed6661c1371d397bbb316ea2f636c50
Merge branch 'newdocs'

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