diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 01:00:13 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 01:00:13 +0200 |
| commit | 257319079562368b6ee731f54e3f69647c3417b7 (patch) | |
| tree | 231137a8fecdf1405eedb631bc3008a630cf9e16 /src/qml/doc | |
| parent | 7ecc96305f5ec0ed093e2e1b182cb85b71609bcd (diff) | |
| parent | aa3d088e3dbc6e93620310cf8de0782fbb2b2ee8 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Iaa7dbbe9926d25cfb1b1c51e7013e58cb71d86b5
Diffstat (limited to 'src/qml/doc')
| -rw-r--r-- | src/qml/doc/images/cpp-qml-integration-flowchart.odg | bin | 15028 -> 15311 bytes |
| -rw-r--r-- | src/qml/doc/images/cpp-qml-integration-flowchart.png | bin | 80498 -> 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 Binary files differindex f24021635e..026f89fd73 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 3649ff9e41..97f075f51e 100644 --- a/src/qml/doc/images/cpp-qml-integration-flowchart.png +++ b/src/qml/doc/images/cpp-qml-integration-flowchart.png |
