From 20a85edf00446adeffad0dce74ebc41da669f086 Mon Sep 17 00:00:00 2001 From: Rmys Date: Fri, 17 Jan 2020 00:26:43 +0300 Subject: [PATCH] qt5-5.14.0:ver. bump --- .../qt5-declarative/files/qtbug-80963.patch | 21 ++++++++++++++ desktop/toolkit/qt5/qt5-declarative/pspec.xml | 28 +++++++++++++------ 2 files changed, 40 insertions(+), 9 deletions(-) create mode 100644 desktop/toolkit/qt5/qt5-declarative/files/qtbug-80963.patch diff --git a/desktop/toolkit/qt5/qt5-declarative/files/qtbug-80963.patch b/desktop/toolkit/qt5/qt5-declarative/files/qtbug-80963.patch new file mode 100644 index 0000000000..2a3c1baacf --- /dev/null +++ b/desktop/toolkit/qt5/qt5-declarative/files/qtbug-80963.patch @@ -0,0 +1,21 @@ +diff --git a/src/qml/qml/qqmlcontext.cpp b/src/qml/qml/qqmlcontext.cpp +index f75a076bcb..36080a4f38 100644 +--- a/src/qml/qml/qqmlcontext.cpp ++++ b/src/qml/qml/qqmlcontext.cpp +@@ -318,11 +318,11 @@ void QQmlContext::setContextProperty(const QString &name, const QVariant &value) + QMetaObject::activate(this, d->notifyIndex, idx, nullptr); + } + +- if (auto *obj = qvariant_cast(value)) { +- connect(obj, &QObject::destroyed, this, [d, name](QObject *destroyed) { +- d->dropDestroyedQObject(name, destroyed); +- }); +- } ++// if (auto *obj = qvariant_cast(value)) { ++// connect(obj, &QObject::destroyed, this, [d, name](QObject *destroyed) { ++// d->dropDestroyedQObject(name, destroyed); ++// }); ++// } + } + + /*! diff --git a/desktop/toolkit/qt5/qt5-declarative/pspec.xml b/desktop/toolkit/qt5/qt5-declarative/pspec.xml index d167b77a0c..39ffb79f2d 100755 --- a/desktop/toolkit/qt5/qt5-declarative/pspec.xml +++ b/desktop/toolkit/qt5/qt5-declarative/pspec.xml @@ -11,24 +11,27 @@ Classes for QML and JavaScript languages Classes for QML and JavaScript languages LGPLv2.1-linking-exception - http://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtdeclarative-everywhere-src-5.13.2.tar.xz + http://download.qt.io/official_releases/qt/5.14/5.14.0/submodules/qtdeclarative-everywhere-src-5.14.0.tar.xz - qt5-base-devel + qt5-base-devel libxkbcommon-devel mesa-devel - - qt5-assistant-devel - qt5-sql-sqlite + + qt5-assistant-devel + qt5-sql-sqlite + + qtbug-80963.patch + qt5-declarative libgcc - qt5-base + qt5-base mesa - + /usr/lib @@ -48,7 +51,7 @@ /usr/include/qt5 - qt5-base-devel + qt5-base-devel qt5-declarative @@ -56,7 +59,7 @@ qt5-declarative-docs - qt5-base + qt5-base /usr/share/doc/qt5 @@ -64,6 +67,13 @@ + + 2019-12-22 + 5.14.0 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2019-11-02 5.13.2