summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2019-10-25 15:09:27 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2019-10-28 07:53:57 +0000
commitfea693d9f9434c6396373fa9d97ac92893ad08c5 (patch)
treee7504964e45de0170f1b62a6087a352a02850b79 /doc
parent51991e3a3ee855f12cae999b01a93741c77cf6cd (diff)
downloadqt-creator-fea693d9f9434c6396373fa9d97ac92893ad08c5.tar.gz
Doc: Update info about enabling the Timeline view in Qt Creator
Qt Quick Timeline module is delivered with Qt 5.14 and later. Change-Id: I5666fa0fd190607a1bb6224dcff5ac7f39db61f7 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'doc')
-rw-r--r--doc/config/qtcreator-project.qdocconf1
-rw-r--r--doc/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc12
-rw-r--r--doc/src/qtquick/qtquick-timeline.qdoc12
3 files changed, 12 insertions, 13 deletions
diff --git a/doc/config/qtcreator-project.qdocconf b/doc/config/qtcreator-project.qdocconf
index ba394e3b27..82daf9faad 100644
--- a/doc/config/qtcreator-project.qdocconf
+++ b/doc/config/qtcreator-project.qdocconf
@@ -42,6 +42,7 @@ depends += qtwidgets \
qthelp \
qtquickcontrols \
qtquickextras \
+ qtquicktimeline \
qtlinguist \
qtscxml \
qtsensors \
diff --git a/doc/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc b/doc/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc
index 9e1fe9919e..ff8d929f9e 100644
--- a/doc/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc
+++ b/doc/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc
@@ -64,10 +64,10 @@
Then you can use the \l QQuickView class in the main C++ source file to
show the main QML file when the application starts.
- At the time of this writing, the Qt Quick Timeline module is delivered with
- \QDS, but not with Qt. If you use a timeline in a \QDS project that you
- import to \QC, you must build the Qt Quick Timeline module and install it to
- your Qt to be able to build your project.
+ The \l{Qt Quick Timeline} module is delivered with \QDS and with Qt 5.14,
+ and later. If you use a timeline in a \QDS project that you import to \QC,
+ and your Qt is older than 5.14, you must build the Qt Quick Timeline module
+ and install it to your Qt to be able to build your project.
\section1 Converting Projects
@@ -116,7 +116,9 @@
\section1 Adding Qt Quick Timeline Module to Qt Installations
- Check out the Qt Quick Timeline module from
+ \note You only need to do this if your Qt version is older than 5.14.
+
+ Check out the \l{Qt Quick Timeline} module from
\l{https://codereview.qt-project.org/#/admin/projects/qt/qtquicktimeline}
{Qt Code Review}.
diff --git a/doc/src/qtquick/qtquick-timeline.qdoc b/doc/src/qtquick/qtquick-timeline.qdoc
index de012b94e5..b3b40a8167 100644
--- a/doc/src/qtquick/qtquick-timeline.qdoc
+++ b/doc/src/qtquick/qtquick-timeline.qdoc
@@ -59,14 +59,10 @@
\uicontrol {Qt Quick Designer} > \uicontrol {Enable Timeline editor}. You
need to restart \QC for the \uicontrol Timeline view to appear.
- To be able to create timelines, you also need the Qt Quick Timeline module.
- At the time of this writing, the module is not available as a library in
- the Qt installer, and therefore you must check out the repository and build
- the module yourself using the same Qt version that you used to build \QC.
-
- You can check out the module from
- \l{https://codereview.qt-project.org/#/admin/projects/qt/qtquicktimeline}
- {Qt Code Review Tool}.
+ To be able to create timelines, you also need the \l {Qt Quick Timeline}
+ module, which is delivered with Qt 5.14, and later. For more
+ information about adding the module to an older Qt version, see
+ \l{Adding Qt Quick Timeline Module to Qt Installations}.
\endif
\section1 Creating Timelines