aboutsummaryrefslogtreecommitdiffstats
path: root/doc/qtcreator/images
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@qt.io>2020-05-15 17:20:20 +0200
committerTim Jenssen <tim.jenssen@qt.io>2020-05-15 17:20:20 +0200
commitaa79d30b83fc79e8e18af4da0062ddf21fcd201f (patch)
treef97fe44d83aa76a9c2629039aa44ebef82d5d91b /doc/qtcreator/images
parent765d3a6bc0343f3f26f9d2dbd65373b29f07177f (diff)
parent7051ba84984b20676ef2de07349e56b0d7bdfa8c (diff)
Merge remote-tracking branch 'origin/4.12' into qds-1.50qds/v1.5.0
Diffstat (limited to 'doc/qtcreator/images')
-rw-r--r--doc/qtcreator/images/qmldesigner-bindings.pngbin3378 -> 4181 bytes
-rw-r--r--doc/qtcreator/images/qmldesigner-editing-components.pngbin0 -> 34532 bytes
-rw-r--r--doc/qtcreator/images/qmldesigner-element-properties.pngbin63003 -> 59796 bytes
-rw-r--r--doc/qtcreator/images/qmldesigner-properties-view.pngbin0 -> 29394 bytes
-rw-r--r--doc/qtcreator/images/qmldesigner-qml-components.pngbin38614 -> 59047 bytes
-rw-r--r--doc/qtcreator/images/qmldesigner-screen-design.pngbin81247 -> 54663 bytes
-rw-r--r--doc/qtcreator/images/qmldesigner-states-when-condition.pngbin25214 -> 15375 bytes
-rw-r--r--doc/qtcreator/images/qmldesigner-states.pngbin61713 -> 34569 bytes
-rw-r--r--doc/qtcreator/images/qmldesigner-transitions.pngbin5169 -> 6353 bytes
9 files changed, 0 insertions, 0 deletions
diff --git a/doc/qtcreator/images/qmldesigner-bindings.png b/doc/qtcreator/images/qmldesigner-bindings.png
index c3a90cc3c7..017b22cd23 100644
--- a/doc/qtcreator/images/qmldesigner-bindings.png
+++ b/doc/qtcreator/images/qmldesigner-bindings.png
Binary files differ
diff --git a/doc/qtcreator/images/qmldesigner-editing-components.png b/doc/qtcreator/images/qmldesigner-editing-components.png
new file mode 100644
index 0000000000..1fe80e23c1
--- /dev/null
+++ b/doc/qtcreator/images/qmldesigner-editing-components.png
Binary files differ
diff --git a/doc/qtcreator/images/qmldesigner-element-properties.png b/doc/qtcreator/images/qmldesigner-element-properties.png
index 6df75cc67a..18239bdf41 100644
--- a/doc/qtcreator/images/qmldesigner-element-properties.png
+++ b/doc/qtcreator/images/qmldesigner-element-properties.png
Binary files differ
diff --git a/doc/qtcreator/images/qmldesigner-properties-view.png b/doc/qtcreator/images/qmldesigner-properties-view.png
new file mode 100644
index 0000000000..36c2e9ca15
--- /dev/null
+++ b/doc/qtcreator/images/qmldesigner-properties-view.png
Binary files differ
diff --git a/doc/qtcreator/images/qmldesigner-qml-components.png b/doc/qtcreator/images/qmldesigner-qml-components.png
index a2b090dd37..46918eee92 100644
--- a/doc/qtcreator/images/qmldesigner-qml-components.png
+++ b/doc/qtcreator/images/qmldesigner-qml-components.png
Binary files differ
diff --git a/doc/qtcreator/images/qmldesigner-screen-design.png b/doc/qtcreator/images/qmldesigner-screen-design.png
index 42bb30bb16..ff19977a0f 100644
--- a/doc/qtcreator/images/qmldesigner-screen-design.png
+++ b/doc/qtcreator/images/qmldesigner-screen-design.png
Binary files differ
diff --git a/doc/qtcreator/images/qmldesigner-states-when-condition.png b/doc/qtcreator/images/qmldesigner-states-when-condition.png
index a26ba37b52..7a1530efb0 100644
--- a/doc/qtcreator/images/qmldesigner-states-when-condition.png
+++ b/doc/qtcreator/images/qmldesigner-states-when-condition.png
Binary files differ
diff --git a/doc/qtcreator/images/qmldesigner-states.png b/doc/qtcreator/images/qmldesigner-states.png
index 0b2510e6dc..4f1193bfba 100644
--- a/doc/qtcreator/images/qmldesigner-states.png
+++ b/doc/qtcreator/images/qmldesigner-states.png
Binary files differ
diff --git a/doc/qtcreator/images/qmldesigner-transitions.png b/doc/qtcreator/images/qmldesigner-transitions.png
index 8d7309ddc8..8791133a87 100644
--- a/doc/qtcreator/images/qmldesigner-transitions.png
+++ b/doc/qtcreator/images/qmldesigner-transitions.png
Binary files differ