9 files changed, 148 insertions, 22 deletions
diff --git a/src/qml/doc/src/cppintegration/definetypes.qdoc b/src/qml/doc/src/cppintegration/definetypes.qdoc
index 027e4b9923..7f3ff416a1 100644
--- a/src/qml/doc/src/cppintegration/definetypes.qdoc
+++ b/src/qml/doc/src/cppintegration/definetypes.qdoc
@@ -297,6 +297,8 @@ qmlRegisterRevision<BaseType,1>("MyTypes", 1, 1);
 This is useful when deriving from base classes provided by other authors,
 e.g. when extending classes from the Qt Quick module.
 
+\note The QML engine does not support revisions for properties or signals of
+grouped and attached property objects.
 
 \section2 Registering Extension Objects
 
diff --git a/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc b/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc
index 7c2ff703c6..9c33979f40 100644
--- a/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc
+++ b/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc
@@ -75,11 +75,26 @@ component, which is accessible via QQuickView::rootObject():
 \endtable
 
 This \c object is the instance of the \c MyItem.qml component that has been
-created. You can now modify the item's properties using QObject::setProperty()
-or QQmlProperty:
+created. You can now modify the item's properties using
+\l QObject::setProperty() or \l QQmlProperty::write():
 
 \snippet qml/qtbinding/loading/main.cpp properties
 
+The difference between \c QObject::setProperty() and \c QQmlProperty::write()
+is that the latter will also remove the binding in addition to setting the
+property value. For example, suppose the \c width assignment above had been a
+binding to \c height:
+
+\code
+    width: height
+\endcode
+
+If the \c height of the \c Item changed after the
+\c {object->setProperty("width", 500)} call, the \c width would be updated
+again, as the binding remains active. However, if the \c height changes after the
+\c {QQmlProperty(object, "width").write(500)} call, the \c width will not be
+changed, as the binding does not exist anymore.
+
 Alternatively, you can cast the object to its actual type and call methods with
 compile-time safety. In this case the base object of \c MyItem.qml is an
 \l Item, which is defined by the QQuickItem class:
diff --git a/src/qml/doc/src/cppintegration/topic.qdoc b/src/qml/doc/src/cppintegration/topic.qdoc
index 6b6e308edf..fbb654378d 100644
--- a/src/qml/doc/src/cppintegration/topic.qdoc
+++ b/src/qml/doc/src/cppintegration/topic.qdoc
@@ -143,6 +143,12 @@ with a QML module that can then be imported and used by QML code in other applic
 \l{qtqml-modules-cppplugins.html}{Providing Types and Functionality in a C++ Plugin} for more
 information.
 
+\section1 Choosing the Correct Integration Method Between C++ and QML
+
+To quickly determine which integration method is appropriate for your situation, the following
+flowchart can be used:
+
+\image cpp-qml-integration-flowchart
 
 \section1 Exposing Attributes of C++ Classes to QML
 
diff --git a/src/qml/doc/src/external-resources.qdoc b/src/qml/doc/src/external-resources.qdoc
index 717e983517..d26288ee6e 100644
--- a/src/qml/doc/src/external-resources.qdoc
+++ b/src/qml/doc/src/external-resources.qdoc
@@ -44,3 +44,31 @@
     \externalpage https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date
     \title Mozilla Developer Network Date Reference
 */
+/*!
+    \externalpage hhttps://www.froglogic.com/squish/gui-testing
+    \title Squish
+*/
+/*!
+    \externalpage http://doc.qt.io/GammaRay
+    \title GammaRay
+*/
+/*!
+    \externalpage http://doc.qt.io/QtQmlLive
+    \title QmlLive
+*/
+/*!
+    \externalpage http://doc.qt.io/qtcreator/creator-debugging-qml.html
+    \title QML Debugger
+*/
+/*!
+    \externalpage http://doc.qt.io/qtcreator/creator-qml-performance-monitor.html
+    \title QML Profiler
+*/
+/*!
+    \externalpage http://doc.qt.io/qtcreator/index.html
+    \title Qt Creator Manual
+*/
+/*!
+    \externalpage https://fontawesome.com/
+    \title Font Awesome
+*/
diff --git a/src/qml/doc/src/javascript/hostenvironment.qdoc b/src/qml/doc/src/javascript/hostenvironment.qdoc
index d11e96df2b..eb40f10065 100644
--- a/src/qml/doc/src/javascript/hostenvironment.qdoc
+++ b/src/qml/doc/src/javascript/hostenvironment.qdoc
@@ -154,10 +154,11 @@ This restriction exists as the QML environment is not yet fully established.
 To run code after the environment setup has completed, see
 \l {JavaScript in Application Startup Code}.
 
