summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@nokia.com>2009-07-25 13:31:15 (GMT)
committerVolker Hilsheimer <volker.hilsheimer@nokia.com>2009-07-25 13:31:15 (GMT)
commit04a7da1d0dc68d15b3c620e902f1d9cc1e37ef20 (patch)
tree233708b67a5bd65315fd9d86837da9e038aba4ba /src/gui/kernel
parente04323202c2ca99b1ec879d47af25a5d021d7647 (diff)
downloadQt-04a7da1d0dc68d15b3c620e902f1d9cc1e37ef20.zip
Qt-04a7da1d0dc68d15b3c620e902f1d9cc1e37ef20.tar.gz
Qt-04a7da1d0dc68d15b3c620e902f1d9cc1e37ef20.tar.bz2
Doc: Replace links to obsolete APIs.
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qgridlayout.cpp19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/gui/kernel/qgridlayout.cpp b/src/gui/kernel/qgridlayout.cpp
index 8dbc3cb..7ac874e 100644
--- a/src/gui/kernel/qgridlayout.cpp
+++ b/src/gui/kernel/qgridlayout.cpp
@@ -1034,14 +1034,15 @@ QRect QGridLayoutPrivate::cellRect(int row, int col) const
other layouts into the cells of your grid layout using
addWidget(), addItem(), and addLayout().
- QGridLayout also includes two margin widths: the margin() and the
- spacing(). The margin is the width of the reserved space along
- each of the QGridLayout's four sides. The spacing is the width of
- the automatically allocated spacing between neighboring boxes.
-
- The default margin() and spacing() values are provided by the
- style. The default margin Qt styles specify is 9 for child
- widgets and 11 for windows. The spacing defaults to the same as
+ QGridLayout also includes two margin widths:
+ the \l{getContentsMargins()}{contents margin} and the spacing().
+ The contents margin is the width of the reserved space along each
+ of the QGridLayout's four sides. The spacing() is the width of the
+ automatically allocated spacing between neighboring boxes.
+
+ The default contents margin values are provided by the
+ \l{QStyle::pixelMetric()}{style}. The default value Qt styles specify
+ is 9 for child widgets and 11 for windows. The spacing defaults to the same as
the margin width for a top-level layout, or to the same as the
parent layout.
@@ -1078,7 +1079,7 @@ QGridLayout::QGridLayout()
#ifdef QT3_SUPPORT
/*!
- \obsolete
+ \obsolete
Constructs a new QGridLayout with \a nRows rows, \a nCols columns
and parent widget, \a parent. \a parent may not be 0. The grid
layout is called \a name.