QQuickItemPrivate: Make {width,height}Valid a function

There is now some additional logic, so we cannot simply rely on the
boolean flag.

Task-number: QTBUG-94703
Pick-to: 6.2
Change-Id: Id4674efd205a58b015a82b3c06e63c8a031f6607
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

1 files changed, 5 insertions, 2 deletions

diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h
index de6bb4aedd..3004fcd70d 100644
--- a/src/quick/items/qquickitem_p.h
+++ b/src/quick/items/qquickitem_p.h
@@ -441,8 +441,8 @@ public:
 
     // Bit 0
     quint32 flags:5;
-    bool widthValid:1;
-    bool heightValid:1;
+    bool widthValidFlag:1;
+    bool heightValidFlag:1;
     bool componentComplete:1;
     bool keepMouse:1;
     bool keepTouch:1;
@@ -578,6 +578,9 @@ public:
     qreal implicitWidth;
     qreal implicitHeight;
 
+    bool widthValid() const { return widthValidFlag || width.hasBinding(); }
+    bool heightValid() const { return heightValidFlag || height.hasBinding(); }
+
     qreal baselineOffset;
 
     QList<QQuickTransform *> transforms;