diff options
author | Tobias C. Berner <tcberner@FreeBSD.org> | 2016-10-28 13:43:14 +0000 |
---|---|---|
committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2016-10-28 13:43:14 +0000 |
commit | ea7ceba707457f4713e302755dddec60ea73d011 (patch) | |
tree | 7cfcdd85e2e9fd3db96642ae81d9f1a7b8b8cb04 /lang/qt5-qml | |
parent | 102a98361437cd6ce8055d80c514878000e25685 (diff) | |
download | ports-ea7ceba707457f4713e302755dddec60ea73d011.tar.gz ports-ea7ceba707457f4713e302755dddec60ea73d011.zip |
Update Qt to 5.6.2 [1,2]
Thanks to the upstream work of Marie Loise Nolden, we could get rid of a handful
of patches, as they have been properly upstreamed. The rest of the work is just
some minor plist changes.
I would like to thank Loise <nolden@kde.org> for the upstream work, and Adriaan
<groot@kde.org> for getting the update into shape.
[1] http://blog.qt.io/blog/2016/10/12/qt-5-6-2-released/
[2] http://wiki.qt.io/Qt_5.6.2_Change_Files
PR: 213530
Exp-run by: antoine
Submitted by: Adriaan de Groot <groot@kde.org>
Reviewed by: rakuco, mat, tcberner
Approved by: rakuco (mentor)
Differential Revision: https://reviews.freebsd.org/D8228
Notes
Notes:
svn path=/head/; revision=424842
Diffstat (limited to 'lang/qt5-qml')
-rw-r--r-- | lang/qt5-qml/files/patch-git_9b1231ca | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/lang/qt5-qml/files/patch-git_9b1231ca b/lang/qt5-qml/files/patch-git_9b1231ca deleted file mode 100644 index fea243fc793b..000000000000 --- a/lang/qt5-qml/files/patch-git_9b1231ca +++ /dev/null @@ -1,34 +0,0 @@ -This patch is the only change between Qt 5.6.1 and 5.6.1-1. It is easier to -just ship the patch separately. - -[We left out the part concerning the tests/ subdirectory we do not care about] - -From 9b1231ca3d21ade574a8a7cf3f0805a8b520bcd5 Mon Sep 17 00:00:00 2001 -From: Ulf Hermann <ulf.hermann@qt.io> -Date: Wed, 8 Jun 2016 17:32:32 +0200 -Subject: [PATCH] QML: Only release types if they aren't referenced anymore - -Just checking for references on m_compiledData is not enough. The -actual component can also be referenced. Thus it won't be deleted -on release(), but cannot be found in the type cache anymore. - -Task-number: QTBUG-53761 -Change-Id: I8567af8e75a078598e4fed31e4717134e1332278 -Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> -Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> -(cherry picked from commit 2ac19881f92c94f4e9427bd9ff513210675f259e) ---- src/qml/qml/qqmltypeloader.cpp -+++ src/qml/qml/qqmltypeloader.cpp -@@ -1961,7 +1961,8 @@ void QQmlTypeLoader::trimCache() - QList<TypeCache::Iterator> unneededTypes; - for (TypeCache::Iterator iter = m_typeCache.begin(), end = m_typeCache.end(); iter != end; ++iter) { - QQmlTypeData *typeData = iter.value(); -- if (typeData->m_compiledData && typeData->m_compiledData->count() == 1) { -+ if (typeData->m_compiledData && typeData->count() == 1 -+ && typeData->m_compiledData->count() == 1) { - // There are no live objects of this type - unneededTypes.append(iter); - } --- -2.8.4 - |