diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2009-05-20 16:43:10 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2009-05-20 16:43:10 (GMT) |
| commit | bfde87dcc8d0f363ecf1da59482c15445b00484c (patch) | |
| tree | 0d0c01b1611caf91ba900bd2b67a8806590254cc /src/gui/widgets/qlineedit.cpp | |
| parent | 27fadaa7eb2d58b47e7f0f508e3402e7a8de3894 (diff) | |
| parent | f9d26f0bebd5bcc32d15c4a627251c44cf78389e (diff) | |
| download | Qt-bfde87dcc8d0f363ecf1da59482c15445b00484c.zip Qt-bfde87dcc8d0f363ecf1da59482c15445b00484c.tar.gz Qt-bfde87dcc8d0f363ecf1da59482c15445b00484c.tar.bz2 | |
Merge commit 'qt/master'
Diffstat (limited to 'src/gui/widgets/qlineedit.cpp')
| -rw-r--r-- | src/gui/widgets/qlineedit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qlineedit.cpp b/src/gui/widgets/qlineedit.cpp index d16ed10..128f243 100644 --- a/src/gui/widgets/qlineedit.cpp +++ b/src/gui/widgets/qlineedit.cpp @@ -3675,7 +3675,7 @@ void QLineEditPrivate::redo() { /*! \fn int QLineEdit::margin() const - Returns the with of the the margin around the contents of the widget. + Returns the width of the margin around the contents of the widget. Use QWidget::getContentsMargins() instead. \sa setMargin(), QWidget::getContentsMargins() |