Merge remote-tracking branch 'origin/5.4' into 5.5

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

Change-Id: I272074fa2ca259439cae2f686325932f7f9d7c01

diff --cc examples/qml/networkaccessmanagerfactory/doc/src/networkaccessmanagerfactory.qdoc
Simple merge

diff --cc src/qml/doc/src/examples.qdoc
index 0000000000000000000000000000000000000000,29424053a4461f4ba42d52a7be4ec9b108ebdc63..f3550ae19995ae384b42aaba14c65a17a2e288c8
mode 000000,100644..100644
--- /dev/null
--- 2/src/qml/doc/src/examples.qdoc
+++ b/src/qml/doc/src/examples.qdoc
@@@ -1,0 -1,35 +1,35 @@@
 -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 -** Contact: http://www.qt-project.org/legal
+ /****************************************************************************
+ **
 -** a written agreement between you and Digia.  For licensing terms and
 -** conditions see http://qt.digia.com/licensing.  For further information
 -** use the contact form at http://qt.digia.com/contact-us.
++** Copyright (C) 2015 The Qt Company Ltd.
++** Contact: http://www.qt.io/licensing/
+ **
+ ** This file is part of the documentation of the Qt Toolkit.
+ **
+ ** $QT_BEGIN_LICENSE:FDL$
+ ** Commercial License Usage
+ ** Licensees holding valid commercial Qt licenses may use this file in
+ ** accordance with the commercial license agreement provided with the
+ ** Software or, alternatively, in accordance with the terms contained in
 -** this file.  Please review the following information to ensure
++** a written agreement between you and The Qt Company. For licensing terms
++** and conditions see http://www.qt.io/terms-conditions. For further
++** information use the contact form at http://www.qt.io/contact-us.
+ **
+ ** GNU Free Documentation License Usage
+ ** Alternatively, this file may be used under the terms of the GNU Free
+ ** Documentation License version 1.3 as published by the Free Software
+ ** Foundation and appearing in the file included in the packaging of
++** this file. Please review the following information to ensure
+ ** the GNU Free Documentation License version 1.3 requirements
+ ** will be met: http://www.gnu.org/copyleft/fdl.html.
+ ** $QT_END_LICENSE$
+ **
+ ****************************************************************************/
+ 
+ /*!
+ \group qmlextendingexamples
+ \title Qt QML Examples
+ \brief List of Qt QML examples for reference.
+ 
+ The list of examples demonstrating how to extend C++ to QML or the other way
+ around.
+ */

diff --cc src/qml/doc/src/qtqml.qdoc
Simple merge

diff --cc src/quick/scenegraph/coreapi/qsggeometry.cpp
Simple merge

diff --cc tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
Simple merge