diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-05-14 21:08:56 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-05-14 21:08:56 +0200 |
| commit | d3631c6d5b3f76bc9879af9ec4b283c7e105f3b1 (patch) | |
| tree | 6e0f8d46458a616fa9ccbaa6af41e90888280a61 /src | |
| parent | 03f115744229f841d42c37b1a699e9b8da7873fc (diff) | |
| parent | a0918d137c318d8c9cad6f7db1ffca1f18c305c6 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I56bea58318d2cbedbb90630621b1ac523abfff4f
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/doc/qtlottieanimation.qdocconf | 1 | ||||
| -rw-r--r-- | src/imports/doc/src/qtlottie.qdoc | 3 |
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] |