Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta2v5.14.0-beta1

 Conflicts:
	.qmake.conf

Change-Id: Ide3a207fa33936e215819eb49601e764115a17c4

11 files changed, 121 insertions, 148 deletions

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/tests/auto/bodymovin/shape/fill/.gitignore b/.gitignore
index fab7372..fab7372 100644
--- a/tests/auto/bodymovin/shape/fill/.gitignore
+++ b/.gitignore
diff --git a/src/imports/doc/qtlottieanimation.qdocconf b/src/imports/doc/qtlottieanimation.qdocconf
index eb5ca6f..138363d 100644
--- a/src/imports/doc/qtlottieanimation.qdocconf
+++ b/src/imports/doc/qtlottieanimation.qdocconf
@@ -1,7 +1,10 @@
 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
+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}
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index a2fb5ba..6297272 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -1,7 +1,7 @@
 CXX_MODULE = qtlottie
 TARGET  = lottieqtplugin
 TARGETPATH = Qt/labs/lottieqt
-IMPORT_VERSION = 1.$$QT_MINOR_VERSION
+IMPORT_VERSION = 1.0
 
 QT += qml quick gui-private bodymovin-private
 
diff --git a/src/imports/lottieanimation.cpp b/src/imports/lottieanimation.cpp
index deeecc1..6d72151 100644
--- a/src/imports/lottieanimation.cpp
+++ b/src/imports/lottieanimation.cpp
@@ -644,7 +644,7 @@ void LottieAnimation::renderNextFrame()
             qCDebug(lcLottieQtBodymovinRender) << static_cast<void*>(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<void*>(this)
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" }
+    }
+}
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/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
-
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