diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/qml/doc/images/cpp-qml-integration-flowchart.odg | bin | 14778 -> 14138 bytes | |||
-rw-r--r-- | src/qml/doc/images/cpp-qml-integration-flowchart.png | bin | 47554 -> 57846 bytes | |||
-rw-r--r-- | src/qml/doc/src/cppintegration/topic.qdoc | 3 |
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 Binary files differindex 5b9ed20dd7..c0d8b7a8d7 100644 --- a/src/qml/doc/images/cpp-qml-integration-flowchart.odg +++ b/src/qml/doc/images/cpp-qml-integration-flowchart.odg diff --git a/src/qml/doc/images/cpp-qml-integration-flowchart.png b/src/qml/doc/images/cpp-qml-integration-flowchart.png Binary files differindex a714075181..1e76e823c4 100644 --- a/src/qml/doc/images/cpp-qml-integration-flowchart.png +++ b/src/qml/doc/images/cpp-qml-integration-flowchart.png 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 |