File _service:tar_scm:0024-Revert-QQuickItem-Fix-eff... of Package qt5-qtdeclarative

File _service:tar_scm:0024-Revert-QQuickItem-Fix-effective-visibility-for-items.patch of Package qt5-qtdeclarative (Revision 253a627326bfbf384d78d0fd47a88a70)

Currently displaying revision 253a627326bfbf384d78d0fd47a88a70 , Show latest

From 70bc0c03423fe861bb917c67041f71e08ec10343 Mon Sep 17 00:00:00 2001
From: Fushan Wen <qydwhotmail@gmail.com>
Date: Fri, 21 Apr 2023 23:38:04 +0800
Subject: [PATCH 24/26] Revert "QQuickItem: Fix effective visibility for items
 without parent"

This breaks applications that use QQmlPropertyList to store QQuickItem
and don't set a parentItem for them.

Ref: https://github.com/musescore/MuseScore/issues/17276

This reverts commit 45c22a0221937682f4496801a495458a00f76d3a.
---
 src/quick/items/qquickitem.cpp                 | 6 ++++--
 tests/auto/quick/qquickitem/tst_qquickitem.cpp | 2 --
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 0d421349d7..c370d6e5c3 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -6081,8 +6081,10 @@ void QQuickItem::setEnabled(bool e)
 
 bool QQuickItemPrivate::calcEffectiveVisible() const
 {
-    // An item is visible if it is a child of a visible parent, and not explicitly hidden.
-    return explicitVisible && parentItem && QQuickItemPrivate::get(parentItem)->effectiveVisible;
+    // XXX todo - Should the effective visible of an element with no parent just be the current
+    // effective visible?  This would prevent pointless re-processing in the case of an element
+    // moving to/from a no-parent situation, but it is different from what graphics view does.
+    return explicitVisible && (!parentItem || QQuickItemPrivate::get(parentItem)->effectiveVisible);
 }
 
 bool QQuickItemPrivate::setEffectiveVisibleRecur(bool newEffectiveVisible)
diff --git a/tests/auto/quick/qquickitem/tst_qquickitem.cpp b/tests/auto/quick/qquickitem/tst_qquickitem.cpp
index 34eefd85e6..42348d8dd1 100644
--- a/tests/auto/quick/qquickitem/tst_qquickitem.cpp
+++ b/tests/auto/quick/qquickitem/tst_qquickitem.cpp
@@ -989,9 +989,7 @@ void tst_qquickitem::setParentItem()
 
 void tst_qquickitem::visible()
 {
-    QQuickWindow window;
     QQuickItem *root = new QQuickItem;
-    root->setParentItem(window.contentItem());
 
     QQuickItem *child1 = new QQuickItem;
     child1->setParentItem(root);
-- 
2.40.1