diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:21 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:35 +0200 |
| commit | d0eb444a49f6064ecb896f62276e060cd8a4b1e8 (patch) | |
| tree | 34d8dd637baf665225ada73e76604531cd2c75e5 /src/widgets/graphicsview/qgridlayoutengine.cpp | |
| parent | da0cb32b8ee7cc4a991a59420a411898e63a660e (diff) | |
| parent | 894f86709080fe8d20875b402adce679963c49c2 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ib8cfeee7d9ca15e8ad520e428b72c200827a8628
Diffstat (limited to 'src/widgets/graphicsview/qgridlayoutengine.cpp')
| -rw-r--r-- | src/widgets/graphicsview/qgridlayoutengine.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/graphicsview/qgridlayoutengine.cpp b/src/widgets/graphicsview/qgridlayoutengine.cpp index f7419622648..a1affdb55e8 100644 --- a/src/widgets/graphicsview/qgridlayoutengine.cpp +++ b/src/widgets/graphicsview/qgridlayoutengine.cpp @@ -570,7 +570,7 @@ QSizePolicy::Policy QGridLayoutItem::sizePolicy(Qt::Orientation orientation) con } /* - returns true if the size policy returns true for either hasHeightForWidth() + returns \c true if the size policy returns \c true for either hasHeightForWidth() or hasWidthForHeight() */ bool QGridLayoutItem::hasDynamicConstraint() const @@ -1657,7 +1657,7 @@ void QGridLayoutEngine::ensureColumnAndRowData(QGridLayoutRowData *rowData, QGri } /** - returns false if the layout has contradicting constraints (i.e. some items with a horizontal + returns \c false if the layout has contradicting constraints (i.e. some items with a horizontal constraint and other items with a vertical constraint) */ bool QGridLayoutEngine::ensureDynamicConstraint() const @@ -1691,7 +1691,7 @@ bool QGridLayoutEngine::hasDynamicConstraint() const } /* - * return value is only valid if hasConstraint() returns true + * return value is only valid if hasConstraint() returns \c true */ Qt::Orientation QGridLayoutEngine::constraintOrientation() const { |