qt5-5.14.0:ver. bump

This commit is contained in:
Rmys
2020-01-17 00:26:43 +03:00
parent 392548d607
commit 20a85edf00
2 changed files with 40 additions and 9 deletions
@@ -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<QObject *>(value)) {
- connect(obj, &QObject::destroyed, this, [d, name](QObject *destroyed) {
- d->dropDestroyedQObject(name, destroyed);
- });
- }
+// if (auto *obj = qvariant_cast<QObject *>(value)) {
+// connect(obj, &QObject::destroyed, this, [d, name](QObject *destroyed) {
+// d->dropDestroyedQObject(name, destroyed);
+// });
+// }
}
/*!
+19 -9
View File
@@ -11,24 +11,27 @@
<Summary>Classes for QML and JavaScript languages</Summary>
<Description>Classes for QML and JavaScript languages</Description>
<License>LGPLv2.1-linking-exception</License>
<Archive sha1sum="68d476c48193a81e7947cccd4e97efa07db2397b" type="tarxz">http://download.qt.io/official_releases/qt/5.13/5.13.2/submodules/qtdeclarative-everywhere-src-5.13.2.tar.xz</Archive>
<Archive sha1sum="2ea4a2ffe698987423f6ee63d58fbba433fe0910" type="tarxz">http://download.qt.io/official_releases/qt/5.14/5.14.0/submodules/qtdeclarative-everywhere-src-5.14.0.tar.xz</Archive>
<BuildDependencies>
<Dependency versionFrom="5.13.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.14.0">qt5-base-devel</Dependency>
<Dependency>libxkbcommon-devel</Dependency>
<Dependency versionFrom="13.0.4">mesa-devel</Dependency>
<!-- <Dependency versionFrom="5.13.2">qt5-xmlpatterns-devel</Dependency> -->
<Dependency versionFrom="5.13.2">qt5-assistant-devel</Dependency>
<Dependency versionFrom="5.13.2">qt5-sql-sqlite</Dependency>
<!-- <Dependency versionFrom="5.14.0">qt5-xmlpatterns-devel</Dependency> -->
<Dependency versionFrom="5.14.0">qt5-assistant-devel</Dependency>
<Dependency versionFrom="5.14.0">qt5-sql-sqlite</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">qtbug-80963.patch</Patch>
</Patches>
</Source>
<Package>
<Name>qt5-declarative</Name>
<RuntimeDependencies>
<Dependency>libgcc</Dependency>
<Dependency versionFrom="5.13.2">qt5-base</Dependency>
<Dependency versionFrom="5.14.0">qt5-base</Dependency>
<Dependency versionFrom="13.0.4">mesa</Dependency>
<!-- <Dependency versionFrom="5.13.2">qt5-xmlpatterns</Dependency> -->
<!-- <Dependency versionFrom="5.14.0">qt5-xmlpatterns</Dependency> -->
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib</Path>
@@ -48,7 +51,7 @@
<Path fileType="header">/usr/include/qt5</Path>
</Files>
<RuntimeDependencies>
<Dependency versionFrom="5.13.2">qt5-base-devel</Dependency>
<Dependency versionFrom="5.14.0">qt5-base-devel</Dependency>
<Dependency release="current">qt5-declarative</Dependency>
</RuntimeDependencies>
</Package>
@@ -56,7 +59,7 @@
<Package>
<Name>qt5-declarative-docs</Name>
<RuntimeDependencies>
<Dependency versionFrom="5.13.2">qt5-base</Dependency>
<Dependency versionFrom="5.14.0">qt5-base</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="doc">/usr/share/doc/qt5</Path>
@@ -64,6 +67,13 @@
</Package>
<History>
<Update release="18">
<Date>2019-12-22</Date>
<Version>5.14.0</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="17">
<Date>2019-11-02</Date>
<Version>5.13.2</Version>