5 files changed, 194 insertions, 0 deletions
diff --git a/src/qml/doc/snippets/qml/qtLater.qml b/src/qml/doc/snippets/qml/qtLater.qml
new file mode 100644
index 0000000000..e2bc02edb4
--- /dev/null
+++ b/src/qml/doc/snippets/qml/qtLater.qml
@@ -0,0 +1,109 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+//![0]
+import QtQuick 2.0
+
+Rectangle {
+    width: 480
+    height: 320
+
+    property int callsToUpdateMinimumWidth: 0
+    property bool optimize: true
+
+    property int currentTextModel: 0
+    property var columnTexts: [
+        ["Click on either", "rectangle above", "and note how the counter", "below updates", "significantly faster using the", "regular (non-optimized)", "implementation"],
+        ["The width", "of this column", "is", "no wider than the", "widest item"],
+        ["Note how using Qt.callLater()", "the minimum width is", "calculated a bare-minimum", "number", "of times"]
+    ]
+
+    Text {
+        x: 20; y: 280
+        text: "Times minimum width has been calculated: " + callsToUpdateMinimumWidth
+    }
+
+    Row {
+        y: 25; spacing: 30; anchors.horizontalCenter: parent.horizontalCenter
+        Rectangle {
+            width: 200; height:  50; color: "lightgreen"
+            Text { text: "Optimized behavior\nusing Qt.callLater()"; anchors.centerIn: parent }
+            MouseArea { anchors.fill: parent; onClicked: { optimize = true; currentTextModel++ } }
+        }
+        Rectangle {
+            width: 200; height:  50; color: "lightblue"
+            Text { text: "Regular behavior"; anchors.centerIn: parent}
+            MouseArea { anchors.fill: parent; onClicked: { optimize = false; currentTextModel++ } }
+        }
+    }
+
+    Column {
+        id: column
+        anchors.centerIn: parent
+
+        onChildrenChanged: optimize ? Qt.callLater(updateMinimumWidth) : updateMinimumWidth()
+
+        property int widestChild
+        function updateMinimumWidth() {
+            callsToUpdateMinimumWidth++
+            var w = 0;
+            for (var i in children) {
+                var child = children[i];
+                if (child.implicitWidth > w) {
+                    w = child.implicitWidth;
+                }
+            }
+
+            widestChild = w;
+        }
+
+        Repeater {
+            id: repeater
+            model: columnTexts[currentTextModel%3]
+            delegate: Text {
+                color: "white"
+                text: modelData
+                width: column.widestChild
+                horizontalAlignment: Text.Center
+                Rectangle { anchors.fill: parent; z: -1; color: index%2 ? "gray" : "darkgray" }
+            }
+        }
+    }
+}
+//![0]
diff --git a/src/qml/doc/src/cppintegration/data.qdoc b/src/qml/doc/src/cppintegration/data.qdoc
index 42236524a9..ac6600f38c 100644
--- a/src/qml/doc/src/cppintegration/data.qdoc
+++ b/src/qml/doc/src/cppintegration/data.qdoc
@@ -249,6 +249,18 @@ parameter, the value can be created as a JavaScript \c Date object in QML, and
 is automatically converted to a QDateTime value when it is passed to C++.
 
 
+\section2 QTime to JavaScript Date
+
+The QML engine provides automatic type conversion from QTime values to
+JavaScript \c Date objects. The date component of the resulting Date
+object should not be relied upon, as it is operating system dependent.
+Specifically, the year (and month and day) are set to zero. Conversion
+from a JavaScript \c Date object to QTime is done by converting to a
+QDateTime, and then relying on QVariant to convert it to a QTime. The end
+effect is that the date part of the \c Date object is ignored, but the
+local timezone will be used ignoring any DST complications it may have.
+
+
 \section2 Sequence Type to JavaScript Array
 
 Certain C++ sequence types are supported transparently in QML as JavaScript
diff --git a/src/qml/doc/src/javascript/functionlist.qdoc b/src/qml/doc/src/javascript/functionlist.qdoc
index 7f0e844b65..b9a25a2440 100644
--- a/src/qml/doc/src/javascript/functionlist.qdoc
+++ b/src/qml/doc/src/javascript/functionlist.qdoc
@@ -174,6 +174,8 @@
     \li charAt(pos)
     \li charCodeAt(pos)
     \li concat([string1 [, string2 [, ...]]])
