aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFabian Kosmale <fabian.kosmale@qt.io>2019-10-24 08:46:47 +0200
committerFabian Kosmale <fabian.kosmale@qt.io>2019-10-24 13:36:13 +0200
commit990518e6c3e9410960dfbbfa1578b3b81a8c2af6 (patch)
tree8df6b40e8f6d9376e135b20826e3a6fb3e18ab0d /src
parent31be482e740a6aec1243eb7ba3d865b9d4050641 (diff)
Update flowchart to reflect addition of new methods
- Removed reference to setContextProperty, as we want to deprecate them - Added qmlRegisterSingletonInstance as a different way to register a singleton and as a replacement for setContextProperty - Replaced no-argument qmlRegisterType with qmlRegisterAnonymousType - Restructured graph, removing a few choices Task-number: QTBUG-78952 Change-Id: I1882d3fdd281fd15ae9940127d078457f2942edb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/qml/doc/images/cpp-qml-integration-flowchart.odgbin15028 -> 15311 bytes
-rw-r--r--src/qml/doc/images/cpp-qml-integration-flowchart.pngbin80498 -> 64865 bytes
2 files changed, 0 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 f24021635e..026f89fd73 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 3649ff9e41..97f075f51e 100644
--- a/src/qml/doc/images/cpp-qml-integration-flowchart.png
+++ b/src/qml/doc/images/cpp-qml-integration-flowchart.png
Binary files differ