rpms/qt5-qtdeclarative
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "branch backport: Stopped animators are not removed (#1536606,kde#388759)"

Browse Source 
This reverts commit e91879d46c.
This commit is contained in:
Rex Dieter 2018-01-23 16:37:11 -06:00
parent e91879d46c
commit d27dc52b14
2 changed files with 1 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
0051-Make-sure-we-remove-stopped-animators-from-the-list-.patch
View File

@ -1,31 +0,0 @@
From 6990ae6c1bad32952e371fa72bee65a7af11c313 Mon Sep 17 00:00:00 2001
From: Gunnar Sletta <gunnar@crimson.no>
Date: Mon, 23 Oct 2017 15:03:05 +0200
Subject: [PATCH 051/140] Make sure we remove stopped animators from the list
of roots
Change-Id: I89b36ee7d03ac6b8d07b24c656d3311728e8f9c3
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
---
src/quick/util/qquickanimatorcontroller.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/quick/util/qquickanimatorcontroller.cpp b/src/quick/util/qquickanimatorcontroller.cpp
index 3f7347c01..5cf805192 100644
--- a/src/quick/util/qquickanimatorcontroller.cpp
+++ b/src/quick/util/qquickanimatorcontroller.cpp
@@ -123,8 +123,10 @@ static void qquickanimator_sync_before_start(QAbstractAnimationJob *job)
void QQuickAnimatorController::beforeNodeSync()
{
- for (const QSharedPointer<QAbstractAnimationJob> &toStop : qAsConst(m_rootsPendingStop))
+ for (const QSharedPointer<QAbstractAnimationJob> &toStop : qAsConst(m_rootsPendingStop)) {
toStop->stop();
+ m_animationRoots.remove(toStop.data());
+ }
m_rootsPendingStop.clear();
--
2.14.3

8
qt5-qtdeclarative.spec
View File

@ -14,7 +14,7 @@
Summary: Qt5 - QtDeclarative component Summary: Qt5 - QtDeclarative component
Name: qt5-%{qt_module} Name: qt5-%{qt_module}
Version: 5.9.2 Version: 5.9.2
Release: 3%{?dist} Release: 2%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -35,8 +35,6 @@ Patch1: qtdeclarative-opensource-src-5.9.0-no_sse2.patch
Patch2: qtdeclarative-QQuickShaderEffectSource_deadlock.patch Patch2: qtdeclarative-QQuickShaderEffectSource_deadlock.patch
## upstream patches ## upstream patches
Patch51: 0051-Make-sure-we-remove-stopped-animators-from-the-list-.patch
# regression https://bugreports.qt.io/browse/QTBUG-64017 # regression https://bugreports.qt.io/browse/QTBUG-64017
# so revert this offending commit (for now) # so revert this offending commit (for now)
Patch111: 0111-Fix-qml-cache-invalidation-when-changing-dependent-C.patch Patch111: 0111-Fix-qml-cache-invalidation-when-changing-dependent-C.patch
@ -101,7 +99,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%endif %endif
%patch2 -p1 -b .QQuickShaderEffectSource_deadlock %patch2 -p1 -b .QQuickShaderEffectSource_deadlock
%patch51 -p1 -b .0051
%patch111 -p1 -R -b .0111 %patch111 -p1 -R -b .0111
%patch201 -p0 -b .kdebug346118 %patch201 -p0 -b .kdebug346118
@ -233,9 +230,6 @@ make check -k -C tests ||:
%changelog %changelog
* Fri Jan 19 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.9.2-3
- branch backport: Stopped animators are not removed (#1536606,kde#388759)
* Thu Oct 26 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.2-2 * Thu Oct 26 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.9.2-2
- revert commit causing regresions (QTBUG-64017) - revert commit causing regresions (QTBUG-64017)