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/qdeclarativepositioners.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/qdeclarativepositioners.cpp')
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativepositioners.cpp | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp index 149e822..973e42c 100644 --- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp +++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp @@ -108,8 +108,7 @@ void QDeclarativeBasePositioner::graphicsWidgetGeometryChanged() You also need to set a PositionerType, to declare whether you are positioning the x, y or both for the child items. Depending on the chosen type, only x or y changes will be applied. - Note that the subclass is responsible for adding the - spacing in between items. + Note that the subclass is responsible for adding the spacing in between items. */ QDeclarativeBasePositioner::QDeclarativeBasePositioner(PositionerType at, QDeclarativeItem *parent) : QDeclarativeItem(*(new QDeclarativeBasePositionerPrivate), parent) @@ -438,11 +437,6 @@ static inline bool isInvisible(QGraphicsObject *child) \sa Grid::spacing */ -/*! - \internal - \class QDeclarativeColumn - \brief The QDeclarativeColumn class lines up items vertically. -*/ QDeclarativeColumn::QDeclarativeColumn(QDeclarativeItem *parent) : QDeclarativeBasePositioner(Vertical, parent) { @@ -585,11 +579,6 @@ void QDeclarativeColumn::reportConflictingAnchors() \sa Grid::spacing */ -/*! - \internal - \class QDeclarativeRow - \brief The QDeclarativeRow class lines up items horizontally. -*/ QDeclarativeRow::QDeclarativeRow(QDeclarativeItem *parent) : QDeclarativeBasePositioner(Horizontal, parent) { @@ -748,11 +737,6 @@ void QDeclarativeRow::reportConflictingAnchors() \sa rows, columns */ -/*! - \internal - \class QDeclarativeGrid - \brief The QDeclarativeGrid class lays out items in a grid. -*/ QDeclarativeGrid::QDeclarativeGrid(QDeclarativeItem *parent) : QDeclarativeBasePositioner(Both, parent), m_rows(-1), m_columns(-1), m_flow(LeftToRight) { |