From 11194e8c38f5a8eef11f9d9e9b72508d8923722d Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Thu, 7 Feb 2019 14:46:05 +0200 Subject: Add missing .gitignore file in qtlottie root And remove unnecessary ones from subfolders Task-number: QTBUG-73454 Change-Id: I6ffe30fdb8648bf5c98d97f9a4f81bdb45c946ed Reviewed-by: Eirik Aavitsland Reviewed-by: Rebecca Worledge --- .gitattributes | 1 + .gitignore | 73 ++++++++++++++++++++++++++++++ tests/auto/bodymovin/shape/fill/.gitignore | 73 ------------------------------ tests/manual/featcheck/.gitignore | 73 ------------------------------ tests/manual/testApp/.gitignore | 73 ------------------------------ 5 files changed, 74 insertions(+), 219 deletions(-) create mode 100644 .gitignore delete mode 100644 tests/auto/bodymovin/shape/fill/.gitignore delete mode 100644 tests/manual/featcheck/.gitignore delete mode 100644 tests/manual/testApp/.gitignore diff --git a/.gitattributes b/.gitattributes index 0909f7a..6b2abde 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ .tag export-subst .gitattributes export-ignore +.gitignore export-ignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fab7372 --- /dev/null +++ b/.gitignore @@ -0,0 +1,73 @@ +# This file is used to ignore files which are generated +# ---------------------------------------------------------------------------- + +*~ +*.autosave +*.a +*.core +*.moc +*.o +*.obj +*.orig +*.rej +*.so +*.so.* +*_pch.h.cpp +*_resource.rc +*.qm +.#* +*.*# +core +!core/ +tags +.DS_Store +.directory +*.debug +Makefile* +*.prl +*.app +moc_*.cpp +ui_*.h +qrc_*.cpp +Thumbs.db +*.res +*.rc +/.qmake.cache +/.qmake.stash + +# qtcreator generated files +*.pro.user* + +# xemacs temporary files +*.flc + +# Vim temporary files +.*.swp + +# Visual Studio generated files +*.ib_pdb_index +*.idb +*.ilk +*.pdb +*.sln +*.suo +*.vcproj +*vcproj.*.*.user +*.ncb +*.sdf +*.opensdf +*.vcxproj +*vcxproj.* + +# MinGW generated files +*.Debug +*.Release + +# Python byte code +*.pyc + +# Binaries +# -------- +*.dll +*.exe + diff --git a/tests/auto/bodymovin/shape/fill/.gitignore b/tests/auto/bodymovin/shape/fill/.gitignore deleted file mode 100644 index fab7372..0000000 --- a/tests/auto/bodymovin/shape/fill/.gitignore +++ /dev/null @@ -1,73 +0,0 @@ -# This file is used to ignore files which are generated -# ---------------------------------------------------------------------------- - -*~ -*.autosave -*.a -*.core -*.moc -*.o -*.obj -*.orig -*.rej -*.so -*.so.* -*_pch.h.cpp -*_resource.rc -*.qm -.#* -*.*# -core -!core/ -tags -.DS_Store -.directory -*.debug -Makefile* -*.prl -*.app -moc_*.cpp -ui_*.h -qrc_*.cpp -Thumbs.db -*.res -*.rc -/.qmake.cache -/.qmake.stash - -# qtcreator generated files -*.pro.user* - -# xemacs temporary files -*.flc - -# Vim temporary files -.*.swp - -# Visual Studio generated files -*.ib_pdb_index -*.idb -*.ilk -*.pdb -*.sln -*.suo -*.vcproj -*vcproj.*.*.user -*.ncb -*.sdf -*.opensdf -*.vcxproj -*vcxproj.* - -# MinGW generated files -*.Debug -*.Release - -# Python byte code -*.pyc - -# Binaries -# -------- -*.dll -*.exe - diff --git a/tests/manual/featcheck/.gitignore b/tests/manual/featcheck/.gitignore deleted file mode 100644 index fab7372..0000000 --- a/tests/manual/featcheck/.gitignore +++ /dev/null @@ -1,73 +0,0 @@ -# This file is used to ignore files which are generated -# ---------------------------------------------------------------------------- - -*~ -*.autosave -*.a -*.core -*.moc -*.o -*.obj -*.orig -*.rej -*.so -*.so.* -*_pch.h.cpp -*_resource.rc -*.qm -.#* -*.*# -core -!core/ -tags -.DS_Store -.directory -*.debug -Makefile* -*.prl -*.app -moc_*.cpp -ui_*.h -qrc_*.cpp -Thumbs.db -*.res -*.rc -/.qmake.cache -/.qmake.stash - -# qtcreator generated files -*.pro.user* - -# xemacs temporary files -*.flc - -# Vim temporary files -.*.swp - -# Visual Studio generated files -*.ib_pdb_index -*.idb -*.ilk -*.pdb -*.sln -*.suo -*.vcproj -*vcproj.*.*.user -*.ncb -*.sdf -*.opensdf -*.vcxproj -*vcxproj.* - -# MinGW generated files -*.Debug -*.Release - -# Python byte code -*.pyc - -# Binaries -# -------- -*.dll -*.exe - diff --git a/tests/manual/testApp/.gitignore b/tests/manual/testApp/.gitignore deleted file mode 100644 index fab7372..0000000 --- a/tests/manual/testApp/.gitignore +++ /dev/null @@ -1,73 +0,0 @@ -# This file is used to ignore files which are generated -# ---------------------------------------------------------------------------- - -*~ -*.autosave -*.a -*.core -*.moc -*.o -*.obj -*.orig -*.rej -*.so -*.so.* -*_pch.h.cpp -*_resource.rc -*.qm -.#* -*.*# -core -!core/ -tags -.DS_Store -.directory -*.debug -Makefile* -*.prl -*.app -moc_*.cpp -ui_*.h -qrc_*.cpp -Thumbs.db -*.res -*.rc -/.qmake.cache -/.qmake.stash - -# qtcreator generated files -*.pro.user* - -# xemacs temporary files -*.flc - -# Vim temporary files -.*.swp - -# Visual Studio generated files -*.ib_pdb_index -*.idb -*.ilk -*.pdb -*.sln -*.suo -*.vcproj -*vcproj.*.*.user -*.ncb -*.sdf -*.opensdf -*.vcxproj -*vcxproj.* - -# MinGW generated files -*.Debug -*.Release - -# Python byte code -*.pyc - -# Binaries -# -------- -*.dll -*.exe - -- cgit v1.2.3 From 0aeea1fa9eaad559dc075142b9304cb0dd22adaa Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 6 Mar 2019 17:55:18 +0100 Subject: testApp/main.qml: Don't use absolute paths in urls With relative paths, the test can also be run in qmlscene. Change-Id: Id735a74ba7c647a37dfe87873a120d55b23e4be4 Reviewed-by: Rebecca Worledge --- tests/manual/testApp/main.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/manual/testApp/main.qml b/tests/manual/testApp/main.qml index fdc1878..56d6f89 100644 --- a/tests/manual/testApp/main.qml +++ b/tests/manual/testApp/main.qml @@ -56,7 +56,7 @@ Window { y: 10 * index loops: LottieAnimation.Infinite quality: LottieAnimation.MediumQuality - source: ":/rect_rotate.json" + source: "rect_rotate.json" } } } -- cgit v1.2.3 From 553ec1bc799f344a12e34c91720e13a469d85365 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Sun, 24 Feb 2019 11:02:41 +0100 Subject: Update plugins.qmltypes for Qt 5.13 Task-number: 73739 Change-Id: I7a4cd45372b9ba6bb58e36dab2c80f6729c7a14c Reviewed-by: Rebecca Worledge --- src/imports/imports.pro | 2 +- src/imports/plugins.qmltypes | 101 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 src/imports/plugins.qmltypes diff --git a/src/imports/imports.pro b/src/imports/imports.pro index 61a840e..72ad546 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -1,7 +1,7 @@ CXX_MODULE = qtlottie TARGET = lottieqt TARGETPATH = Qt/labs/lottieqt -IMPORT_VERSION = 1.$$QT_MINOR_VERSION +IMPORT_VERSION = 1.0 QT += qml quick gui-private bodymovin-private CONFIG += plugin c++11 diff --git a/src/imports/plugins.qmltypes b/src/imports/plugins.qmltypes new file mode 100644 index 0000000..d76b82d --- /dev/null +++ b/src/imports/plugins.qmltypes @@ -0,0 +1,101 @@ +import QtQuick.tooling 1.2 + +// This file describes the plugin-supplied types contained in the library. +// It is used for QML tooling purposes only. +// +// This file was auto-generated by: +// 'qmlplugindump -nonrelocatable Qt.labs.lottieqt 1.0' + +Module { + dependencies: ["QtQuick 2.0"] + Component { + name: "BMLiteral" + prototype: "QObject" + exports: ["Qt.labs.lottieqt/BMPropertyType 1.0"] + exportMetaObjectRevisions: [0] + Enum { + name: "PropertyType" + values: { + "RectPosition": 0, + "RectSize": 1, + "RectRoundness": 2 + } + } + } + Component { + name: "LottieAnimation" + defaultProperty: "data" + prototype: "QQuickPaintedItem" + exports: ["Qt.labs.lottieqt/LottieAnimation 1.0"] + exportMetaObjectRevisions: [0] + Enum { + name: "Status" + values: { + "Null": 0, + "Loading": 1, + "Ready": 2, + "Error": 3 + } + } + Enum { + name: "Quality" + values: { + "LowQuality": 0, + "MediumQuality": 1, + "HighQuality": 2 + } + } + Enum { + name: "Direction" + values: { + "Forward": 1, + "Reverse": 2 + } + } + Enum { + name: "LoopCount" + values: { + "Infinite": -1 + } + } + Property { name: "source"; type: "string" } + Property { name: "frameRate"; type: "int" } + Property { name: "startFrame"; type: "int"; isReadonly: true } + Property { name: "endFrame"; type: "int"; isReadonly: true } + Property { name: "status"; type: "Status" } + Property { name: "quality"; type: "Quality" } + Property { name: "autoPlay"; type: "bool" } + Property { name: "loops"; type: "int" } + Property { name: "direction"; type: "Direction" } + Signal { name: "finished" } + Method { name: "start" } + Method { name: "play" } + Method { name: "pause" } + Method { name: "togglePause" } + Method { name: "stop" } + Method { + name: "gotoAndPlay" + Parameter { name: "frame"; type: "int" } + } + Method { + name: "gotoAndPlay" + type: "bool" + Parameter { name: "frameMarker"; type: "string" } + } + Method { + name: "gotoAndStop" + Parameter { name: "frame"; type: "int" } + } + Method { + name: "gotoAndStop" + type: "bool" + Parameter { name: "frameMarker"; type: "string" } + } + Method { + name: "getDuration" + type: "double" + Parameter { name: "inFrames"; type: "bool" } + } + Method { name: "getDuration"; type: "double" } + } +} -- cgit v1.2.3 From 6d8f11a0ec0cc49fed98524259ee37fbe13e9525 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 1 Jul 2019 15:56:45 +0200 Subject: Bump version Change-Id: I71b261865189e95c1191e0706d9f73947019c9e6 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 7b49e2c..16ea641 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += warning_clean -MODULE_VERSION = 5.13.0 +MODULE_VERSION = 5.13.1 -- cgit v1.2.3 From 7945a576f937fab8bfb25343e39bd26dc3e00057 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Sat, 6 Jul 2019 20:58:31 +0200 Subject: Fix compilation with C++20 Implicit capture of 'this' in [=] is deprecated in C++20. Fix by using explicit captures. Change-Id: I7684c012e74b26b7ec30cfe19f3187f2d76197f3 Reviewed-by: Rebecca Worledge --- src/imports/lottieanimation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/imports/lottieanimation.cpp b/src/imports/lottieanimation.cpp index 6d5fffa..5a489f3 100644 --- a/src/imports/lottieanimation.cpp +++ b/src/imports/lottieanimation.cpp @@ -613,7 +613,7 @@ void LottieAnimation::renderNextFrame() qCDebug(lcLottieQtBodymovinRender) << static_cast(this) << "Frame cache was empty for frame" << m_currentFrame; m_waitForFrameConn = connect(m_frameRenderThread, &BatchRenderer::frameReady, - this, [=](LottieAnimation *target, int frameNumber) { + this, [this](LottieAnimation *target, int frameNumber) { if (target != this) return; qCDebug(lcLottieQtBodymovinRender) << static_cast(this) -- cgit v1.2.3 From 1841aa0bc254a7a11df09d16efd9b1ccd41f20e4 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Wed, 3 Jul 2019 11:48:26 +0200 Subject: Doc: Replace example file lists with links to code.qt.io Task-number: QTBUG-74391 Change-Id: I812e99e207e7bf6b892fd87f5158931d92341a94 Reviewed-by: Paul Wicking --- src/imports/doc/qtlottieanimation.qdocconf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/imports/doc/qtlottieanimation.qdocconf b/src/imports/doc/qtlottieanimation.qdocconf index eb5ca6f..0c3b016 100644 --- a/src/imports/doc/qtlottieanimation.qdocconf +++ b/src/imports/doc/qtlottieanimation.qdocconf @@ -1,4 +1,6 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/config/exampleurl-qtlottie.qdocconf) + version = $QT_VERSION project = QtLottieAnimation description = Bodymovin Player for Qt -- cgit v1.2.3 From 4c3207a7385a3ba402884bb50136bbe7b70baa2e Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 17 Jul 2019 13:19:48 +0200 Subject: Prospective fix when using QtLottie in QML apps with cmake and static linkage We need to create the cmake integration files to enable static linking. We don't need to test application side direct linkage though, as the bodymoving module is private and has no header files (interface). Fixes: QTBUG-77130 (cherry picked from commit 03b666a967fb7501248e9f40a5b187ec3a16c453) Change-Id: Ie9e73a3b482daee278a906096fdd53dc5fc6e2ba Reviewed-by: Simon Hausmann --- src/bodymovin/bodymovin.pro | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bodymovin/bodymovin.pro b/src/bodymovin/bodymovin.pro index c50cad8..5661c4a 100644 --- a/src/bodymovin/bodymovin.pro +++ b/src/bodymovin/bodymovin.pro @@ -8,6 +8,8 @@ TARGET = QtBodymovin MODULE = bodymovin CONFIG += internal_module +# As long as this is an internal module, we do not need to have cmake linkage tests. +CMAKE_MODULE_TESTS = - QT += gui-private -- cgit v1.2.3 From 86c7306ebc0d011a096f0554e0c206fe17bb577c Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 6 Aug 2019 13:18:45 +0200 Subject: Fix the build with -no-gui MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-2576 Change-Id: Ib91456ab5512131cad504e710e493393844937e7 Reviewed-by: Tony Sarajärvi --- src/src.pro | 4 ++++ tests/tests.pro | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/src.pro b/src/src.pro index 9a828d3..29e81ac 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,4 +1,8 @@ TEMPLATE = subdirs + +!qtHaveModule(gui): \ + return() + CONFIG += ordered SUBDIRS += \ bodymovin \ diff --git a/tests/tests.pro b/tests/tests.pro index b71cdd5..d4c5a62 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -1,4 +1,8 @@ TEMPLATE = subdirs + +!qtHaveModule(bodymovin): \ + return() + SUBDIRS += \ auto \ manual -- cgit v1.2.3 From b6b7fa3596d1957237d327a37941c6eb3ff8d6b3 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 22 Aug 2019 17:02:15 +0200 Subject: Doc: Add Licenses section to overview Fixes: QTBUG-77756 Change-Id: I79021207c8485ae9ab578b24a46fbbd06738977b Reviewed-by: Rebecca Worledge --- src/imports/doc/qtlottieanimation.qdocconf | 1 + src/imports/doc/src/qtlottie.qdoc | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/src/imports/doc/qtlottieanimation.qdocconf b/src/imports/doc/qtlottieanimation.qdocconf index 0c3b016..138363d 100644 --- a/src/imports/doc/qtlottieanimation.qdocconf +++ b/src/imports/doc/qtlottieanimation.qdocconf @@ -4,6 +4,7 @@ include($QT_INSTALL_DOCS/config/exampleurl-qtlottie.qdocconf) version = $QT_VERSION project = QtLottieAnimation description = Bodymovin Player for Qt +buildversion = Qt Lottie Animation | Commercial or GPLv3 headerdirs += ../.. diff --git a/src/imports/doc/src/qtlottie.qdoc b/src/imports/doc/src/qtlottie.qdoc index c5bda6c..08fb0d8 100644 --- a/src/imports/doc/src/qtlottie.qdoc +++ b/src/imports/doc/src/qtlottie.qdoc @@ -51,6 +51,12 @@ See the \l {Bodymovin Source}{GitHub page for Bodymovin} for instructions on how to download and install the plugin for Adobe After Effects. + \section1 Licenses + + Qt Lottie Animation is available under commercial licenses from \l{The Qt Company}. + In addition, it is available under the \l{GNU General Public License, version 3}. + See \l{Qt Licensing} for further details. + \section1 Reference \list \li \l {Qt Lottie Animation QML Types}{QML Types} -- cgit v1.2.3