summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-05-14 14:08:37 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-05-14 14:08:37 +0200
commita0918d137c318d8c9cad6f7db1ffca1f18c305c6 (patch)
treea64580af3297beaca2846f49b5533fbb43773ba3
parentf5cc3184f30c9fa1b81d931430aaa4f6f23267a3 (diff)
parenteeac38075b17ae74821e9976d3dd37346a4f822c (diff)
Merge remote-tracking branch 'origin/5.15.0' into 5.15
-rw-r--r--src/imports/doc/qtlottieanimation.qdocconf1
-rw-r--r--src/imports/doc/src/qtlottie.qdoc3
2 files changed, 0 insertions, 4 deletions
diff --git a/src/imports/doc/qtlottieanimation.qdocconf b/src/imports/doc/qtlottieanimation.qdocconf
index 138363d..9ae0274 100644
--- a/src/imports/doc/qtlottieanimation.qdocconf
+++ b/src/imports/doc/qtlottieanimation.qdocconf
@@ -36,5 +36,4 @@ tagfile = qtlottieanimation.tags
examplesinstallpath = lottieanimation
navigation.landingpage = Qt Lottie Animation
-navigation.landingtitle = Qt Lottie Animation (Technology Preview)
navigation.qmltypespage = Qt Lottie Animation QML Types
diff --git a/src/imports/doc/src/qtlottie.qdoc b/src/imports/doc/src/qtlottie.qdoc
index 08fb0d8..9079b7b 100644
--- a/src/imports/doc/src/qtlottie.qdoc
+++ b/src/imports/doc/src/qtlottie.qdoc
@@ -35,9 +35,6 @@
animations that are exported in JSON format by the \l Bodymovin plugin
for Adobe After Effects.
- \note This module is still in development and is provided as a technology
- preview.
-
\section1 Getting Started
//! [usage]