diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-25 18:19:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-25 18:19:02 (GMT) |
| commit | 8deaf82914c5ec8da7bc49f913d03a3754e1af0c (patch) | |
| tree | bd365a42b8398513432ad09e263b7592f258d395 /src/gui/graphicsview/qgraphicslinearlayout.cpp | |
| parent | 6f5ed5836bd96b69d47aa3260118b3b49dddc82f (diff) | |
| parent | 5c32919fdf549892d806c7f98bd4d9f82c771ca5 (diff) | |
| download | Qt-8deaf82914c5ec8da7bc49f913d03a3754e1af0c.zip Qt-8deaf82914c5ec8da7bc49f913d03a3754e1af0c.tar.gz Qt-8deaf82914c5ec8da7bc49f913d03a3754e1af0c.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (102 commits)
fix inf loop bug
Enable the no-undefined flag on the linker for icc
Fixed tst_qwidget::winIdChangeEvent
Prevent compilers optimizing eval timebomb code out of existence.
Fix incorrect example for Qt.rgba()
Flickable and MouseArea were too eager to take/keep mouse grab.
Allow javascript date and regexp objects in WorkerScript messages
Fix compliation of ALSA audio backend when checking for surround support.
Avoid lockup in ListView when animating delegates.
Fix asynchronous reload call in test, broken by previous submit
Use parent class function to generate Makefile headers in Symbian
Fix spaces
Fix QPixmap::fromImage() in the OpenVG pixmap backend.
Update QtGui emulator def file for bug QT-3971
Native color dialog on symbian
Fix non-stroked filled paths in OpenVG paint engine.
Ignore .pc/
Ensure WebView press delay timer is cancelled when grab is taken.
Prevent crash when calling reload() from within a .qml
Doc: Fixing typo
...
Diffstat (limited to 'src/gui/graphicsview/qgraphicslinearlayout.cpp')
| -rw-r--r-- | src/gui/graphicsview/qgraphicslinearlayout.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/graphicsview/qgraphicslinearlayout.cpp b/src/gui/graphicsview/qgraphicslinearlayout.cpp index 7e8d19f..244a728 100644 --- a/src/gui/graphicsview/qgraphicslinearlayout.cpp +++ b/src/gui/graphicsview/qgraphicslinearlayout.cpp @@ -75,7 +75,7 @@ is arranged according to the layout's alignment for that item. You can set an alignment for each item by calling setAlignment(), and check the alignment for any item by calling alignment(). By default, items are - centered both vertically and horizontally. + aligned to the top left. \section1 Spacing within QGraphicsLinearLayout @@ -446,7 +446,7 @@ void QGraphicsLinearLayout::setAlignment(QGraphicsLayoutItem *item, Qt::Alignmen /*! Returns the alignment for \a item. The default alignment is - Qt::AlignCenter. + Qt::AlignTop | Qt::AlignLeft. The alignment decides how the item is positioned within its assigned space in the case where there's more space available in the layout than the |