diff options
author | David Boddie <dboddie@trolltech.com> | 2010-09-01 11:20:14 (GMT) |
---|---|---|
committer | David Boddie <dboddie@trolltech.com> | 2010-09-01 11:20:14 (GMT) |
commit | 61403e81d411b82e8a9ac5e3228267bf9ae0e8e1 (patch) | |
tree | 0562a4dcf0bcc5365f6cfe7a630f370ef3d471fc /src/declarative/graphicsitems/qdeclarativegraphicswidget.cpp | |
parent | 2e8419e43ce4d5be64bddf1b5b5f5ea9e28c55de (diff) | |
parent | 63129c8bd21bfdc8110680296bb3bc1ab5e43343 (diff) | |
download | Qt-61403e81d411b82e8a9ac5e3228267bf9ae0e8e1.zip Qt-61403e81d411b82e8a9ac5e3228267bf9ae0e8e1.tar.gz Qt-61403e81d411b82e8a9ac5e3228267bf9ae0e8e1.tar.bz2 |
Merge branch '4.7' into qmldocs
Conflicts:
src/declarative/graphicsitems/qdeclarativetext.cpp
src/declarative/graphicsitems/qdeclarativetextedit.cpp
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativegraphicswidget.cpp')
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativegraphicswidget.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativegraphicswidget.cpp b/src/declarative/graphicsitems/qdeclarativegraphicswidget.cpp index ee45406..d45fe83 100644 --- a/src/declarative/graphicsitems/qdeclarativegraphicswidget.cpp +++ b/src/declarative/graphicsitems/qdeclarativegraphicswidget.cpp @@ -68,7 +68,6 @@ QDeclarativeGraphicsWidget::~QDeclarativeGraphicsWidget() delete d->_anchors; d->_anchors = 0; } -/*! \internal */ QDeclarativeAnchors *QDeclarativeGraphicsWidget::anchors() { Q_D(QDeclarativeGraphicsWidget); @@ -85,54 +84,36 @@ QDeclarativeItemPrivate::AnchorLines *QDeclarativeGraphicsWidgetPrivate::anchorL return _anchorLines; } -/*! - \internal -*/ QDeclarativeAnchorLine QDeclarativeGraphicsWidget::left() const { Q_D(const QDeclarativeGraphicsWidget); return d->anchorLines()->left; } -/*! - \internal -*/ QDeclarativeAnchorLine QDeclarativeGraphicsWidget::right() const { Q_D(const QDeclarativeGraphicsWidget); return d->anchorLines()->right; } -/*! - \internal -*/ QDeclarativeAnchorLine QDeclarativeGraphicsWidget::horizontalCenter() const { Q_D(const QDeclarativeGraphicsWidget); return d->anchorLines()->hCenter; } -/*! - \internal -*/ QDeclarativeAnchorLine QDeclarativeGraphicsWidget::top() const { Q_D(const QDeclarativeGraphicsWidget); return d->anchorLines()->top; } -/*! - \internal -*/ QDeclarativeAnchorLine QDeclarativeGraphicsWidget::bottom() const { Q_D(const QDeclarativeGraphicsWidget); return d->anchorLines()->bottom; } -/*! - \internal -*/ QDeclarativeAnchorLine QDeclarativeGraphicsWidget::verticalCenter() const { Q_D(const QDeclarativeGraphicsWidget); |