BorderImage: fix binding loop warning when binding to border properties

Give each border property its own change signal, but keep using the
borderChanged signal in the way it was being used previously.

It's not possible to auto test this, as there's no way to check
for binding loop warnings and the use case that fails doesn't cause
a noticeable difference in any properties that we could test.

Task-number: QTBUG-67901
Change-Id: Id5f029bc738ed15477c8d99ab8665ce78afbe5cf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

2 files changed, 12 insertions, 4 deletions

diff --git a/src/quick/items/qquickscalegrid.cpp b/src/quick/items/qquickscalegrid.cpp
index d7a0f1b681..23f179be1d 100644
--- a/src/quick/items/qquickscalegrid.cpp
+++ b/src/quick/items/qquickscalegrid.cpp
@@ -66,6 +66,7 @@ void QQuickScaleGrid::setLeft(int pos)
 {
     if (_left != pos) {
         _left = pos;
+        emit leftBorderChanged();
         emit borderChanged();
     }
 }
@@ -74,6 +75,7 @@ void QQuickScaleGrid::setTop(int pos)
 {
     if (_top != pos) {
         _top = pos;
+        emit topBorderChanged();
         emit borderChanged();
     }
 }
@@ -82,6 +84,7 @@ void QQuickScaleGrid::setRight(int pos)
 {
     if (_right != pos) {
         _right = pos;
+        emit rightBorderChanged();
         emit borderChanged();
     }
 }
@@ -90,6 +93,7 @@ void QQuickScaleGrid::setBottom(int pos)
 {
     if (_bottom != pos) {
         _bottom = pos;
+        emit bottomBorderChanged();
         emit borderChanged();
     }
 }
diff --git a/src/quick/items/qquickscalegrid_p_p.h b/src/quick/items/qquickscalegrid_p_p.h
index 5752f61e3f..f5187a8eea 100644
--- a/src/quick/items/qquickscalegrid_p_p.h
+++ b/src/quick/items/qquickscalegrid_p_p.h
@@ -65,10 +65,10 @@ class Q_AUTOTEST_EXPORT QQuickScaleGrid : public QObject
 {
     Q_OBJECT
 
-    Q_PROPERTY(int left READ left WRITE setLeft NOTIFY borderChanged)
-    Q_PROPERTY(int top READ top WRITE setTop NOTIFY borderChanged)
-    Q_PROPERTY(int right READ right WRITE setRight NOTIFY borderChanged)
-    Q_PROPERTY(int bottom READ bottom WRITE setBottom NOTIFY borderChanged)
+    Q_PROPERTY(int left READ left WRITE setLeft NOTIFY leftBorderChanged)
+    Q_PROPERTY(int top READ top WRITE setTop NOTIFY topBorderChanged)
+    Q_PROPERTY(int right READ right WRITE setRight NOTIFY rightBorderChanged)
+    Q_PROPERTY(int bottom READ bottom WRITE setBottom NOTIFY bottomBorderChanged)
 
 public:
     QQuickScaleGrid(QObject *parent=nullptr);
@@ -90,6 +90,10 @@ public:
 
 Q_SIGNALS:
     void borderChanged();
+    void leftBorderChanged();
+    void topBorderChanged();
+    void rightBorderChanged();
+    void bottomBorderChanged();
 
 private:
     int _left;