diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-11-10 22:42:36 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-11-10 22:42:36 +0200 |
| commit | 56f94cb8e2da9801ada7aa06f86ccf807f5a4ed8 (patch) | |
| tree | caaab927fca10ac2c6f0476cb262656b8440d754 | |
| parent | 8bb9237e4e1462f405d931a8a513ed4c27632d9e (diff) | |
| parent | 1f5ddb84b8599ed8485a6868d13984b7dc171760 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into tqtc/lts-5.15-opensourcev5.15.8-lts-lgpl
Change-Id: I02528b25e274161b1fbd70db79cf9cfbb0f75777
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/bodymovin/bmgfill.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index ab72819..7a0981d 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ CONFIG += warning_clean DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.7 +MODULE_VERSION = 5.15.8 diff --git a/src/bodymovin/bmgfill.cpp b/src/bodymovin/bmgfill.cpp index 333e25b..569b204 100644 --- a/src/bodymovin/bmgfill.cpp +++ b/src/bodymovin/bmgfill.cpp @@ -39,6 +39,9 @@ QT_BEGIN_NAMESPACE BMGFill::BMGFill(const BMGFill &other) : BMShape(other) { + if (m_hidden) + return; + m_opacity = other.m_opacity; m_startPoint = other.m_startPoint; m_endPoint = other.m_endPoint; |