summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Kangas <janne.kangas@qt.io>2020-02-05 08:42:13 +0200
committerJanne Kangas <janne.kangas@qt.io>2020-02-06 07:18:48 +0200
commitcf47221dbd7ea2d0c3aeae3a3e5c8ea51ee9cfb6 (patch)
tree3476f1b1176d9f9b8d30e850dd6ddb6ffe24261d
parent025160c7320bac02ee6f2e0120a9691d5835bd3f (diff)
Update and fix documentation
Task-id: QT3DS-4050 Change-Id: I1261e963ead07849429a3fa1f3b46cc73c039bd3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
-rw-r--r--doc/qt3dstudio-project.qdocconf10
-rw-r--r--doc/src/07-file-formats/0-uia.qdoc2
-rw-r--r--doc/src/glossary.qdoc2
3 files changed, 8 insertions, 6 deletions
diff --git a/doc/qt3dstudio-project.qdocconf b/doc/qt3dstudio-project.qdocconf
index 0f32aae9..d0c896e9 100644
--- a/doc/qt3dstudio-project.qdocconf
+++ b/doc/qt3dstudio-project.qdocconf
@@ -5,15 +5,17 @@ url = https://doc.qt.io/qt3dstudio
moduleheader =
sources.fileextensions = "*.qdoc *.html"
-sourcedirs = . \
- ../src/Viewer
+sourcedirs = src/ \
+ ../src/Runtime/ogl-runtime/src/viewer
-headerdirs = ../src/Viewer
+headerdirs = src/ \
+ ../src/Runtime/ogl-runtime/src/viewer
# TODO: Move images to doc/images
imagedirs = ./src/images
-depends = qtcore qtgui qtwidgets qtqml qtquick qtmultimedia qtdoc qt3dstudioruntime2
+depends = qtcore qtgui qtwidgets qtqml qtquick qtmultimedia qtdoc
+
qhp.projects = Qt3DStudio
diff --git a/doc/src/07-file-formats/0-uia.qdoc b/doc/src/07-file-formats/0-uia.qdoc
index 47d90531..103971d7 100644
--- a/doc/src/07-file-formats/0-uia.qdoc
+++ b/doc/src/07-file-formats/0-uia.qdoc
@@ -298,7 +298,7 @@ following (as many as you like, in any order):
id-prefixed path to any element in a presentation.
\li
The \b{\c{attribute}} attribute must match the
- \l{Attribute Names}{scripting name} of an attribute on that element.
+ scripting name of an attribute on that element.
\li
The \b{\c{value}} attribute must provide a Lua expression to
evaluate, the result of which will be set as the value on the element.
diff --git a/doc/src/glossary.qdoc b/doc/src/glossary.qdoc
index 950b64be..c7679425 100644
--- a/doc/src/glossary.qdoc
+++ b/doc/src/glossary.qdoc
@@ -137,7 +137,7 @@ This page provides short explanations of terms used in Qt 3D Studio.
The inspector palette is used to control values and animations of element properties.
\row
\li
- \l{Animations#Interpolation}{Interpolation}
+ \l{Animations#Animation Types}{Interpolation}
\li
Interpolation defines the easing of \l keyframe animations.
\row