Merge branch 'master' into zfs

1 files changed, 0 insertions, 41 deletions

diff --git a/user/umbrello/assertion-fix.patch b/user/umbrello/assertion-fix.patch
deleted file mode 100644
index ef86e6546..000000000
--- a/user/umbrello/assertion-fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From af72e059f728d70e43ac3ea03653865585818e66 Mon Sep 17 00:00:00 2001
-From: Ralf Habacker <ralf.habacker@freenet.de>
-Date: Fri, 2 Nov 2018 11:38:37 +0100
-Subject: Fix 'Umbrello fails to start due to ASSERT failure in QVector<T>::at
- "index out of range"'
-
-The backtrace shows that Qt wants to access tree view items that
-have already been deleted. To avoid this, graphical updates are
-disabled when creating the new document.
-
-BUG:400501
-FIXED-IN:2.26.3 (KDE Applications 18.08.3)
----
- umbrello/umldoc.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/umbrello/umldoc.cpp b/umbrello/umldoc.cpp
-index d4099bb..af5c889 100644
---- a/umbrello/umldoc.cpp
-+++ b/umbrello/umldoc.cpp
-@@ -442,6 +442,9 @@ void UMLDoc::closeDocument()
-  */
- bool UMLDoc::newDocument()
- {
-+    bool state = UMLApp::app()->document()->loading();
-+    UMLApp::app()->document()->setLoading(false);
-+
-     closeDocument();
-     UMLApp::app()->setCurrentView(0);
-     setUrlUntitled();
-@@ -465,6 +468,7 @@ bool UMLDoc::newDocument()
-     UMLApp::app()->enableUndoAction(false);
-     UMLApp::app()->clearUndoStack();
- 
-+    UMLApp::app()->document()->setLoading(state);
-     return true;
- }
- 
--- 
-cgit v0.11.2
-