| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There was update on bodymovin schema on animating property.
Applying those updates.
Preserve old implementation for backward compatibility.
Task-number: QTBUG-102550
Change-Id: I1ca18ca727e267b6e5e442e1fae4b5aa72572ece
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
(cherry picked from commit f467e29f74fd121b62ad66cb70da9a4b7f6e3248)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The direction of ellipse is not reversed by default.
The fill shape now applies the opacity value to color.
Task-number: QTBUG-102550
Change-Id: I93ceb17c85b10af5b1255db8d8803c355cd662ea
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Kwanghyo Park <kwanghyo.park@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
(cherry picked from commit 8b7128b925d376cc73c3ba9d904c03448aaffd03)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We've been requiring C++17 since Qt 6.0, and our qAsConst use finally
starts to bother us (QTBUG-99313), so time to port away from it
now.
Since qAsConst has exactly the same semantics as std::as_const (down
to rvalue treatment, constexpr'ness and noexcept'ness), there's really
nothing more to it than a global search-and-replace.
This is a 6.4 re-run of the script we ran in dev, in order to avoid
conflicts between the branches when cherry-picking.
Change-Id: I655bbae6b8c089e9f7518a98c6c2fc4a3f342a5c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|
|
|
|
|
|
|
|
| |
This is a the same semantic patch (qt-port-to-std-compatible-api V5
with config Scope: 'Container') as in dev. I've re-ran it in 6.4 to
avoid cherry-pick conflicts.
Change-Id: Ie2bc4384f96350d35e17699b758cc10cbfd6d175
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This should be done in its own right, and in addition the
stale plugins.qmltypes export (original from Qt 5.13 when
QtLottie was introduced) causes qmllint errors => let it be
generated.
Fixes: QTBUG-107501
Fixes: QTBUG-100780
Change-Id: I75535323fea9e8595d3cfeb04c5e74fe66a2d936
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit a4c3167b57785a069e1a4caf55563ef90c0e74ab)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
| |
Fixes
WARNING: bmglobal.h includes QtGlobal when it should include QtCore/QtGlobal
Change-Id: Ie26317bf8d262bf8c9602a04890bc547dba5c8d7
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 03a7b2d95ad6beb66225edc538fb61624e49b749)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Replace the current license disclaimer in files by
a SPDX-License-Identifier.
License files are organized under LICENSES directory.
Task-number: QTBUG-67283
Change-Id: I7eaf43256dddbe3aa5df12059574ff7cbe269df6
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 51c86740c229fb6ab66e1fd44bf8973ce0d62e42)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
|
|
|
|
|
|
|
| |
Don't rely on transitive includes of QMap, QHash, or QList.
Pick-to: 6.3
Change-Id: I6990e9c21b3730d6533b726ad891f1135d266d98
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
See script in qtbase/util/includeprivate for the rules.
Since these files are being touched anyway, I also ran the
updatecopyright.pl script too.
Change-Id: Ib056b47dde3341ef9a52ffff13ef677e471674b6
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
QQmlFile seems to expect an absolute URL here.
[ChangeLog] Fixed bug that prevented LottieAnimation
from loading its source from a relative URL.
Fixes: QTBUG-98794
Pick-to: 6.2
Change-Id: I58f01d36a4108a0fa9e4d863eb9185a514bf14b4
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
In case BMGFill is hidden, properties like m_gradient are not
initialized - see BMGFill(const QJsonObject &definition ...).
If this hidden fill is then cloned, Q_UNREACHABLE is hit.
Avoid this by exiting early in this case.
Pick-to: 6.2 5.15
Change-Id: I2d7e3121bfeebb5a9730d67d0bf6d45343c9d433
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
|
|
|
|
|
|
|
|
| |
This is not recommended anymore in Qt 6.
Pick-to: 6.2
Change-Id: Ic5b7c28bbf5e07fcc03c35d29e2219ab44351b02
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|
|
|
|
|
|
|
| |
Amends 5abb836d15b73
Pick-to: 6.2
Change-Id: I8b7400b6ef37f13356173026d3fcf5ec4376fcde
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
customFilters defined in .qdocconf are not supported anymore by Qt
Assistant since Qt 5.13. Therefore remove them from all .qdocconf files,
also to avoid cargo-culting them to new help modules.
Task-number: QTBUG-95987
Change-Id: I2c60f004bb84a4e2108ee8f2d67dbf3e5f23c636
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The pro2cmake.py conversion script faithfully reproduced the .pro files
for the plugins, which specified the libraries as public. But in CMake,
the implications of this are that public usage requirements should then
be propagated to consumers. We don't expect any consumers, since a
plugin is created as a MODULE library in CMake, so for Windows we don't
even have an import library to link with. The only exception to this is
for static builds where plugins are created as STATIC libraries
instead, but only in certain controlled situations do we then link to
plugins. Even then, usage requirements are not expected to propagate to
the consumers, so these relationships should always be specified as
private.
Pick-to: 6.2
Task-number: QTBUG-90819
Change-Id: I7db09e5cc0f0e7179d2d6da2acf3c1eadc02f8e2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
| |
Rename internal modules to adjust their names to the internal module
policy.
Change-Id: I5cb903fbce60221bf778775fada6ac625bc5ff24
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-91621
Change-Id: Ib2eefc7dae251a0e3e2e9c59f8fe179e477287f2
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QTBUG-88742
Change-Id: I32be2effcca79627e1dccc886917c81d19001bda
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Rebecca Worledge <rebecca.worledge@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Use PROJECT_VERSION instead of CMAKE_PROJECT_VERSION, so that the
repo project version is used in a top-level build, rather
than the version of the qt5 project.
Pick-to: 6.1
Task-number: QTBUG-92861
Change-Id: I221e041ef2440dc2f20b0cc231ee63f029fa0e07
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
| |
Pick-to: 6.1
Change-Id: Id5bcd4e38117a135efaa2e81cc5d7469bdcf6b7c
Reviewed-by: Rebecca Worledge <rebecca.worledge@qt.io>
|
|
|
|
|
|
|
|
|
| |
In an incomplete easing segment (i.e. an end frame) there is no bezier
data, so do not access it.
Pick-to: 6.1
Change-Id: I1b1deba6953d7b719c00ca1be71b1a21c7e4f6cd
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|
|
|
|
|
| |
Pick-to: 6.1
Change-Id: I409f768c6242770e850dc3000846f01d6a881bd9
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
|
|
|
|
|
|
|
|
| |
Adjust qmake build system where needed.
Pick-to: 6.1
Change-Id: I7983fdafc59be4f2bba5b0397f4551a1be95ede3
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
An iterator on m_closedShape is being created and used without checking
if the iterator actually has a valid value. This was not a problem in
Qt5, but in Qt6 causes a crash. This patch adds a check to the QMap, so
that the iterator is not even created if the QMap has a size of 0
Change-Id: Ie7a3ce2ad162bb787fbbb18674bbf9bd95524453
Reviewed-by: Rebecca Worledge <rebecca.worledge@qt.io>
|
|
|
|
|
| |
Change-Id: I17150649856a58bb96b242f3cc40f35aedcb3c1a
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
|
|
|
|
|
| |
Change-Id: Iec960c033970ccb55a31c1aee02b4a5072314001
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
|
|
|
|
|
|
|
|
|
| |
if BatchRenderer would ever destroyed,
we are leaking the BM objects tree and the pre-rendered frames
of the not-yet unregistered animation(s)
Change-Id: Ia55f58769c3efb725dcd60fc475988767b1f46b3
Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
|
|
|
|
|
|
|
|
|
| |
if the same LottieAnimation object is registered twice,
without calling deregisterAnimator() first,
we are leaking the BM objects tree and the pre-rendered frames
Change-Id: I07ac06b5f0b7ba9cacf7b0b883fc3cdb9782a349
Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: I59037c52a1248ab67ac18acd257e25971d78f663
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-84469
Change-Id: I7064d93ed0302b98bfa896825d4b0eb467dc765a
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
This also makes sure that the fix from
69756405416cc9a643f75cc9e158ed9efc98d7d3
will arrive in 5.15
Pick-to: 5.15
Change-Id: Idf96508c13f4fb13649c7deef92a37dbf052763f
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
|
|\
| |
| |
| | |
Change-Id: I56bea58318d2cbedbb90630621b1ac523abfff4f
|
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-83752
Change-Id: Id368216ddf71fe84390331b0873049dc11ce7c47
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Adds image parsing, loading, and rendering to Qt Lottie as per the
Bodymovin spec.
Change-Id: I71950227155b9fbe030fabcfc9c4ae5b8fc1fb6a
Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
|
|\|
| |
| |
| | |
Change-Id: I1b2fa0aa1b8db95ff2be8147897b5a6ad605a4dc
|
| |
| |
| |
| |
| |
| |
| | |
Task-number: QTBUG-78690
Change-Id: I516f5cd479454fd23365b08fa56115eb6537ecf6
Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
|
|\|
| |
| |
| | |
Change-Id: I96eeca63cac9d47edc28f1e39d826c7498036b0e
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: Ide3a207fa33936e215819eb49601e764115a17c4
|
| | |
| | |
| | |
| | |
| | |
| | | |
Fixes: QTBUG-77756
Change-Id: I79021207c8485ae9ab578b24a46fbbd06738977b
Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTQAINFRA-2576
Change-Id: Ib91456ab5512131cad504e710e493393844937e7
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-74391
Change-Id: I812e99e207e7bf6b892fd87f5158931d92341a94
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: 73739
Change-Id: I7a4cd45372b9ba6bb58e36dab2c80f6729c7a14c
Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
as `m_transform = m_transform;` doesn't make sense;
plus minor clean-up
Change-Id: I16225f732ff7d942acdc29d4f947068d35fa79c3
Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| | |
Remove an unneeded #include.
Change-Id: I50a22e88d9737c73a90fffb37236fcff1e90fa8b
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
| |
| |
| |
| |
| |
| | |
Change-Id: Id190122381f3d76f242c097b9d6afb793251aaaa
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Rebecca Worledge <rebecca.worledge@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|