4.14.20 (kde-apps-16.04.1)

This commit is contained in:
Rex Dieter 2016-05-08 07:06:35 -05:00
parent b1fac5955e
commit b459bc2531
4 changed files with 9 additions and 57 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
/kdelibs-4.14.19.tar.xz
/kdelibs-4.14.20.tar.xz

View File

@ -1,51 +0,0 @@
commit 4f7ea2f770cf062ef22293fbb21a086f3e0cbfcb
Author: Allen Winter <winter@kde.org>
Date: Tue Oct 20 16:36:32 2015 -0400
backport commit b72fc5e56579035bf987075e16324ef95ef8e3d4
Author: Alex Merry <alex.merry@kde.org>
Date: Mon Oct 19 20:54:13 2015 +0100
Use deleteLater in Part::slotWidgetDestroyed().
When a part's main widget is destroyed, we should not delete the part
immediately - both because deleting an object from inside one of its
signals is not safe generally, and because derived classes may well hold
QPointers to the widgets, expecting them to be cleared between the
widget being destroyed and the part being destroyed.
MERGE: none
diff --git a/kparts/part.cpp b/kparts/part.cpp
index 20089d4..2cfee81 100644
--- a/kparts/part.cpp
+++ b/kparts/part.cpp
@@ -350,7 +350,7 @@ void Part::slotWidgetDestroyed()
d->m_widget = 0;
if (d->m_autoDeletePart) {
kDebug(1000) << "deleting part" << objectName();
- delete this; // ouch, this should probably be deleteLater()
+ this->deleteLater();
}
}
diff --git a/kparts/tests/parttest.cpp b/kparts/tests/parttest.cpp
index e48b578..232aa07 100644
--- a/kparts/tests/parttest.cpp
+++ b/kparts/tests/parttest.cpp
@@ -48,6 +48,7 @@ void PartTest::testAutoDeletePart()
KParts::Part* part = new TestPart(0, 0);
QPointer<KParts::Part> partPointer(part);
delete part->widget();
+ QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
QVERIFY(partPointer.isNull());
}
@@ -57,6 +58,7 @@ void PartTest::testAutoDeleteWidget()
QPointer<KParts::Part> partPointer(part);
QPointer<QWidget> widgetPointer(part->widget());
delete part;
+ QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
QVERIFY(widgetPointer.isNull());
}

View File

@ -49,9 +49,9 @@
Summary: KDE Libraries
# shipped with kde applications, version...
%global apps_version 16.04.0
Version: 4.14.19
Release: 4%{?dist}
%global apps_version 16.04.1
Version: 4.14.20
Release: 1%{?dist}
Name: kdelibs
Epoch: 6
@ -868,6 +868,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog
* Sun May 08 2016 Rex Dieter <rdieter@fedoraproject.org> - 6:4.14.20-1
- 4.14.20 (kde-apps-16.04.1)
* Fri May 06 2016 Rex Dieter <rdieter@fedoraproject.org> - 6:4.14.19-4
- drop strigi support (f25+)
@ -878,7 +881,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
- rebuild (qt)
* Fri Apr 15 2016 Rex Dieter <rdieter@fedoraproject.org> - 6:4.14.19-1
- 4.4.19 (kde-apps-16.04.0)
- 4.14.19 (kde-apps-16.04.0)
* Mon Apr 11 2016 Rex Dieter <rdieter@fedoraproject.org> - 6:4.14.18-3
- Recommends: kde-platform-plugin kde-style-breeze, moved soft dep here, workaround bug #1325471

View File

@ -1 +1 @@
f4a8e9a726a8d2a0bbdc53feeed044a9 kdelibs-4.14.19.tar.xz
06f0642f4f97d51b5fe6ed8123dda330 kdelibs-4.14.20.tar.xz