pool/libqt5-qtdeclarative
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 511037 from KDE:Qt5

Browse Source 
- Add patch to fix crash related to shared QQmlEngine instances
  (QTBUG-61681, kde#381525):
  * rebuild-qqmldata-propertycache-if-deleted.patch

OBS-URL: https://build.opensuse.org/request/show/511037
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtdeclarative?expand=0&rev=40
This commit is contained in:
Dominique Leuenberger 2017-07-25 09:35:41 +00:00 committed by Git OBS Bridge
parent 15ece42834
commit 06030bbdf3
3 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libqt5-qtdeclarative.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Jul 17 19:07:46 UTC 2017 - fabian@ritter-vogt.de
- Add patch to fix crash related to shared QQmlEngine instances
(QTBUG-61681, kde#381525):
* rebuild-qqmldata-propertycache-if-deleted.patch
-------------------------------------------------------------------
Sat Jul 1 08:13:07 UTC 2017 - lbeltrame@kde.org

5
libqt5-qtdeclarative.spec
View File

@ -35,6 +35,8 @@ Source: https://download.qt.io/official_releases/qt/5.9/%{real_version}/
Source1: baselibs.conf
# PATCH-FIX-UPSTREAM
Patch1: support-non-integer-pixel-ratios-qquickwidget.patch
# PATCH-FIX-UPSTREAM
Patch2: rebuild-qqmldata-propertycache-if-deleted.patch
# PATCH-FIX-OPENSUSE sse2_nojit.patch -- enable JIT and sse2 only on sse2 case
Patch100: sse2_nojit.patch
BuildRequires: fdupes
@ -73,10 +75,11 @@ handling.
%prep
%setup -q -n qtdeclarative-opensource-src-%{real_version}
%patch1 -p1
%patch2 -p1
%ifarch %ix86
%patch100 -p1
%endif
%patch1 -p1
%package -n %libname
Summary: Qt 5 Declarative Library

40
rebuild-qqmldata-propertycache-if-deleted.patch Normal file
View File

@ -0,0 +1,40 @@
From ab5d4c78224c9ec79165e8890e5f8b8e838e0709 Mon Sep 17 00:00:00 2001
From: David Edmundson <davidedmundson@kde.org>
Date: Mon, 10 Jul 2017 17:26:59 +0100
Subject: [PATCH] Rebuild QQmlData::propertyCache if deleted by another engine
QQmlData is shared between engines, but the relevant QObjectWrapper is
not. Since 749a7212e903d8e8c6f256edb1836b9449cc7fe1 when a
QObjectWrapper is deleted it resets the shared QQmlData propertyCache.
In most cases the propertyCache except when a property updated in an
existing binding in the first engine, where it currently asserts.
Task-number: QTBUG-61681
Change-Id: I6efdc506e5c7e30b95cda1be282afa9feb781cd2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
src/qml/qml/qqmlbinding.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/qml/qml/qqmlbinding.cpp b/src/qml/qml/qqmlbinding.cpp
index 62288a5..325f752 100644
--- a/src/qml/qml/qqmlbinding.cpp
+++ b/src/qml/qml/qqmlbinding.cpp
@@ -515,7 +515,12 @@ void QQmlBinding::getPropertyData(QQmlPropertyData **propertyData, QQmlPropertyD
Q_ASSERT(propertyData);
QQmlData *data = QQmlData::get(*m_target, false);
- Q_ASSERT(data && data->propertyCache);
+ Q_ASSERT(data);
+
+ if (Q_UNLIKELY(!data->propertyCache)) {
+ data->propertyCache = QQmlEnginePrivate::get(context()->engine)->cache(m_target->metaObject());
+ data->propertyCache->addref();
+ }
*propertyData = data->propertyCache->property(m_targetIndex.coreIndex());
Q_ASSERT(*propertyData);
--
2.7.4