diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-11-17 06:39:13 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-11-17 06:39:13 (GMT) |
| commit | 10bfafde6e893b0ef9e747fb7c6bffcf11f5c112 (patch) | |
| tree | 64f5a8c9ba5458489db8439295ae71af0b6346ea /src/declarative/graphicsitems | |
| parent | b7fe8bdad08cc87130a131c657af4cdeaa6efa79 (diff) | |
| parent | cee1c78e0def34a0c4303ce70dc8611fd775a912 (diff) | |
| download | Qt-10bfafde6e893b0ef9e747fb7c6bffcf11f5c112.zip Qt-10bfafde6e893b0ef9e747fb7c6bffcf11f5c112.tar.gz Qt-10bfafde6e893b0ef9e747fb7c6bffcf11f5c112.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/graphicsitems')
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicsitem.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.h b/src/declarative/graphicsitems/qmlgraphicsitem.h index 11d6e2e..d092896 100644 --- a/src/declarative/graphicsitems/qmlgraphicsitem.h +++ b/src/declarative/graphicsitems/qmlgraphicsitem.h @@ -157,6 +157,14 @@ public: bool keepMouseGrab() const; void setKeepMouseGrab(bool); + QmlGraphicsAnchorLine left() const; + QmlGraphicsAnchorLine right() const; + QmlGraphicsAnchorLine horizontalCenter() const; + QmlGraphicsAnchorLine top() const; + QmlGraphicsAnchorLine bottom() const; + QmlGraphicsAnchorLine verticalCenter() const; + QmlGraphicsAnchorLine baseline() const; + Q_SIGNALS: void widthChanged(); void heightChanged(); @@ -193,15 +201,6 @@ protected: QmlGraphicsItem(QmlGraphicsItemPrivate &dd, QmlGraphicsItem *parent = 0); private: - // ### public? - QmlGraphicsAnchorLine left() const; - QmlGraphicsAnchorLine right() const; - QmlGraphicsAnchorLine horizontalCenter() const; - QmlGraphicsAnchorLine top() const; - QmlGraphicsAnchorLine bottom() const; - QmlGraphicsAnchorLine verticalCenter() const; - QmlGraphicsAnchorLine baseline() const; - friend class QmlStatePrivate; friend class QmlGraphicsAnchors; Q_DISABLE_COPY(QmlGraphicsItem) |