aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickscalegrid_p_p.h
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2018-05-09 13:14:45 +0200
committerMitch Curtis <mitch.curtis@qt.io>2018-05-09 11:57:23 +0000
commit20a5d1ab3f47b4da6ba39143beaafedb26dbad6a (patch)
treeb6d0c7573ad6cc68238e9d5c72c8347eaf1a9022 /src/quick/items/qquickscalegrid_p_p.h
parentbbcf4193b35e3931205d32e87c0c3de9f68cc584 (diff)
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>
Diffstat (limited to 'src/quick/items/qquickscalegrid_p_p.h')
-rw-r--r--src/quick/items/qquickscalegrid_p_p.h12
1 files changed, 8 insertions, 4 deletions
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;