Move setVisible into QQuickItemPrivate

Change-Id: I6bda48f5e982d8e93b8d9a604c275bc0cc0434de
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

2 files changed, 16 insertions, 9 deletions

diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 9adb993a2a..2865661fc7 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -5771,19 +5771,24 @@ bool QQuickItem::isVisible() const
     return d->effectiveVisible;
 }
 
-void QQuickItem::setVisible(bool v)
+void QQuickItemPrivate::setVisible(bool visible)
 {
-    Q_D(QQuickItem);
-    if (v == d->explicitVisible)
+    if (visible == explicitVisible)
         return;
 
-    d->explicitVisible = v;
-    if (!v)
-        d->dirty(QQuickItemPrivate::Visible);
+    explicitVisible = visible;
+    if (!visible)
+        dirty(QQuickItemPrivate::Visible);
+
+    const bool childVisibilityChanged = setEffectiveVisibleRecur(calcEffectiveVisible());
+    if (childVisibilityChanged && parentItem)
+        emit parentItem->visibleChildrenChanged();   // signal the parent, not this!
+}
 
-    const bool childVisibilityChanged = d->setEffectiveVisibleRecur(d->calcEffectiveVisible());
-    if (childVisibilityChanged && d->parentItem)
-        emit d->parentItem->visibleChildrenChanged();   // signal the parent, not this!
+void QQuickItem::setVisible(bool v)
+{
+    Q_D(QQuickItem);
+    d->setVisible(v);
 }
 
 /*!
diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h
index 16b919b3e8..ffb91e61eb 100644
--- a/src/quick/items/qquickitem_p.h
+++ b/src/quick/items/qquickitem_p.h
@@ -560,6 +560,8 @@ public:
 #endif
     void deliverShortcutOverrideEvent(QKeyEvent *);
 
+    virtual void setVisible(bool visible);
+
     bool isTransparentForPositioner() const;
     void setTransparentForPositioner(bool trans);