+    \li endsWith(searchString [, endPosition ]) // ECMAScript 6: Added in Qt 5.8
+    \li includes(searchString [, position ]) // ECMAScript 6: Added in 5.8
     \li indexOf(searchString ,position)
     \li lastIndexOf(searchString, position)
     \li localeCompare(that)
@@ -182,6 +184,7 @@
     \li search(regexp)
     \li slice(start, end)
     \li split(separator, limit)
+    \li startsWith(searchString [, position ]) // ECMAScript 6: Added in Qt 5.8
     \li substring(start, end)
     \li toLowerCase()
     \li toLocaleLowerCase()
@@ -228,6 +231,26 @@
     \li \l {Number::toLocaleString}{toLocaleString(locale, format, precision)}
     \endlist
 
+    \section2 The Number Object
+
+    \section3 Value Properties
+
+    \list
+    \li NaN
+    \li NEGATIVE_INFINITY
+    \li POSITIVE_INFINITY
+    \li MAX_VALUE
+    \li MIN_VALUE
+    \li EPSILON // ECMAScript 6: Added in Qt 5.8
+    \endlist
+
+    \section3 Function Properties
+
+    \list
+    \li isFinite(x) // ECMAScript 6: Added in Qt 5.8
+    \li isNaN(x) // ECMAScript 6: Added in Qt 5.8
+    \endlist
+
     \section1 The Math Object
 
     \section2 Value Properties
@@ -261,6 +284,7 @@
     \li pow(x, y)
     \li random()
     \li round(x)
+    \li sign(x) // ECMAScript 6: Added in Qt 5.8
     \li sin(x)
     \li sqrt(x)
     \li tan(x)
diff --git a/src/qml/doc/src/qmlfunctions.qdoc b/src/qml/doc/src/qmlfunctions.qdoc
index 26fc40ff37..8b24d19891 100644
--- a/src/qml/doc/src/qmlfunctions.qdoc
+++ b/src/qml/doc/src/qmlfunctions.qdoc
@@ -180,6 +180,42 @@
 */
 
 /*!
+  \fn static inline int qmlRegisterUncreatableMetaObject(const QMetaObject &staticMetaObject, const char *uri, int versionMajor, int versionMinor, const char *qmlName, const QString& reason)
+  \relates QQmlEngine
+  \since 5.8
+
+  This function registers the \a staticMetaObject and its extension
+  in the QML system with the name \a qmlName in the library imported
+  from \a uri having version number composed from \a versionMajor and
+  \a versionMinor.
+
+  This function is useful to register Q_NAMESPACE namespaces.
+
+  Returns the QML type id.
+
+  Example:
+
+  \code
+  namespace MyNamespace {
+    Q_NAMESPACE
+    enum MyEnum {
+        Key1,
+        Key2,
+    };
+    Q_ENUMS(MyEnum)
+  }
+
+  //...
+  qmlRegisterUncreatableMetaObject(MyNamespace::staticMetaObject, "io.qt", 1, 0, "MyNamespace", "Access to enums & flags only");
+  \endcode
+
+  Now on QML side you can use the registered enums:
+  \code
+  Component.onCompleted: console.log(MyNamespace.Key2)
+  \endcode
+*/
+
+/*!
   \fn int qmlRegisterCustomExtendedType(const char *uri, int versionMajor, int versionMinor, const char *qmlName, QQmlCustomParser *parser)
   \relates QQmlEngine
   \internal
diff --git a/src/qml/doc/src/qtqml.qdoc b/src/qml/doc/src/qtqml.qdoc
index 33bb0c0750..747466281e 100644
--- a/src/qml/doc/src/qtqml.qdoc
+++ b/src/qml/doc/src/qtqml.qdoc
@@ -131,6 +131,19 @@ the QML code to interact with C++ code.
 \li \l{The Declarative State Machine Framework}
 \endlist
 
+\section1 Licenses and Attributions
+
+Qt QML is available under commercial licenses from \l{The Qt Company}.
+In addition, it is available under the
+\l{GNU Lesser General Public License, version 3}, or
+the \l{GNU General Public License, version 2}.
+See \l{Qt Licensing} for further details.
+
+Furthermore Qt QML potentially contains third party
+modules under following permissive licenses:
+
+\generatelist{groupsbymodule attributions-qtqml}
+
 \section1 Guides and Other Information
 
 Further information for writing QML applications: