diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-06-29 17:06:38 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-06 05:24:45 +0200 |
| commit | aeac9840e4c46786e84ab7eb16a89db22d4ff81a (patch) | |
| tree | 2aaae5a3dccfa9ee447f0896a659cc60caba5b86 /src/quick/items/qquickanchors_p.h | |
| parent | ea9c14f3e1a42080be03d95b825a7ba8ed303bbc (diff) | |
Allow all explicit margins to override margins.
Task-number: QTBUG-24515
Change-Id: Ibfc657dec9fd0c8e71cf3686a04ea7b00ad72c11
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/quick/items/qquickanchors_p.h')
| -rw-r--r-- | src/quick/items/qquickanchors_p.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/quick/items/qquickanchors_p.h b/src/quick/items/qquickanchors_p.h index 3fb3a7bd49..8890d23311 100644 --- a/src/quick/items/qquickanchors_p.h +++ b/src/quick/items/qquickanchors_p.h @@ -67,11 +67,11 @@ class Q_QUICK_PRIVATE_EXPORT QQuickAnchors : public QObject Q_PROPERTY(QQuickAnchorLine verticalCenter READ verticalCenter WRITE setVerticalCenter RESET resetVerticalCenter NOTIFY verticalCenterChanged) Q_PROPERTY(QQuickAnchorLine baseline READ baseline WRITE setBaseline RESET resetBaseline NOTIFY baselineChanged) Q_PROPERTY(qreal margins READ margins WRITE setMargins NOTIFY marginsChanged) - Q_PROPERTY(qreal leftMargin READ leftMargin WRITE setLeftMargin NOTIFY leftMarginChanged) - Q_PROPERTY(qreal rightMargin READ rightMargin WRITE setRightMargin NOTIFY rightMarginChanged) + Q_PROPERTY(qreal leftMargin READ leftMargin WRITE setLeftMargin RESET resetLeftMargin NOTIFY leftMarginChanged) + Q_PROPERTY(qreal rightMargin READ rightMargin WRITE setRightMargin RESET resetRightMargin NOTIFY rightMarginChanged) Q_PROPERTY(qreal horizontalCenterOffset READ horizontalCenterOffset WRITE setHorizontalCenterOffset NOTIFY horizontalCenterOffsetChanged) - Q_PROPERTY(qreal topMargin READ topMargin WRITE setTopMargin NOTIFY topMarginChanged) - Q_PROPERTY(qreal bottomMargin READ bottomMargin WRITE setBottomMargin NOTIFY bottomMarginChanged) + Q_PROPERTY(qreal topMargin READ topMargin WRITE setTopMargin RESET resetTopMargin NOTIFY topMarginChanged) + Q_PROPERTY(qreal bottomMargin READ bottomMargin WRITE setBottomMargin RESET resetBottomMargin NOTIFY bottomMarginChanged) Q_PROPERTY(qreal verticalCenterOffset READ verticalCenterOffset WRITE setVerticalCenterOffset NOTIFY verticalCenterOffsetChanged) Q_PROPERTY(qreal baselineOffset READ baselineOffset WRITE setBaselineOffset NOTIFY baselineOffsetChanged) Q_PROPERTY(QQuickItem *fill READ fill WRITE setFill RESET resetFill NOTIFY fillChanged) @@ -125,18 +125,22 @@ public: qreal leftMargin() const; void setLeftMargin(qreal); + void resetLeftMargin(); qreal rightMargin() const; void setRightMargin(qreal); + void resetRightMargin(); qreal horizontalCenterOffset() const; void setHorizontalCenterOffset(qreal); qreal topMargin() const; void setTopMargin(qreal); + void resetTopMargin(); qreal bottomMargin() const; void setBottomMargin(qreal); + void resetBottomMargin(); qreal margins() const; void setMargins(qreal); |