Accepting request 1083503 from multimedia:apps

- Add fix-for-latest-qt-declarative.patch to fix boo#1210932

OBS-URL: https://build.opensuse.org/request/show/1083503
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/musescore?expand=0&rev=34
This commit is contained in:
Dominique Leuenberger 2023-04-28 14:24:44 +00:00 committed by Git OBS Bridge
commit ea601f44ce
3 changed files with 36 additions and 0 deletions

View File

@ -0,0 +1,29 @@
From c747bdbcba81109e2749015a575827b2494af971 Mon Sep 17 00:00:00 2001
From: Fushan Wen <qydwhotmail@gmail.com>
Date: Wed, 19 Apr 2023 23:22:14 +0800
Subject: [PATCH] Set parentItem for pages in DockWindow
After https://invent.kde.org/qt/qt/qtdeclarative/-/merge_requests/40 a
QQuickItem without a parentItem is always invisible. While this avoids
some crashes in plasmashell, it breaks some applications like MuseScore
where pages don't have a parent item.
This is also important for Qt6 porting.
Fixes #17276
---
src/appshell/view/dockwindow/dockwindow.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/appshell/view/dockwindow/dockwindow.cpp b/src/appshell/view/dockwindow/dockwindow.cpp
index 1a2aaa428246..f8c79b8fe30a 100644
--- a/src/appshell/view/dockwindow/dockwindow.cpp
+++ b/src/appshell/view/dockwindow/dockwindow.cpp
@@ -619,6 +619,7 @@ void DockWindow::initDocks(DockPageView* page)
}
if (page) {
+ page->setParentItem(this);
page->init();
}

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Apr 28 08:39:34 UTC 2023 - Cor Blom <cornelis@solcon.nl>
- Add fix-for-latest-qt-declarative.patch to fix boo#1210932
-------------------------------------------------------------------
Thu Mar 16 10:21:13 UTC 2023 - Michael Vetter <mvetter@suse.com>

View File

@ -67,6 +67,8 @@ Patch0: use-qtmake-qt5.patch
Patch1: 0dde64eef84.patch
# PATCH-FIX-UPSTREAM: make compiler happy by adding returns
Patch2: musescore-4.0.2-return.patch
# PATCH-FIX-UPSTREAM: change in qt-declaratives breaks musescore
Patch3: fix-for-latest-qt-declarative.patch
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: gcc-c++