Compare commits
18 Commits
Author | SHA1 | Date |
---|---|---|
Rex Dieter | a3ed28dbb6 | |
Rex Dieter | 0eeacf60e1 | |
Rex Dieter | 471be0d95f | |
Rex Dieter | b16256edb2 | |
Rex Dieter | 111c47f0aa | |
Rex Dieter | 643e86280e | |
Rex Dieter | 17392a98f0 | |
Rex Dieter | caecc79beb | |
Rex Dieter | b7e33e9b65 | |
Rex Dieter | d27dc52b14 | |
Rex Dieter | 6ef1ef1e2c | |
Rex Dieter | e91879d46c | |
Rex Dieter | a37451ad76 | |
Jan Grulich | 5919ad6428 | |
Daniel Vrátil | de6ed965f4 | |
Than Ngo | 31ee498e72 | |
Than Ngo | 84d59a0e6c | |
Rex Dieter | 9d9f4980c8 |
|
@ -1,3 +1,4 @@
|
|||
/qtdeclarative-opensource-src-5.9.1.tar.xz
|
||||
/qtdeclarative-opensource-src-5.9.2.tar.xz
|
||||
/qtdeclarative-opensource-src-5.9.3.tar.xz
|
||||
/qtdeclarative-opensource-src-5.9.4.tar.xz
|
||||
|
|
|
@ -0,0 +1,41 @@
|
|||
From 73e8321255d9f0e70529a58c10dbaf4790a9a659 Mon Sep 17 00:00:00 2001
|
||||
From: David Edmundson <davidedmundson@kde.org>
|
||||
Date: Tue, 6 Mar 2018 10:56:23 +0000
|
||||
Subject: [PATCH 28/29] Rebuild property cache in QObjectWrapper::getProperty
|
||||
if deleted
|
||||
|
||||
QQmlData is shared between engines, but the relevant QObjectWrapper is
|
||||
not.
|
||||
|
||||
Since 749a7212e903d8e8c6f256edb1836b9449cc7fe1 when a QObjectWrapper is
|
||||
deleted it resets the shared QQmlData propertyCache.
|
||||
|
||||
ab5d4c78224c9ec79165e8890e5f8b8e838e0709 fixed this situation for
|
||||
bindings, however we would still hit effectively the same crash in the
|
||||
same situation if a function is evaluated before a binding.
|
||||
|
||||
Change-Id: I20cd91cd8e31fd0176d542822c67e81a790599ba
|
||||
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
||||
---
|
||||
src/qml/jsruntime/qv4qobjectwrapper.cpp | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp
|
||||
index 5ebd385cf..c1bbe2a33 100644
|
||||
--- a/src/qml/jsruntime/qv4qobjectwrapper.cpp
|
||||
+++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp
|
||||
@@ -335,6 +335,11 @@ ReturnedValue QObjectWrapper::getProperty(ExecutionEngine *engine, QObject *obje
|
||||
if (!ddata)
|
||||
return QV4::Encode::undefined();
|
||||
|
||||
+ if (Q_UNLIKELY(!ddata->propertyCache)) {
|
||||
+ ddata->propertyCache = QQmlEnginePrivate::get(engine)->cache(object->metaObject());
|
||||
+ ddata->propertyCache->addref();
|
||||
+ }
|
||||
+
|
||||
QQmlPropertyCache *cache = ddata->propertyCache;
|
||||
Q_ASSERT(cache);
|
||||
QQmlPropertyData *property = cache->property(propertyIndex);
|
||||
--
|
||||
2.14.3
|
||||
|
|
@ -0,0 +1,94 @@
|
|||
diff -up qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextcontrol.cpp.bz#1120451 qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextcontrol.cpp
|
||||
--- qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextcontrol.cpp.bz#1120451 2016-11-11 07:18:01.000000000 +0100
|
||||
+++ qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextcontrol.cpp 2017-07-19 17:19:18.253590767 +0200
|
||||
@@ -608,7 +608,7 @@ void QQuickTextControl::clear()
|
||||
}
|
||||
|
||||
QQuickTextControl::QQuickTextControl(QTextDocument *doc, QObject *parent)
|
||||
- : QObject(*new QQuickTextControlPrivate, parent)
|
||||
+ : QInputControl(TextEdit, *new QQuickTextControlPrivate, parent)
|
||||
{
|
||||
Q_D(QQuickTextControl);
|
||||
Q_ASSERT(doc);
|
||||
@@ -980,9 +980,8 @@ void QQuickTextControlPrivate::keyPressE
|
||||
|
||||
process:
|
||||
{
|
||||
- QString text = e->text();
|
||||
- if (!text.isEmpty() && (text.at(0).isPrint() || text.at(0) == QLatin1Char('\t'))) {
|
||||
- cursor.insertText(text);
|
||||
+ if (q->isAcceptableInput(e)) {
|
||||
+ cursor.insertText(e->text());
|
||||
selectionChanged();
|
||||
} else {
|
||||
e->ignore();
|
||||
diff -up qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextcontrol_p.h.bz#1120451 qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextcontrol_p.h
|
||||
--- qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextcontrol_p.h.bz#1120451 2016-11-11 07:18:01.000000000 +0100
|
||||
+++ qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextcontrol_p.h 2017-07-19 17:19:18.253590767 +0200
|
||||
@@ -59,6 +59,7 @@
|
||||
#include <QtGui/qabstracttextdocumentlayout.h>
|
||||
#include <QtGui/qtextdocumentfragment.h>
|
||||
#include <QtGui/qclipboard.h>
|
||||
+#include <QtGui/private/qinputcontrol_p.h>
|
||||
#include <QtCore/qmimedata.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
@@ -71,7 +72,7 @@ class QAbstractScrollArea;
|
||||
class QEvent;
|
||||
class QTimerEvent;
|
||||
|
||||
-class Q_AUTOTEST_EXPORT QQuickTextControl : public QObject
|
||||
+class Q_AUTOTEST_EXPORT QQuickTextControl : public QInputControl
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_DECLARE_PRIVATE(QQuickTextControl)
|
||||
diff -up qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextinput.cpp.bz#1120451 qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextinput.cpp
|
||||
--- qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextinput.cpp.bz#1120451 2016-11-11 07:18:01.000000000 +0100
|
||||
+++ qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextinput.cpp 2017-07-19 17:20:55.479933008 +0200
|
||||
@@ -63,6 +63,7 @@
|
||||
#endif
|
||||
|
||||
#include <QtGui/private/qtextengine_p.h>
|
||||
+#include <QtGui/private/qinputcontrol_p.h>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
@@ -2619,6 +2620,7 @@ void QQuickTextInputPrivate::init()
|
||||
option.setUseDesignMetrics(renderType != QQuickTextInput::NativeRendering);
|
||||
m_textLayout.setTextOption(option);
|
||||
}
|
||||
+ m_inputControl = new QInputControl(QInputControl::LineEdit, q);
|
||||
}
|
||||
|
||||
void QQuickTextInputPrivate::resetInputMethod()
|
||||
@@ -4452,9 +4454,8 @@ void QQuickTextInputPrivate::processKeyE
|
||||
}
|
||||
|
||||
if (unknown && !m_readOnly) {
|
||||
- QString t = event->text();
|
||||
- if (!t.isEmpty() && t.at(0).isPrint()) {
|
||||
- insert(t);
|
||||
+ if (m_inputControl->isAcceptableInput(event)) {
|
||||
+ insert(event->text());
|
||||
event->accept();
|
||||
return;
|
||||
}
|
||||
diff -up qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextinput_p_p.h.bz#1120451 qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextinput_p_p.h
|
||||
--- qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextinput_p_p.h.bz#1120451 2016-11-11 07:18:01.000000000 +0100
|
||||
+++ qtdeclarative-opensource-src-5.7.1/src/quick/items/qquicktextinput_p_p.h 2017-07-19 17:19:18.254590729 +0200
|
||||
@@ -70,6 +70,7 @@
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QQuickTextNode;
|
||||
+class QInputControl;
|
||||
|
||||
class Q_QUICK_PRIVATE_EXPORT QQuickTextInputPrivate : public QQuickImplicitSizeItemPrivate
|
||||
{
|
||||
@@ -227,6 +228,7 @@ public:
|
||||
QQuickItem *cursorItem;
|
||||
QQuickTextNode *textNode;
|
||||
MaskInputData *m_maskData;
|
||||
+ QInputControl *m_inputControl;
|
||||
|
||||
QList<int> m_transactions;
|
||||
QVector<Command> m_history;
|
|
@ -13,8 +13,8 @@
|
|||
|
||||
Summary: Qt5 - QtDeclarative component
|
||||
Name: qt5-%{qt_module}
|
||||
Version: 5.9.3
|
||||
Release: 1%{?dist}
|
||||
Version: 5.9.4
|
||||
Release: 3%{?dist}
|
||||
|
||||
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
|
||||
License: LGPLv2 with exceptions or GPLv3 with exceptions
|
||||
|
@ -35,10 +35,17 @@ Patch1: qtdeclarative-opensource-src-5.9.0-no_sse2.patch
|
|||
Patch2: qtdeclarative-QQuickShaderEffectSource_deadlock.patch
|
||||
|
||||
## upstream patches
|
||||
# https://codereview.qt-project.org/#/c/224684/
|
||||
Patch100: qtdeclarative-leak.patch
|
||||
|
||||
# regression https://bugreports.qt.io/browse/QTBUG-64017
|
||||
# so revert this offending commit (for now)
|
||||
Patch111: 0111-Fix-qml-cache-invalidation-when-changing-dependent-C.patch
|
||||
|
||||
# 5.11 branch fixes
|
||||
Patch128: 0028-Rebuild-property-cache-in-QObjectWrapper-getProperty.patch
|
||||
|
||||
|
||||
## upstreamable patches
|
||||
# use system double-conversation
|
||||
# https://bugs.kde.org/show_bug.cgi?id=346118#c108
|
||||
|
@ -48,6 +55,7 @@ Patch201: qtdeclarative-kdebug346118.patch
|
|||
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=792594
|
||||
Patch202: http://sources.debian.net/data/main/q/qtdeclarative-opensource-src/5.9.0~beta3-2/debian/patches/Do-not-make-lack-of-SSE2-support-on-x86-32-fatal.patch
|
||||
|
||||
|
||||
# filter qml provides
|
||||
%global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$
|
||||
|
||||
|
@ -101,8 +109,12 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
|||
%endif
|
||||
%patch2 -p1 -b .QQuickShaderEffectSource_deadlock
|
||||
|
||||
%patch100 -p1 -b .memleak
|
||||
|
||||
%patch111 -p1 -R -b .0111
|
||||
|
||||
%patch128 -p1 -b .0028
|
||||
|
||||
%patch201 -p0 -b .kdebug346118
|
||||
%patch202 -p1 -b .no_sse2_non_fatal
|
||||
|
||||
|
@ -114,14 +126,14 @@ mkdir -p %{_target_platform}-no_sse2
|
|||
pushd %{_target_platform}-no_sse2
|
||||
%{qmake_qt5} -config no_sse2 ..
|
||||
make sub-src-clean
|
||||
make %{?_smp_mflags} -C src/qml
|
||||
%make_build -C src/qml
|
||||
popd
|
||||
%endif
|
||||
|
||||
# no shadow builds until fixed: https://bugreports.qt.io/browse/QTBUG-37417
|
||||
%{qmake_qt5}
|
||||
|
||||
make %{?_smp_mflags}
|
||||
%make_build
|
||||
|
||||
|
||||
%install
|
||||
|
@ -232,6 +244,15 @@ make check -k -C tests ||:
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Apr 19 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.9.4-3
|
||||
- backport qv4qobjectwrapper fixes
|
||||
|
||||
* Tue Apr 03 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.9.4-2
|
||||
- pull in candidate memleak fix (review#224684)
|
||||
|
||||
* Wed Jan 24 2018 Rex Dieter <rdieter@fedoraproject.org> - 5.9.4-1
|
||||
- 5.9.4
|
||||
|
||||
* Thu Nov 23 2017 Jan Grulich <jgrulich@redhat.com> - 5.9.3-1
|
||||
- 5.9.3
|
||||
|
||||
|
|
|
@ -0,0 +1,22 @@
|
|||
diff -up qtdeclarative-everywhere-src-5.10.1/src/quick/scenegraph/qsgrenderloop.cpp.leak qtdeclarative-everywhere-src-5.10.1/src/quick/scenegraph/qsgrenderloop.cpp
|
||||
--- qtdeclarative-everywhere-src-5.10.1/src/quick/scenegraph/qsgrenderloop.cpp.leak 2018-04-03 11:14:09.975064043 -0500
|
||||
+++ qtdeclarative-everywhere-src-5.10.1/src/quick/scenegraph/qsgrenderloop.cpp 2018-04-03 11:15:29.347573091 -0500
|
||||
@@ -305,6 +305,8 @@ void QSGGuiThreadRenderLoop::hide(QQuick
|
||||
{
|
||||
QQuickWindowPrivate *cd = QQuickWindowPrivate::get(window);
|
||||
cd->fireAboutToStop();
|
||||
+ if (m_windows.contains(window))
|
||||
+ m_windows[window].updatePending = false;
|
||||
}
|
||||
|
||||
void QSGGuiThreadRenderLoop::windowDestroyed(QQuickWindow *window)
|
||||
@@ -494,7 +496,8 @@ QImage QSGGuiThreadRenderLoop::grab(QQui
|
||||
|
||||
void QSGGuiThreadRenderLoop::maybeUpdate(QQuickWindow *window)
|
||||
{
|
||||
- if (!m_windows.contains(window))
|
||||
+ QQuickWindowPrivate *cd = QQuickWindowPrivate::get(window);
|
||||
+ if (!cd->isRenderable() || !m_windows.contains(window))
|
||||
return;
|
||||
|
||||
m_windows[window].updatePending = true;
|
2
sources
2
sources
|
@ -1 +1 @@
|
|||
SHA512 (qtdeclarative-opensource-src-5.9.3.tar.xz) = 933caf5848437cde45b4bbf0c70b6cafbc690657c651508b28138b2f90d2f823f4842bc709f4726e2c88d3913a92240b0dcd9248d83af0d06d7127b9a8211b24
|
||||
SHA512 (qtdeclarative-opensource-src-5.9.4.tar.xz) = e9e425665df42826c2525566e08b3588aa73b0efea295eed301ba5caeea7208b90c5a91a55cc16986ea9e0ceb9c6658bd59f56a3a276601ad5780f2c67f5ad5c
|
||||
|
|
Loading…
Reference in New Issue