Merge remote-tracking branch 'origin/5.4' into 5.5
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Fri, 17 Jul 2015 16:08:53 +0000 (18:08 +0200)
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Mon, 20 Jul 2015 10:08:27 +0000 (12:08 +0200)
commit5931caca23709ed0b2583ca2fd268191d06a23ef
tree2519bd7dbce469e1ce185faaeb6bef481cade227
parent7da45b21b76965e021e8a049715b1dee34081f7c
parent2556b97ab22cfde606d2b77d6e816fd282741291
Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
tests/auto/quick/qquickwindow/tst_qquickwindow.cpp

Change-Id: I272074fa2ca259439cae2f686325932f7f9d7c01
examples/qml/networkaccessmanagerfactory/doc/src/networkaccessmanagerfactory.qdoc
src/qml/doc/src/examples.qdoc
src/qml/doc/src/qtqml.qdoc
src/quick/scenegraph/coreapi/qsggeometry.cpp
tests/auto/quick/qquickwindow/tst_qquickwindow.cpp