-\li The value of \c this is currently undefined in QML in the majority of contexts.
+\li The value of \c this is undefined in QML in the majority of contexts.
 
 The \c this keyword is supported when binding properties from JavaScript.
-In all other situations, the value of
+In QML binding expressions, QML signal handlers, and QML declared functions,
+\c this refers to the scope object. In all other situations, the value of
 \c this is undefined in QML.
 
 To refer to a specific object, provide an \c id.  For example:
@@ -168,20 +169,17 @@ Item {
     function mouseAreaClicked(area) {
         console.log("Clicked in area at: " + area.x + ", " + area.y);
     }
-    // This will not work because this is undefined
+    // This will pass area to the function
     MouseArea {
-        height: 50; width: 200
-        onClicked: mouseAreaClicked(this)
-    }
-    // This will pass area2 to the function
-    MouseArea {
-        id: area2
+        id: area
         y: 50; height: 50; width: 200
-        onClicked: mouseAreaClicked(area2)
+        onClicked: mouseAreaClicked(area)
     }
 }
 \endqml
 
+\sa {Scope and Naming Resolution}
+
 \endlist
 
 
diff --git a/src/qml/doc/src/qmlfunctions.qdoc b/src/qml/doc/src/qmlfunctions.qdoc
index ede213b84a..55ca040af6 100644
--- a/src/qml/doc/src/qmlfunctions.qdoc
+++ b/src/qml/doc/src/qmlfunctions.qdoc
@@ -105,6 +105,8 @@
   than the actual version of the library. Indeed, it is normal for the new library to allow
   QML written to previous versions to continue to work, even if more advanced versions of
   some of its types are available.
