summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump versionv5.14.25.14Alexandru Croitor2020-02-021-1/+1
| | | | Change-Id: I6a8297a96c25aaa849aadf86f78b4357d1c55646
* Bump versionv5.14.1Daniel Smith2019-12-161-1/+1
| | | | Change-Id: Id896756051edeee8ef350da207ddf3653a8451b3
* Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-rc2v5.14.0-rc1v5.14.0-beta3v5.14.0Qt Forward Merge Bot2019-11-050-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I57c453a4f844e7e47f06bb6e2f13498e2989972b
| * Bump versionv5.13.25.13Frederik Gladhorn2019-10-141-1/+1
| | | | | | | | Change-Id: I8fd183f5a0288758e9fb297c98840f1291187b0b
* | Update plugins.qmltypes for Qt 5.14Kai Koehne2019-10-231-2/+2
| | | | | | | | | | | | | | Task-number: QTBUG-78690 Change-Id: I516f5cd479454fd23365b08fa56115eb6537ecf6 Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* | Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta2v5.14.0-beta1Qt Forward Merge Bot2019-10-0111-148/+121
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ide3a207fa33936e215819eb49601e764115a17c4
| * Doc: Add Licenses section to overviewKai Koehne2019-08-222-0/+7
| | | | | | | | | | | | Fixes: QTBUG-77756 Change-Id: I79021207c8485ae9ab578b24a46fbbd06738977b Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
| * Fix the build with -no-guiv5.13.1Liang Qi2019-08-062-0/+8
| | | | | | | | | | | | Task-number: QTQAINFRA-2576 Change-Id: Ib91456ab5512131cad504e710e493393844937e7 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Prospective fix when using QtLottie in QML apps with cmake and static linkageSimon Hausmann2019-07-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | 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 <simon.hausmann@qt.io>
| * Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+2
| | | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: I812e99e207e7bf6b892fd87f5158931d92341a94 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * Fix compilation with C++20Marc Mutz2019-07-071-1/+1
| | | | | | | | | | | | | | | | | | Implicit capture of 'this' in [=] is deprecated in C++20. Fix by using explicit captures. Change-Id: I7684c012e74b26b7ec30cfe19f3187f2d76197f3 Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
| * Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | Change-Id: I71b261865189e95c1191e0706d9f73947019c9e6
| * Update plugins.qmltypes for Qt 5.13v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.0-beta3v5.13.0-beta2v5.13.0Kai Koehne2019-03-122-1/+102
| | | | | | | | | | | | Task-number: 73739 Change-Id: I7a4cd45372b9ba6bb58e36dab2c80f6729c7a14c Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
| * testApp/main.qml: Don't use absolute paths in urlsAlessandro Portale2019-03-121-1/+1
| | | | | | | | | | | | | | With relative paths, the test can also be run in qmlscene. Change-Id: Id735a74ba7c647a37dfe87873a120d55b23e4be4 Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
| * Add missing .gitignore file in qtlottie rootv5.13.0-beta1Jani Heikkinen2019-02-204-146/+1
| | | | | | | | | | | | | | | | | | And remove unnecessary ones from subfolders Task-number: QTBUG-73454 Change-Id: I6ffe30fdb8648bf5c98d97f9a4f81bdb45c946ed Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | Prospective fix when using QtLottie in QML apps with cmake and static linkagev5.14.0-alpha1Simon Hausmann2019-07-182-1/+2
| | | | | | | | | | | | | | | | | | 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). Change-Id: I4e469727100954abc338edef3ff4bb8e0a1c6579 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | Disable cmake config file creationMarc Mutz2019-07-111-0/+1
| | | | | | | | | | | | | | | | It has become an error to not have tests/auto/cmake. Change-Id: I4b911759c944ec6ccc5632d262878408a8d5216f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | Mark the module clean of Q_FOREACH, Java-style iteration, and QLinkedListMarc Mutz2019-07-042-1/+2
| | | | | | | | | | | | | | Remove an unneeded #include. Change-Id: I50a22e88d9737c73a90fffb37236fcff1e90fa8b Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Fix building with qreal floatJeremy Powell2019-04-293-5/+5
| | | | | | | | | | | | Change-Id: Id190122381f3d76f242c097b9d6afb793251aaaa Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | BatchRenderer: do not prune cached frames next to the current oneKonstantin Ritt2019-04-111-2/+4
| | | | | | | | | | | | | | | | there is no any reason to drop frames that would be re-evaluated just a few ticks later Change-Id: Ieda6cf5784319fe6b35e82ee520ee4abddaab703 Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | LottieAnimation: make `source` property of QUrl typeKonstantin Ritt2019-04-094-27/+44
| | | | | | | | | | | | | | | | | | and replace QFile with QQmlFile to make LottieAnimation component support file, qrc and whatever scheme QNetworkAccessManager supports. On Android, assets scheme is also supported now. Change-Id: I014130c8154c7aa386ca271083bcf206755bd937 Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | LottieAnimation: better use of the QQuickItem's componentComplete()Konstantin Ritt2019-04-092-6/+4
| | | | | | | | | | | | | | and clean-up the related code a little bit Change-Id: Icc6e7fe48184609d69273ce81f0826f3f0250d01 Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | LottieAnimation: get rid of redundant callsKonstantin Ritt2019-04-091-8/+2
| | | | | | | | | | | | | | + move code around Change-Id: Ic2141edda37af519f39650d17e98a51d3b348b00 Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | LottieAnimation: add protected startFrame/endFrame settersKonstantin Ritt2019-04-092-4/+25
| | | | | | | | | | Change-Id: I59c9a24334c2dad1ddaacdbb130c4544ffcee7df Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | LottieAnimation: minor refactoringKonstantin Ritt2019-04-092-42/+55
| | | | | | | | | | | | | | | | | | | | * add status getter/setter * ensure that no statusChanged() signal is emitted when status doesn't change * ensure that status change emits statusChanged() signal * move code around Change-Id: I39dce43c61dd2d4ed0d2b2824610885309b068d4 Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | BatchRenderer: simplify the container usage code a bitKonstantin Ritt2019-04-091-10/+9
| | | | | | | | | | | | | | | | | | prefer using a modifiable value reference over `if (!c.contains(key)) c.insert(key, value)` and `if (c.take(key))` over `if (c.value(key)) c.remove(key)` Change-Id: I769dcc11cb1cc9d1f4729dac4a7e8d841f33f551 Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | BatchRenderer: fix race conditions due to missing/late mutex locksKonstantin Ritt2019-04-091-7/+6
| | | | | | | | | | Change-Id: Id439ef3e4c3740b4c3de9345f1006df2dd70428b Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | BatchRenderer: handle QLOTTIE_RENDER_CACHE_SIZE env varKonstantin Ritt2019-04-093-17/+12
| | | | | | | | | | | | | | handling it in every LottieAnimation instance is a waste Change-Id: I4de7673d0de0fc5c3bab04b9db419a62ac8b5580 Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | BatchRenderer: minor clean-upKonstantin Ritt2019-04-092-12/+7
| | | | | | | | | | Change-Id: I19fa7a3e2d62fcb752e699e1578d64e4330026e0 Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | BatchRenderer: ensure the same animator won't be registered twiceKonstantin Ritt2019-04-091-2/+3
| | | | | | | | | | Change-Id: I17d5e1ede276a4ce91bd95d28430e968464f09ee Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | LottieAnimation: fix frameRate property behaviorKonstantin Ritt2019-04-092-6/+17
| | | | | | | | | | | | | | | | | | make it possible to reset overridden frameRate value to the animation-default one; do not frameRateChanged() signal when the value has not been changed Change-Id: I42ff22a82960f8083ffb2816b6a5d711644323fd Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | LottieAnimation: fix error reporting for JSON parser related issuesKonstantin Ritt2019-04-091-6/+14
| | | | | | | | | | | | | | | | * add some verbosity * statusChanged() signal was never fired for parse errors Change-Id: Idc2a43140eaebeb8ed1d822075f39e742be0e404 Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | LottieAnimation: fix state transition on animation load errorKonstantin Ritt2019-04-091-3/+3
| | | | | | | | | | | | | | the proper transition should be Null -> Loading -> (Ready|Error) Change-Id: I532d9b5616d552146eddeb3727a1c1d252516b3f Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | Minor clean-upKonstantin Ritt2019-04-091-1/+3
| | | | | | | | | | | | | | | | get rid of redundant CONFIGs add `qmldir` to the project tree Change-Id: I2453b6fec5c78c83d7320885213fdce28c34af34 Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | Make plugin usable with older QtKonstantin Ritt2019-04-092-2/+3
| | | | | | | | | | | | | | | | | | due to bug in older qmake/pbx the plugin name occurrence in the plugin target path was replaced with a suffixed binary name thus making the module unreachable on Darwin Change-Id: Ibeb1d6ae328d5784088933081d014736105cf608 Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | BatchRenderer: simplify the pre-rendering codeKonstantin Ritt2019-04-081-37/+7
| | | | | | | | | | | | | | | | | | there is no point in running the noop loop to check if we need to wait before running the pre-rendering loop -> simply run the pre-rendering loop and then wait unconditionally Change-Id: I112e9f2f37a14b809e704b04bcc2fd6fdcdd39ec Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | BatchRenderer: Get rid of the dead codeKonstantin Ritt2019-04-062-2/+0
| | | | | | | | | | Change-Id: I657ed63c351068e2d0c34e9ebc1ecc5cc8bec063 Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | Fix changing the animation direction while animation is runningKonstantin Ritt2019-04-062-0/+3
| | | | | | | | | | Change-Id: I337d944b1d7f571b28136113a1b60ef61352aaef Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | LottieAnimation: make Direction enum reflect the actual step valueKonstantin Ritt2019-04-063-21/+10
| | | | | | | | | | | | | | which allows to simplify the code Change-Id: I2430fac6fc5fef11ae2a0e889670cd69a1a28307 Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | LottieAnimation: fix effect of changing output qualityKonstantin Ritt2019-04-061-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | Enable expensive Antialiasig for High quality only; enable much cheaper Smooth Sampling (linear texture filtering) for both Medium and High quality. Setting these properties on QQuickPaintedItem implies respective properties of the QPainter and the texture provider. Change-Id: Ice664935686d9b663d4892fea9389f21d870f9ee Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | LottieAnimation: make gotoAndStop() actually go to and stopKonstantin Ritt2019-04-061-0/+1
| | | | | | | | | | Change-Id: I04782cf2c462fb2655d88d05ec01724d5dab60f9 Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | BMBase: protect parent & children properties from being accessed directlyKonstantin Ritt2019-04-064-19/+11
| | | | | | | | | | | | | | | | | | either change children() constness to explicitly mention that. parent()/setParent() and children() must be used instead for the sake of consistency and reliability Change-Id: Ibd19de7853be5f4b6291dfdf753042d646b50488 Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | Minor refactoring to optimize and simplify the code a little bitKonstantin Ritt2019-03-316-32/+25
| | | | | | | | | | Change-Id: Ic9604fbd1672b2df9dddda24b330759f6df7be60 Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | Parser: Warn if we can not find effect mentioned in expressionKonstantin Ritt2019-03-261-0/+2
| | | | | | | | | | Change-Id: Ib95d294ce6888416011c9f506732e7df6770476a Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | Get rid of redundant AsConstKonstantin Ritt2019-03-251-1/+1
| | | | | | | | | | | | | | | | the `other` is a const-ref, thus `other.m_children` won't detach Change-Id: I9cff8ff339eeb71a4ed5be2e01b4bf4780d330fa Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | Parser: remember to specify a parent to correctly resolve topRootKonstantin Ritt2019-03-251-1/+1
| | | | | | | | | | | | | | oops! Change-Id: Ic812deb8b1142039810e803f3d1e6ec9b441f4df Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | Optimize BMShape::construct() and avoid UBsKonstantin Ritt2019-03-224-59/+35
| | | | | | | | | | | | | | Replace insane static QMap<{const char *, int}, int> with switch-case loop Change-Id: Iddd1640eee2b0fb78923b3011bd92cc488f7cd6d Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | Get rid of unused codeKonstantin Ritt2019-03-222-5/+2
| | | | | | | | | | Change-Id: Ic808147cccc54554a0d224676216bc2474cfef12 Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | Fix trivial copy&paste typoKonstantin Ritt2019-03-221-1/+1
| | | | | | | | | | Change-Id: I3faf469645410ded349876441a00e1dd1589696e Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
* | Bump versionKari Oikarinen2019-02-251-1/+1
|/ | | | Change-Id: I6d2cc28d48c76e9b09c76d63cc92aa94e462ac5a
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 14:51:06 +0000