aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2019-07-29 09:49:02 +0200
committerEike Ziller <eike.ziller@qt.io>2019-07-29 09:49:02 +0200
commitc71258a0dfef0706dee502e87ae7b2704e037a02 (patch)
tree868cb360f901dac6780489c25003e703a2b34111 /doc
parent7c2eb93888535bc09768aeca2b35bb66f6f1f78a (diff)
parent355e4b2018a41d36ea9f161d5e7b6e0aa0f8f219 (diff)
Merge remote-tracking branch 'origin/4.10'
Diffstat (limited to 'doc')
-rw-r--r--doc/images/qmldesigner-element-properties.pngbin40565 -> 63003 bytes
-rw-r--r--doc/images/qmldesigner-properties-explicit-base.pngbin27512 -> 27423 bytes
-rw-r--r--doc/images/qmldesigner-properties-explicit-state1.pngbin41508 -> 41578 bytes
-rw-r--r--doc/images/qmldesigner-qml-components.pngbin10870 -> 38614 bytes
-rw-r--r--doc/images/qmldesigner-visual-editor.pngbin79614 -> 54779 bytes
-rw-r--r--doc/images/qtquick-designer-color-picker.pngbin17087 -> 16627 bytes
6 files changed, 0 insertions, 0 deletions
diff --git a/doc/images/qmldesigner-element-properties.png b/doc/images/qmldesigner-element-properties.png
index 66f0fa2dd2..6df75cc67a 100644
--- a/doc/images/qmldesigner-element-properties.png
+++ b/doc/images/qmldesigner-element-properties.png
Binary files differ
diff --git a/doc/images/qmldesigner-properties-explicit-base.png b/doc/images/qmldesigner-properties-explicit-base.png
index 9c4ce9eb62..9ac69d413e 100644
--- a/doc/images/qmldesigner-properties-explicit-base.png
+++ b/doc/images/qmldesigner-properties-explicit-base.png
Binary files differ
diff --git a/doc/images/qmldesigner-properties-explicit-state1.png b/doc/images/qmldesigner-properties-explicit-state1.png
index 0137b7fdf9..dc4d5ab689 100644
--- a/doc/images/qmldesigner-properties-explicit-state1.png
+++ b/doc/images/qmldesigner-properties-explicit-state1.png
Binary files differ
diff --git a/doc/images/qmldesigner-qml-components.png b/doc/images/qmldesigner-qml-components.png
index e4653da540..a2b090dd37 100644
--- a/doc/images/qmldesigner-qml-components.png
+++ b/doc/images/qmldesigner-qml-components.png
Binary files differ
diff --git a/doc/images/qmldesigner-visual-editor.png b/doc/images/qmldesigner-visual-editor.png
index f78480e0ac..92683ad024 100644
--- a/doc/images/qmldesigner-visual-editor.png
+++ b/doc/images/qmldesigner-visual-editor.png
Binary files differ
diff --git a/doc/images/qtquick-designer-color-picker.png b/doc/images/qtquick-designer-color-picker.png
index d1b3b292f0..541a8a9cac 100644
--- a/doc/images/qtquick-designer-color-picker.png
+++ b/doc/images/qtquick-designer-color-picker.png
Binary files differ