+
+  \sa {Choosing the Correct Integration Method Between C++ and QML}
 */
 
 /*!
@@ -141,7 +143,8 @@
 
   Returns the QML type id.
 
-  \sa qmlRegisterTypeNotAvailable()
+  \sa qmlRegisterTypeNotAvailable(),
+      {Choosing the Correct Integration Method Between C++ and QML}
 */
 
 /*!
@@ -266,7 +269,8 @@
 
   Without this, a generic "Game is not a type" message would be given.
 
-  \sa qmlRegisterUncreatableType()
+  \sa qmlRegisterUncreatableType(),
+      {Choosing the Correct Integration Method Between C++ and QML}
 */
 
 /*!
@@ -278,7 +282,77 @@
   system. Instances of this type cannot be created from the QML
   system.
 
+  This function should be used when the type will not be referenced by name.
+  Specifically, it has to be used for C++ types that are used as the left-hand
+  side of a property binding.
+
+  For example, consider the following two classes:
+
+    \code
+    class Bar : public QObject
+    {
+        Q_OBJECT
+        Q_PROPERTY(QString baz READ baz WRITE setBaz NOTIFY bazChanged)
+
+    public:
+        Bar() {}
+
+        QString baz() const { return mBaz; }
+
+        void setBaz(const QString &baz)
+        {
+            if (baz == mBaz)
+                return;
+
+            mBaz = baz;
+            emit bazChanged();
+        }
+
+    signals:
+        void bazChanged();
+
+    private:
+        QString mBaz;
+    };
+
+    class Foo : public QObject
+    {
+        Q_OBJECT
+        Q_PROPERTY(Bar *bar READ bar CONSTANT FINAL)
+
+    public:
+        Foo() {}
+
+        Bar *bar() { return &mBar; }
+
+    private:
+        Bar mBar;
+    };
+    \endcode
+
+  In QML, we assign a string to the \c baz property of \c bar:
+
+    \code
+    Foo {
+        bar.baz: "abc"
+        Component.onCompleted: print(bar.baz)
+    }
+    \endcode
+
+  For the QML engine to know that the \c Bar type has a \c baz property,
+  we have to make \c Bar known:
+
+    \code
+    qmlRegisterType<Foo>("App", 1, 0, "Foo");
+    qmlRegisterType<Bar>();
+    \endcode
+
+  As the \c Foo type is instantiated in QML, it must be registered
+  with the version of \l qmlRegisterType() that takes an import URI.
+
   Returns the QML type id.
+
+  \sa {Choosing the Correct Integration Method Between C++ and QML}
 */
 
 /*!
@@ -346,7 +420,9 @@
        property int someValue: ExampleApi.MyApi.someProperty
    }
    \endqml
-  */
+
+   \sa {Choosing the Correct Integration Method Between C++ and QML}
+*/
 
 /*!
     \fn template<typename T> QObject *qmlAttachedPropertiesObject(const QObject *attachee, bool create = true)
@@ -486,7 +562,8 @@
    }
    \endcode
 
-  */
+   \sa {Choosing the Correct Integration Method Between C++ and QML}
+*/
 
 /*!
    \fn int qmlRegisterSingletonType(const QUrl &url, const char *uri, int versionMajor, int versionMinor, const char *qmlName)
diff --git a/src/qml/doc/src/qmltypereference.qdoc b/src/qml/doc/src/qmltypereference.qdoc
index cfd4d55a24..960ea116c9 100644
--- a/src/qml/doc/src/qmltypereference.qdoc
+++ b/src/qml/doc/src/qmltypereference.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-\qmlmodule QtQml 2.2
+\qmlmodule QtQml 2.11
 \title Qt QML QML Types
 \ingroup qmlmodules
 \brief List of QML types provided by the Qt QML module
@@ -43,11 +43,11 @@ The types provided by the \c QtQml module are only available in a QML document
 if that document imports the \c QtQml namespace (or if the document imports the
 \c QtQuick namespace, as noted below).
 
-The current version of the \c QtQml module is version 2.2, and thus it may be
+The current version of the \c QtQml module is version 2.11, and thus it may be
 imported via the following statement:
 
 \qml
-import QtQml 2.2
+import QtQml 2.11
 \endqml
 
 Most clients will never need to use the \c QtQml import, as all of the types
@@ -55,7 +55,7 @@ are also provided by the \c QtQuick namespace which may be imported as
 follows:
 
 \qml
-import QtQuick 2.7
+import QtQuick 2.11
 \endqml
 
 See the \l{Qt Quick} module documentation for more information about the \c
diff --git a/src/qml/doc/src/qtqml.qdoc b/src/qml/doc/src/qtqml.qdoc
index a9f8e2a960..b4bc9a0774 100644
--- a/src/qml/doc/src/qtqml.qdoc
+++ b/src/qml/doc/src/qtqml.qdoc
@@ -58,7 +58,7 @@ following directive:
 The QML types in Qt QML are available through the \c QtQML import. To use the
 types, add the following import statement to your .qml file:
 \code
-import QtQml 2.0
+import QtQml 2.11
 \endcode
 
 
diff --git a/src/qml/doc/src/statemachine.qdoc b/src/qml/doc/src/statemachine.qdoc
index 0cd19d2a68..59170a223f 100644
--- a/src/qml/doc/src/statemachine.qdoc
+++ b/src/qml/doc/src/statemachine.qdoc
@@ -26,7 +26,7 @@
 ****************************************************************************/
 
 /*!
-  \qmlmodule QtQml.StateMachine 1.0
+  \qmlmodule QtQml.StateMachine 1.11
   \title Declarative State Machine QML Types
   \brief Provides QML types to create and execute state graphs.