1 files changed, 35 insertions, 11 deletions
diff --git a/src/qml/doc/src/cppintegration/exposecppattributes.qdoc b/src/qml/doc/src/cppintegration/exposecppattributes.qdoc
index e3b3288a98..6031d0eebb 100644
--- a/src/qml/doc/src/cppintegration/exposecppattributes.qdoc
+++ b/src/qml/doc/src/cppintegration/exposecppattributes.qdoc
@@ -39,6 +39,14 @@ Registration is required for Q_GADGET types, as they don't derive from a known
 common base and can't be made available automatically. Without registration,
 their properties and methods are inaccessible.
 
+You can make C++ types from a different module available in your own module by
+adding a dependency to your \l{qt_add_qml_module} call using the \e DEPENDENCIES
+option. You may, for example, want to depend on QtQuick so that your QML-exposed
+C++ types can use \l QColor as method arguments and return values. QtQuick
+exposes \l QColor as a \l {QML Value Types}{value type} \e color. Such
+dependencies may be automatically inferred at run time, but you should not rely
+on this.
+
 Also note that a number of the important concepts covered in this document are
 demonstrated in the \l{Writing QML Extensions with C++} tutorial.
 
@@ -83,7 +91,8 @@ Instead of:
 \badcode
 using FooEnum = Foo::Enum;
 
-class Bar : public QObject {
+class Bar : public QObject
+{
     Q_OBJECT
     Q_PROPERTY(FooEnum enum READ enum WRITE setEnum NOTIFY enumChanged)
 };
@@ -92,37 +101,46 @@ class Bar : public QObject {
 Refer to the type directly:
 
 \code
-class Bar : public QObject {
+class Bar : public QObject
+{
     Q_OBJECT
     Q_PROPERTY(Foo::Enum enum READ enum WRITE setEnum NOTIFY enumChanged)
 };
 \endcode
 
+In order to make \c Message available you need to use \l{QML_ELEMENT} in C++
+and \l{qt_add_qml_module} in CMake.
+
 \code
 class Message : public QObject
 {
     Q_OBJECT
+    QML_ELEMENT
     Q_PROPERTY(QString author READ author WRITE setAuthor NOTIFY authorChanged)
 public:
-    void setAuthor(const QString &a) {
+    void setAuthor(const QString &a)
+    {
         if (a != m_author) {
             m_author = a;
             emit authorChanged();
         }
     }
-    QString author() const {
+
+    QString author() const
+    {
         return m_author;
     }
+
 signals:
     void authorChanged();
+
 private:
     QString m_author;
 };
 \endcode
 
-If an instance of this class was \l{Embedding C++ Objects into QML with Context
-Properties}{set as a context property} when loading a file named \c MyItem.qml
-from C++:
+An instance of \c Message can be passed as required property to a file called
+\c MyItem.qml to make it available:
 
 \code
  int main(int argc, char *argv[]) {
@@ -130,7 +148,7 @@ from C++:
 
      QQuickView view;
      Message msg;
-     view.engine()->rootContext()->setContextProperty("msg", &msg);
+     view.setInitialProperties({{"msg", &msg}});
      view.setSource(QUrl::fromLocalFile("MyItem.qml"));
      view.show();
 
@@ -142,9 +160,11 @@ Then, the \c author property could be read from \c MyItem.qml:
 
 \qml
 // MyItem.qml
-import QtQuick 2.0
+import QtQuick
 
 Text {
+    required property Message msg
+
     width: 100; height: 100
     text: msg.author    // invokes Message::author() to get this value
 
@@ -381,6 +401,8 @@ that is a public slot:
  class MessageBoard : public QObject
  {
      Q_OBJECT
+     QML_ELEMENT
+
  public:
      Q_INVOKABLE bool postMessage(const QString &msg) {
          qDebug() << "Called the C++ method with" << msg;
@@ -394,7 +416,7 @@ that is a public slot:
  };
 \endcode
 
-If an instance of \c MessageBoard was set as the context data for a file \c
+If an instance of \c MessageBoard was set as the required property for a file \c
 MyItem.qml, then \c MyItem.qml could invoke the two methods as shown in the
 examples below:
 
@@ -408,7 +430,7 @@ examples below:
 
      MessageBoard msgBoard;
      QQuickView view;
-     view.engine()->rootContext()->setContextProperty("msgBoard", &msgBoard);
+     view.setInitialProperties({{"msgBoard", &msgBoard}});
      view.setSource(QUrl::fromLocalFile("MyItem.qml"));
      view.show();
 
@@ -423,6 +445,8 @@ examples below:
 import QtQuick 2.0
 
 Item {
+    required property MessageBoard msgBoard
+
     width: 100; height: 100
 
     MouseArea {