diff options
| author | Jan-Arve Saether <jan-arve.saether@nokia.com> | 2012-05-23 14:58:55 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-30 01:54:45 +0200 |
| commit | 7cdcc267220db301080e7ade8e2f21e530e77b82 (patch) | |
| tree | c4d4db9978c7d5985a75b8942eb37c3b7952e9b5 /src/widgets/kernel/qsizepolicy.qdoc | |
| parent | ef204659b9c5d21c77a40c8bc11cd98039785303 (diff) | |
Fix Qt 5 todo issues for QSizePolicy.
* Merge the two public ctors.
* Use bitflags instead of shifting bits (more readable).
* Add autotest
* Use int datatype for the "stretch setters". (values out of bounds are clamped)
Streaming to QDataStream will still use the Qt 4 format.
Task-number: QTBUG-25100
Change-Id: Iecb1e78cb12717e4d84448484c3ad8ca469d571a
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Diffstat (limited to 'src/widgets/kernel/qsizepolicy.qdoc')
| -rw-r--r-- | src/widgets/kernel/qsizepolicy.qdoc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/kernel/qsizepolicy.qdoc b/src/widgets/kernel/qsizepolicy.qdoc index 670491e5dd..3c7d1e858e 100644 --- a/src/widgets/kernel/qsizepolicy.qdoc +++ b/src/widgets/kernel/qsizepolicy.qdoc @@ -319,19 +319,19 @@ */ /*! - \fn void QSizePolicy::setHorizontalStretch(uchar stretchFactor) + \fn void QSizePolicy::setHorizontalStretch(int stretchFactor) Sets the horizontal stretch factor of the size policy to the given \a - stretchFactor. + stretchFactor. \a stretchFactor must be in the range [0,255]. \sa horizontalStretch(), setVerticalStretch(), setHorizontalPolicy() */ /*! - \fn void QSizePolicy::setVerticalStretch(uchar stretchFactor) + \fn void QSizePolicy::setVerticalStretch(int stretchFactor) Sets the vertical stretch factor of the size policy to the given - \a stretchFactor. + \a stretchFactor. \a stretchFactor must be in the range [0,255]. \sa verticalStretch(), setHorizontalStretch(), setVerticalPolicy() */ |