summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2021-02-05 17:44:41 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-02-09 17:58:26 +0000
commit5d39f66ac0042537658a32210ff2030977d37539 (patch)
tree4316b438c8d42157be99b050a0d920425dac0919
parent3ae21434cebac9b4c869470d663fe8a04d148157 (diff)
Doc: Update type registration flowchart
You're not supposed to call the registration functions manually. Fixes: QTBUG-90718 Change-Id: I829800132484dea670657ed1679357fe58d0ddf9 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 707f7603fbb6bce60ed532cd42ff2dc9ae39e611) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/qml/doc/images/cpp-qml-integration-flowchart.odgbin14778 -> 14138 bytes
-rw-r--r--src/qml/doc/images/cpp-qml-integration-flowchart.pngbin47554 -> 57846 bytes
-rw-r--r--src/qml/doc/src/cppintegration/topic.qdoc3
3 files changed, 3 insertions, 0 deletions
diff --git a/src/qml/doc/images/cpp-qml-integration-flowchart.odg b/src/qml/doc/images/cpp-qml-integration-flowchart.odg
index 5b9ed20dd7..c0d8b7a8d7 100644
--- a/src/qml/doc/images/cpp-qml-integration-flowchart.odg
+++ b/src/qml/doc/images/cpp-qml-integration-flowchart.odg
Binary files differ
diff --git a/src/qml/doc/images/cpp-qml-integration-flowchart.png b/src/qml/doc/images/cpp-qml-integration-flowchart.png
index a714075181..1e76e823c4 100644
--- a/src/qml/doc/images/cpp-qml-integration-flowchart.png
+++ b/src/qml/doc/images/cpp-qml-integration-flowchart.png
Binary files differ
diff --git a/src/qml/doc/src/cppintegration/topic.qdoc b/src/qml/doc/src/cppintegration/topic.qdoc
index bf4565a996..123ab18779 100644
--- a/src/qml/doc/src/cppintegration/topic.qdoc
+++ b/src/qml/doc/src/cppintegration/topic.qdoc
@@ -150,6 +150,9 @@ flowchart can be used:
\image cpp-qml-integration-flowchart
+For a description of the macros in the flowchart, see the
+\l {qtqml-cppintegration-definetypes.html}{Defining QML Types from C++} documentation.
+
\section1 Exposing Attributes of C++ Classes to QML
QML can easily be extended from C++ due to the QML engine's integration with the Qt meta object