[neon/qt/qtdeclarative/Neon/release] debian: Drop patches that are included in the new release.
Dmitry Shachnev
null at kde.org
Thu May 5 11:48:35 BST 2022
Git commit c60de83c873702c3412d428dac33e9a7c4bf7608 by Dmitry Shachnev.
Committed on 03/03/2022 at 19:40.
Pushed by jriddell into branch 'Neon/release'.
Drop patches that are included in the new release.
- qmltime-tool.patch
- fix_qml_property_cache_leaks.patch
M +3 -0 debian/changelog
D +0 -178 debian/patches/fix_qml_property_cache_leaks.patch
D +0 -17 debian/patches/qmltime-tool.patch
M +0 -2 debian/patches/series
https://invent.kde.org/neon/qt/qtdeclarative/commit/c60de83c873702c3412d428dac33e9a7c4bf7608
diff --git a/debian/changelog b/debian/changelog
index fde4f3b..c9e9d7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ qtdeclarative-opensource-src (5.15.3+dfsg-1) UNRELEASED; urgency=medium
[ Dmitry Shachnev ]
* New upstream release.
* Update debian/watch for new file names.
+ * Drop patches that are included in the new release:
+ - qmltime-tool.patch
+ - fix_qml_property_cache_leaks.patch
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Thu, 03 Mar 2022 22:30:20 +0300
diff --git a/debian/patches/fix_qml_property_cache_leaks.patch b/debian/patches/fix_qml_property_cache_leaks.patch
deleted file mode 100644
index a300c9b..0000000
--- a/debian/patches/fix_qml_property_cache_leaks.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-Description: fix QML property cache leaks of delegate items
- The delegate items are destroyed through an event loop by a call to a
- deleteLater(). This, however, doesn't work when the application is
- in the process of exiting and the event loop is already closed (i.e.
- we're in a stack unwinding part that starts after app.exec()).
- .
- Combat this situation by setting a parent of the to-be-deleted object
- to some QObject that will be destroyed e.g. QCoreApplication::instance()
- before the program finishes. As QObjects clean their children on
- destruction, this will make sure that we cleanup the previously leaking
- thing regardless of the event loop.
-Origin: upstream, https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=b2862e2bd84d651c
-Last-Update: 2021-01-26
-
---- a/src/qmlmodels/qqmldelegatemodel.cpp
-+++ b/src/qmlmodels/qqmldelegatemodel.cpp
-@@ -1,6 +1,6 @@
- /****************************************************************************
- **
--** Copyright (C) 2016 The Qt Company Ltd.
-+** Copyright (C) 2020 The Qt Company Ltd.
- ** Contact: https://www.qt.io/licensing/
- **
- ** This file is part of the QtQml module of the Qt Toolkit.
-@@ -2379,6 +2379,15 @@ void QQmlDelegateModelItem::destroyObjec
- data->ownContext = nullptr;
- data->context = nullptr;
- }
-+ /* QTBUG-87228: when destroying object at the application exit, the deferred
-+ * parent by setting it to QCoreApplication instance if it's nullptr, so
-+ * deletion won't work. Not to leak memory, make sure our object has a that
-+ * the parent claims the object at the end of the lifetime. When not at the
-+ * application exit, normal event loop will handle the deferred deletion
-+ * earlier.
-+ */
-+ if (object->parent() == nullptr)
-+ object->setParent(QCoreApplication::instance());
- object->deleteLater();
-
- if (attached) {
---- /dev/null
-+++ b/tests/auto/quick/qquickview_extra/data/qtbug_87228.qml
-@@ -0,0 +1,30 @@
-+import QtQml 2.12
-+import QtQml.Models 2.12
-+import QtQuick 2.12
-+
-+Item {
-+ height: 480
-+ width: 320
-+ Rectangle {
-+ id: rootRect
-+
-+ function addItem(desc) {
-+ myModel.append({"desc": desc});
-+ }
-+
-+ Rectangle {
-+ ListView {
-+ objectName: "listView"
-+ delegate: Text {
-+ required property string desc
-+ text: desc
-+ }
-+ model: ListModel { id: myModel }
-+ }
-+ }
-+
-+ Component.onCompleted: {
-+ addItem("Test creation of a delegate with a property");
-+ }
-+ }
-+}
---- /dev/null
-+++ b/tests/auto/quick/qquickview_extra/qquickview_extra.pro
-@@ -0,0 +1,12 @@
-+CONFIG += testcase
-+TARGET = tst_qquickview_extra
-+macx:CONFIG -= app_bundle
-+
-+SOURCES += tst_qquickview_extra.cpp
-+
-+include (../../shared/util.pri)
-+include (../shared/util.pri)
-+
-+TESTDATA = data/*
-+
-+QT += core-private gui-private qml-private quick-private testlib
---- /dev/null
-+++ b/tests/auto/quick/qquickview_extra/tst_qquickview_extra.cpp
-@@ -0,0 +1,77 @@
-+/****************************************************************************
-+**
-+** Copyright (C) 2020 The Qt Company Ltd.
-+** Contact: https://www.qt.io/licensing/
-+**
-+** This file is part of the test suite of the Qt Toolkit.
-+**
-+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
-+** Commercial License Usage
-+** Licensees holding valid commercial Qt licenses may use this file in
-+** accordance with the commercial license agreement provided with the
-+** Software or, alternatively, in accordance with the terms contained in
-+** a written agreement between you and The Qt Company. For licensing terms
-+** and conditions see https://www.qt.io/terms-conditions. For further
-+** information use the contact form at https://www.qt.io/contact-us.
-+**
-+** GNU General Public License Usage
-+** Alternatively, this file may be used under the terms of the GNU
-+** General Public License version 3 as published by the Free Software
-+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
-+** included in the packaging of this file. Please review the following
-+** information to ensure the GNU General Public License requirements will
-+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
-+**
-+** $QT_END_LICENSE$
-+**
-+****************************************************************************/
-+#include <qtest.h>
-+#include <QtTest/QSignalSpy>
-+#include <QtQuick/qquickview.h>
-+#include <QtQuick/qquickitem.h>
-+#include <QtQml/qqmlengine.h>
-+#include "../../shared/util.h"
-+#include <QtCore/QDebug>
-+#include <QtCore/QTimer>
-+
-+// Extra app-less tests
-+class tst_QQuickViewExtra : public QQmlDataTest
-+{
-+ Q_OBJECT
-+public:
-+ tst_QQuickViewExtra();
-+
-+private slots:
-+ void qtbug_87228();
-+};
-+
-+tst_QQuickViewExtra::tst_QQuickViewExtra() { }
-+
-+void tst_QQuickViewExtra::qtbug_87228()
-+{
-+ QScopedPointer<QSignalSpy> deletionSpy;
-+ {
-+ int argc = 0;
-+ QGuiApplication app(argc, nullptr);
-+ QQuickView view;
-+
-+ view.setSource(testFileUrl("qtbug_87228.qml"));
-+ view.show();
-+ QTimer::singleShot(500, &app, QCoreApplication::quit);
-+ app.exec();
-+
-+ QObject *listView = view.findChild<QObject *>("listView");
-+ QVERIFY(listView);
-+ QQuickItem *contentItem = listView->property("contentItem").value<QQuickItem *>();
-+ QVERIFY(contentItem);
-+ auto children = contentItem->childItems();
-+ QVERIFY(children.size() > 0);
-+ // for the sake of this test, any child would be suitable, so pick first
-+ deletionSpy.reset(new QSignalSpy(children[0], SIGNAL(destroyed(QObject *))));
-+ }
-+ QCOMPARE(deletionSpy->count(), 1);
-+}
-+
-+QTEST_APPLESS_MAIN(tst_QQuickViewExtra)
-+
-+#include "tst_qquickview_extra.moc"
---- a/tests/auto/quick/quick.pro
-+++ b/tests/auto/quick/quick.pro
-@@ -85,6 +85,7 @@ QUICKTESTS += \
- qquicktextinput \
- qquickvisualdatamodel \
- qquickview \
-+ qquickview_extra \
- qquickcanvasitem \
- qquickdesignersupport \
- qquickscreen \
diff --git a/debian/patches/qmltime-tool.patch b/debian/patches/qmltime-tool.patch
deleted file mode 100644
index 4e0fc70..0000000
--- a/debian/patches/qmltime-tool.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: The qmltime should be a tool, not a normal executable or an app.
-Origin: upstream, https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?h=5.15&id=30c7a6c6a8742648
-Last-Update: 2021-01-18
-
---- a/tools/qmltime/qmltime.pro
-+++ b/tools/qmltime/qmltime.pro
-@@ -1,4 +1,3 @@
--TEMPLATE = app
- TARGET = qmltime
- QT += qml quick
- QT += quick-private
-@@ -12,3 +11,5 @@ QMAKE_TARGET_DESCRIPTION = QML Time
-
- SOURCES += qmltime.cpp
- HEADERS += qmltime.h
-+
-+load(qt_tool)
diff --git a/debian/patches/series b/debian/patches/series
index 5b7cfb1..9024a8b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
# Backported patches
-qmltime-tool.patch
-fix_qml_property_cache_leaks.patch
gcc_11.patch
tst_qmldiskcache_big_endian.patch
support_apos_in_styled_text.patch
More information about the Neon-commits
mailing list