diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-04 10:23:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-04 10:23:21 (GMT) |
| commit | 337dbd5391b4e2b1bd88918a46f3392df8fd1312 (patch) | |
| tree | 0f065124c11ffbec256924e36baee2ba1fc0e069 /src/declarative/graphicsitems/qdeclarativeanchors.cpp | |
| parent | ffa103af9620998f47c632f4118e789bf7f1cde7 (diff) | |
| parent | a5aadcea4c12c7926bf3b4d218ce476723cd7e10 (diff) | |
| download | Qt-337dbd5391b4e2b1bd88918a46f3392df8fd1312.zip Qt-337dbd5391b4e2b1bd88918a46f3392df8fd1312.tar.gz Qt-337dbd5391b4e2b1bd88918a46f3392df8fd1312.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (74 commits)
Optimization for QDeclarativePaintedItem.
Update childrenRect when children are added or removed.
Optimize childrenRect.
Remove obsolete doc groupings.
Doc improvements
Remove QDeclarativeLoader::resizeMode
Don't create an anchors element so that we can check that there aren't any
Ensure eval and Function are in the correct scope
Add availableFonts.qml for fonts examples.
Add Qt.fontFamilies() method
Avoid regenerating PathView delegates needlessly
When a model delegate is released, remove it from the scene immediately.
Fix assignment of value types to javascript var.
More doc fixes
Make QDeclarativeParserStatus method pure virtual to encourage right code.
Doc fixes
Fix error string
Add QML value types for math3d types
Fix assert in qdeclarativepathview
Avoid divisions by zero in qdeclarativetimeline
...
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeanchors.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeanchors.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeanchors.cpp b/src/declarative/graphicsitems/qdeclarativeanchors.cpp index f15316b..ef07cbb 100644 --- a/src/declarative/graphicsitems/qdeclarativeanchors.cpp +++ b/src/declarative/graphicsitems/qdeclarativeanchors.cpp @@ -128,7 +128,6 @@ static qreal adjustedPosition(QGraphicsObject *item, QDeclarativeAnchorLine::Anc \internal \class QDeclarativeAnchors \since 4.7 - \ingroup group_layouts \brief The QDeclarativeAnchors class provides a way to lay out items relative to other items. \warning Currently, only anchoring to siblings or parent is supported. |