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

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

Change-Id: I272074fa2ca259439cae2f686325932f7f9d7c01

8 files changed, 51 insertions, 16 deletions

diff --git a/examples/qml/networkaccessmanagerfactory/doc/src/networkaccessmanagerfactory.qdoc b/examples/qml/networkaccessmanagerfactory/doc/src/networkaccessmanagerfactory.qdoc
index ccb05917a8..84ad077a17 100644
--- a/examples/qml/networkaccessmanagerfactory/doc/src/networkaccessmanagerfactory.qdoc
+++ b/examples/qml/networkaccessmanagerfactory/doc/src/networkaccessmanagerfactory.qdoc
@@ -26,8 +26,9 @@
 ****************************************************************************/
 
 /*!
-    \title C++ Extensions: Network Access Manager Factory Example
     \example networkaccessmanagerfactory
+    \title C++ Extensions: Network Access Manager Factory Example
+    \brief Implements a custom network access manager for the QML engine
 
     This example shows how to use QQmlNetworkAccessManagerFactory to create a QNetworkAccessManager
     with a proxy.
diff --git a/src/qml/doc/qtqml.qdocconf b/src/qml/doc/qtqml.qdocconf
index 5729a60ea3..74b61fd6e1 100644
--- a/src/qml/doc/qtqml.qdocconf
+++ b/src/qml/doc/qtqml.qdocconf
@@ -23,7 +23,7 @@ qhp.QtQml.subprojects.classes.indexTitle = Qt QML C++ Classes
 qhp.QtQml.subprojects.classes.selectors = class fake:headerfile
 qhp.QtQml.subprojects.classes.sortPages = true
 qhp.QtQml.subprojects.examples.title = Examples
-qhp.QtQml.subprojects.examples.indexTitle = Qt Quick Examples and Tutorials
+qhp.QtQml.subprojects.examples.indexTitle = Qt QML Examples
 qhp.QtQml.subprojects.examples.selectors = fake:example
 qhp.QtQml.subprojects.qmltypes.title = QML Types
 qhp.QtQml.subprojects.qmltypes.indexTitle = Qt QML QML Types
@@ -50,7 +50,8 @@ imagedirs   += images
 
 # Add a thumbnail for examples that do not have images
 manifestmeta.thumbnail.names += "QtQml/Chapter 4*" \
-                                "QtQml/Chapter 6*"
+                                "QtQml/Chapter 6*" \
+                                "QtQml/C++ Extensions: *"
 
 navigation.landingpage = "Qt QML"
 navigation.cppclassespage = "Qt QML C++ Classes"
diff --git a/src/qml/doc/src/examples.qdoc b/src/qml/doc/src/examples.qdoc
new file mode 100644
index 0000000000..f3550ae199
--- /dev/null
+++ b/src/qml/doc/src/examples.qdoc
@@ -0,0 +1,35 @@
+/****************************************************************************
+**
+** 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
+** 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 --git a/src/qml/doc/src/qtqml.qdoc b/src/qml/doc/src/qtqml.qdoc
index 61ebbcf690..64d6bb9ac4 100644
--- a/src/qml/doc/src/qtqml.qdoc
+++ b/src/qml/doc/src/qtqml.qdoc
@@ -148,6 +148,7 @@ Further information for writing QML applications:
 \list
 \li \l{Qt QML C++ Classes}{C++ Classes}
 \li \l{Qt QML QML Types}{QML Types}
+\li \l{Qt QML Examples}{Examples}
 \endlist
 
 */
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf
index afe1b9708f..7f43dc2c31 100644
--- a/src/quick/doc/qtquick.qdocconf
+++ b/src/quick/doc/qtquick.qdocconf
@@ -67,7 +67,8 @@ excludedirs += ../../imports/models \
 
 examples.fileextensions        += "*.qm"
 
-manifestmeta.thumbnail.names += "QtQuick/Threaded ListModel Example"
+manifestmeta.thumbnail.names += "QtQuick/Threaded ListModel Example" \
+                                "QtQuick/QML Dynamic View Ordering Tutorial*"
 
 navigation.landingpage = "Qt Quick"
 navigation.cppclassespage = "Qt Quick C++ Classes"
diff --git a/src/quick/scenegraph/coreapi/qsggeometry.cpp b/src/quick/scenegraph/coreapi/qsggeometry.cpp
index 3f54e13c52..1fd37be84a 100644
--- a/src/quick/scenegraph/coreapi/qsggeometry.cpp
+++ b/src/quick/scenegraph/coreapi/qsggeometry.cpp
@@ -522,7 +522,8 @@ void QSGGeometry::setDrawingMode(GLenum mode)
 /*!
     Gets the current line or point width or to be used for this geometry. This property
     only applies to line width when the drawingMode is \c GL_LINES, \c GL_LINE_STRIP, or
-    \c GL_LINE_LOOP, and only applies to point size when the drawingMode is \c GL_POINTS.
+    \c GL_LINE_LOOP. For desktop OpenGL, it also applies to point size when the drawingMode
+    is \c GL_POINTS.
 
     The default value is \c 1.0
 
@@ -536,7 +537,12 @@ float QSGGeometry::lineWidth() const
 /*!
     Sets the line or point width to be used for this geometry to \a width. This property
     only applies to line width when the drawingMode is \c GL_LINES, \c GL_LINE_STRIP, or
-    \c GL_LINE_LOOP, and only applies to point size when the drawingMode is \c GL_POINTS.
+    \c GL_LINE_LOOP. For Desktop OpenGL, it also applies to point size when the drawingMode
+    is \c GL_POINTS.
+
+    \note How line width and point size are treated is implementation dependent: The application
+    should not rely on these, but rather create triangles or similar to draw areas. On OpenGL ES,
+    line width support is limited and point size is unsupported.
 
     \sa lineWidth(), drawingMode()
 */
diff --git a/tests/auto/quick/qquickwindow/BLACKLIST b/tests/auto/quick/qquickwindow/BLACKLIST
deleted file mode 100644
index 1201ef12f0..0000000000
--- a/tests/auto/quick/qquickwindow/BLACKLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-[testWindowVisibilityOrder]
-osx
diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
index 93c3a34b39..dfe5276e8e 100644
--- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
+++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp
@@ -1753,14 +1753,6 @@ void tst_qquickwindow::testWindowVisibilityOrder()
     QTest::qWaitForWindowExposed(window5);
     QVERIFY(window4->isVisible());
     QVERIFY(window5->isVisible());
-    window4->hide();
-    window5->hide();
-
-    window3->hide();
-    QTRY_COMPARE(window2, QGuiApplication::focusWindow());
-
-    window2->hide();
-    QTRY_COMPARE(window1.data(), QGuiApplication::focusWindow());
 }
 
 void tst_qquickwindow::blockClosing()