summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJohanna Vanhatapio <johanna.vanhatapio@qt.io>2021-04-14 18:08:43 +0300
committerJohanna Vanhatapio <johanna.vanhatapio@qt.io>2021-04-16 11:42:33 +0000
commit381bb68265201b30535bfc1cfd9e44cb70dffcc3 (patch)
tree883d53ca4849e9f3fb892f22cc8cbd8fb9500d4e /doc
parent67e264b6191168b51995934b5a99c9cce0752541 (diff)
downloadqt-creator-381bb68265201b30535bfc1cfd9e44cb70dffcc3.tar.gz
Doc: Update info about Shapes
- Updated mainly pictures due to changes in the Properties view Task-number: QDS-4167 Change-Id: I0ce5f83dc5d353eb7061761505454677d79aeb3b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'doc')
-rw-r--r--doc/qtcreator/images/qml-shapes-rectangle.pngbin48557 -> 45868 bytes
-rw-r--r--doc/qtcreator/src/qtquick/library/qtquick-shapes.qdoc4
-rw-r--r--doc/qtdesignstudio/images/studio-shapes-arc-outline-properties.pngbin0 -> 5177 bytes
-rw-r--r--doc/qtdesignstudio/images/studio-shapes-arc.pngbin47944 -> 13403 bytes
-rw-r--r--doc/qtdesignstudio/images/studio-shapes-border.pngbin49441 -> 17326 bytes
-rw-r--r--doc/qtdesignstudio/images/studio-shapes-pie.pngbin33637 -> 13714 bytes
-rw-r--r--doc/qtdesignstudio/images/studio-shapes-rectangle.pngbin55370 -> 20030 bytes
-rw-r--r--doc/qtdesignstudio/images/studio-shapes-stroke-properties.pngbin15701 -> 6378 bytes
-rw-r--r--doc/qtdesignstudio/images/studio-shapes-triangle.pngbin28317 -> 11656 bytes
-rw-r--r--doc/qtdesignstudio/images/studio-shapes.pngbin15267 -> 15345 bytes
10 files changed, 3 insertions, 1 deletions
diff --git a/doc/qtcreator/images/qml-shapes-rectangle.png b/doc/qtcreator/images/qml-shapes-rectangle.png
index c1c387023d..b9f4350762 100644
--- a/doc/qtcreator/images/qml-shapes-rectangle.png
+++ b/doc/qtcreator/images/qml-shapes-rectangle.png
Binary files differ
diff --git a/doc/qtcreator/src/qtquick/library/qtquick-shapes.qdoc b/doc/qtcreator/src/qtquick/library/qtquick-shapes.qdoc
index 59b45078f1..09d97453eb 100644
--- a/doc/qtcreator/src/qtquick/library/qtquick-shapes.qdoc
+++ b/doc/qtcreator/src/qtquick/library/qtquick-shapes.qdoc
@@ -36,7 +36,7 @@
according to your needs. The values of some properties of the controls are
specified by using styling, and therefore you cannot change them.
- However, you can use some of the components in \uicontrol Library to draw
+ However, you can use some of the components in \l Library to draw
basic shapes, such as rectangles. In addition, \QDS comes with a set of
more powerful and flexible graphical primitives, that allow creating more
complex shapes, such as borders, triangles, arcs, and pies in
@@ -193,6 +193,8 @@
The area between the arc's start and end points or the area inside the
outline are painted using either a solid fill color or a gradient.
+ \image studio-shapes-arc-outline-properties.png "Arc Outline Properties"
+
To create an arc with an outline, select the \uicontrol {Full outline}
check box. The \uicontrol {Arc outline width} field sets the width of
the arc outline, including the stroke. The \uicontrol {Arc outline begin}
diff --git a/doc/qtdesignstudio/images/studio-shapes-arc-outline-properties.png b/doc/qtdesignstudio/images/studio-shapes-arc-outline-properties.png
new file mode 100644
index 0000000000..38d9597458
--- /dev/null
+++ b/doc/qtdesignstudio/images/studio-shapes-arc-outline-properties.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/studio-shapes-arc.png b/doc/qtdesignstudio/images/studio-shapes-arc.png
index cb271774c3..9db6c19d36 100644
--- a/doc/qtdesignstudio/images/studio-shapes-arc.png
+++ b/doc/qtdesignstudio/images/studio-shapes-arc.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/studio-shapes-border.png b/doc/qtdesignstudio/images/studio-shapes-border.png
index 4693b78b00..f9a7f95908 100644
--- a/doc/qtdesignstudio/images/studio-shapes-border.png
+++ b/doc/qtdesignstudio/images/studio-shapes-border.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/studio-shapes-pie.png b/doc/qtdesignstudio/images/studio-shapes-pie.png
index 855b6bd5db..978fe009f8 100644
--- a/doc/qtdesignstudio/images/studio-shapes-pie.png
+++ b/doc/qtdesignstudio/images/studio-shapes-pie.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/studio-shapes-rectangle.png b/doc/qtdesignstudio/images/studio-shapes-rectangle.png
index 8dd817f532..45894afa44 100644
--- a/doc/qtdesignstudio/images/studio-shapes-rectangle.png
+++ b/doc/qtdesignstudio/images/studio-shapes-rectangle.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/studio-shapes-stroke-properties.png b/doc/qtdesignstudio/images/studio-shapes-stroke-properties.png
index 26652273ba..eefb7dbade 100644
--- a/doc/qtdesignstudio/images/studio-shapes-stroke-properties.png
+++ b/doc/qtdesignstudio/images/studio-shapes-stroke-properties.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/studio-shapes-triangle.png b/doc/qtdesignstudio/images/studio-shapes-triangle.png
index e52585f464..29df685a62 100644
--- a/doc/qtdesignstudio/images/studio-shapes-triangle.png
+++ b/doc/qtdesignstudio/images/studio-shapes-triangle.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/studio-shapes.png b/doc/qtdesignstudio/images/studio-shapes.png
index 444f692bc2..9ac71d7669 100644
--- a/doc/qtdesignstudio/images/studio-shapes.png
+++ b/doc/qtdesignstudio/images/studio-shapes.png
Binary files differ