aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2020-12-07 14:56:00 +0100
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2020-12-07 15:49:04 +0000
commitca263cd44aa9c1d26392c9ecab8ea9abb98a6a32 (patch)
tree8892771315d3033fa1184eca9ca7b35d24b95a2c /doc
parent8e0cb785dcf84a9c79a4a3c50e97c1f21bf6bf6f (diff)
Doc: Add links to videos
Task-number: QDS-2744 Change-Id: I1ffa0cd1cd4999c372c68ec180bcf89f31db7293 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'doc')
-rw-r--r--doc/qtcreator/images/extraimages/images/DVWd_xMMgvg.jpgbin0 -> 6927 bytes
-rw-r--r--doc/qtcreator/images/extraimages/images/Ed8WS03C-Vk.jpgbin0 -> 5740 bytes
-rw-r--r--doc/qtcreator/images/extraimages/images/FzmLuRHQXaw.jpgbin0 -> 5543 bytes
-rw-r--r--doc/qtcreator/images/extraimages/images/UfvA04CIXv0.jpgbin0 -> 10685 bytes
-rw-r--r--doc/qtcreator/images/extraimages/images/w1yhDl93YI0.jpgbin0 -> 11884 bytes
-rw-r--r--doc/qtcreator/images/extraimages/qtcreator-extraimages.qdocconf6
-rw-r--r--doc/qtcreator/images/extraimages/qtdesignstudio-extraimages.qdocconf7
-rw-r--r--doc/qtcreator/src/qtquick/library/qtquick-controls.qdoc4
-rw-r--r--doc/qtcreator/src/qtquick/library/qtquick-images.qdoc4
-rw-r--r--doc/qtcreator/src/qtquick/library/qtquick-text.qdoc6
-rw-r--r--doc/qtcreator/src/qtquick/qtquick-connection-editor-bindings.qdoc4
-rw-r--r--doc/qtcreator/src/qtquick/qtquick-states.qdoc4
-rw-r--r--doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-maya.qdoc4
-rw-r--r--doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-design-mode.qdoc6
14 files changed, 39 insertions, 6 deletions
diff --git a/doc/qtcreator/images/extraimages/images/DVWd_xMMgvg.jpg b/doc/qtcreator/images/extraimages/images/DVWd_xMMgvg.jpg
new file mode 100644
index 0000000000..995bbc9583
--- /dev/null
+++ b/doc/qtcreator/images/extraimages/images/DVWd_xMMgvg.jpg
Binary files differ
diff --git a/doc/qtcreator/images/extraimages/images/Ed8WS03C-Vk.jpg b/doc/qtcreator/images/extraimages/images/Ed8WS03C-Vk.jpg
new file mode 100644
index 0000000000..ac26338357
--- /dev/null
+++ b/doc/qtcreator/images/extraimages/images/Ed8WS03C-Vk.jpg
Binary files differ
diff --git a/doc/qtcreator/images/extraimages/images/FzmLuRHQXaw.jpg b/doc/qtcreator/images/extraimages/images/FzmLuRHQXaw.jpg
new file mode 100644
index 0000000000..7069885d27
--- /dev/null
+++ b/doc/qtcreator/images/extraimages/images/FzmLuRHQXaw.jpg
Binary files differ
diff --git a/doc/qtcreator/images/extraimages/images/UfvA04CIXv0.jpg b/doc/qtcreator/images/extraimages/images/UfvA04CIXv0.jpg
new file mode 100644
index 0000000000..5e2a3d8d1b
--- /dev/null
+++ b/doc/qtcreator/images/extraimages/images/UfvA04CIXv0.jpg
Binary files differ
diff --git a/doc/qtcreator/images/extraimages/images/w1yhDl93YI0.jpg b/doc/qtcreator/images/extraimages/images/w1yhDl93YI0.jpg
new file mode 100644
index 0000000000..2ebe585993
--- /dev/null
+++ b/doc/qtcreator/images/extraimages/images/w1yhDl93YI0.jpg
Binary files differ
diff --git a/doc/qtcreator/images/extraimages/qtcreator-extraimages.qdocconf b/doc/qtcreator/images/extraimages/qtcreator-extraimages.qdocconf
index 9168808117..de0575d6c5 100644
--- a/doc/qtcreator/images/extraimages/qtcreator-extraimages.qdocconf
+++ b/doc/qtcreator/images/extraimages/qtcreator-extraimages.qdocconf
@@ -1,4 +1,8 @@
{HTML.extraimages,qhp.QtCreator.extraFiles} += \
images/commercial.png \
images/RfEYO-5Mw6s.jpg \
- images/yOUdg1o2KJM.jpg
+ images/yOUdg1o2KJM.jpg \
+ images/DVWd_xMMgvg.jpg \
+ images/Ed8WS03C-Vk.jpg \
+ images/UfvA04CIXv0.jpg \
+ images/FzmLuRHQXaw.jpg
diff --git a/doc/qtcreator/images/extraimages/qtdesignstudio-extraimages.qdocconf b/doc/qtcreator/images/extraimages/qtdesignstudio-extraimages.qdocconf
index 6578308433..d2c8ed76e7 100644
--- a/doc/qtcreator/images/extraimages/qtdesignstudio-extraimages.qdocconf
+++ b/doc/qtcreator/images/extraimages/qtdesignstudio-extraimages.qdocconf
@@ -5,4 +5,9 @@
images/aV6kFxH3Xws.jpg \
images/ZzbucmQPU44.jpg \
images/RfEYO-5Mw6s.jpg \
- images/yOUdg1o2KJM.jpg
+ images/yOUdg1o2KJM.jpg \
+ images/DVWd_xMMgvg.jpg \
+ images/Ed8WS03C-Vk.jpg \
+ images/UfvA04CIXv0.jpg \
+ images/FzmLuRHQXaw.jpg \
+ images/w1yhDl93YI0.jpg
diff --git a/doc/qtcreator/src/qtquick/library/qtquick-controls.qdoc b/doc/qtcreator/src/qtquick/library/qtquick-controls.qdoc
index d58de2cb6d..2e61f1161a 100644
--- a/doc/qtcreator/src/qtquick/library/qtquick-controls.qdoc
+++ b/doc/qtcreator/src/qtquick/library/qtquick-controls.qdoc
@@ -553,6 +553,10 @@
You can set slider orientation to horizontal or vertical in the
\uicontrol Orientation field.
+ For more information, watch the following video:
+
+ \youtube Ed8WS03C-Vk
+
A dial supports circular, horizontal, and vertical input modes. For
applications where fast input is important, the circular input mode is
useful, as clicking the dial will move it directly to that position.
diff --git a/doc/qtcreator/src/qtquick/library/qtquick-images.qdoc b/doc/qtcreator/src/qtquick/library/qtquick-images.qdoc
index cb589bf106..500763bc22 100644
--- a/doc/qtcreator/src/qtquick/library/qtquick-images.qdoc
+++ b/doc/qtcreator/src/qtquick/library/qtquick-images.qdoc
@@ -192,6 +192,10 @@
If the image data comes from a sequential device (such as a socket),
Animated Image can only loop if caching is enabled.
+ For more information, watch the following video:
+
+ \youtube DVWd_xMMgvg
+
\section1 Summary of Images
The following table lists the QML types that you can use to add images.
diff --git a/doc/qtcreator/src/qtquick/library/qtquick-text.qdoc b/doc/qtcreator/src/qtquick/library/qtquick-text.qdoc
index 4c7ca9492e..fb7e0726fe 100644
--- a/doc/qtcreator/src/qtquick/library/qtquick-text.qdoc
+++ b/doc/qtcreator/src/qtquick/library/qtquick-text.qdoc
@@ -40,9 +40,9 @@
text string, such as size in points or pixels, style name, emphasis,
alignment, and spacing.
- For an example of editing the Text type, watch
- \l{https://www.youtube.com/watch?v=yOUdg1o2KJM}
- {Qt Design Studio QuickTip: Text Element}.
+ For more information, watch the following video:
+
+ \youtube yOUdg1o2KJM
To create a label with a background, use the \l Label type from the
Qt Quick Controls module.
diff --git a/doc/qtcreator/src/qtquick/qtquick-connection-editor-bindings.qdoc b/doc/qtcreator/src/qtquick/qtquick-connection-editor-bindings.qdoc
index b0d2751b08..6a6012dcbd 100644
--- a/doc/qtcreator/src/qtquick/qtquick-connection-editor-bindings.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-connection-editor-bindings.qdoc
@@ -72,6 +72,10 @@
\image qmldesigner-binding-editor.png "Binding Editor"
+ For more information, watch the following video:
+
+ \youtube UfvA04CIXv0
+
\include creator-logical-operators.qdocinc logical operators
*/
diff --git a/doc/qtcreator/src/qtquick/qtquick-states.qdoc b/doc/qtcreator/src/qtquick/qtquick-states.qdoc
index 5e17e6f708..40b23d2e06 100644
--- a/doc/qtcreator/src/qtquick/qtquick-states.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-states.qdoc
@@ -87,6 +87,10 @@
and you attempt to remove states where you change the values of its
properties, you are prompted to confirm the removal.
+ For more information, watch the following video:
+
+ \youtube FzmLuRHQXaw
+
\section1 Setting the Default State
To determine the startup state of the application,
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-maya.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-maya.qdoc
index bd77144a6a..c6f8286649 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-maya.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-maya.qdoc
@@ -94,4 +94,8 @@
the same location as the FBX file.
\li Select \uicontrol {Export All} to export files.
\endlist
+
+ For more information, watch the following video:
+
+ \youtube w1yhDl93YI0
*/
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-design-mode.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-design-mode.qdoc
index 5410b59ec1..3890327894 100644
--- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-design-mode.qdoc
+++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-design-mode.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2019 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Design Studio documentation.
@@ -76,6 +76,10 @@
For more information, see \l {Creating Animations}.
\endlist
+ For more information, watch the following video:
+
+ \youtube w1yhDl93YI0
+
For more information on other views, see
\l {Editing QML Files in Design Mode}.
*/