diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-09-10 11:41:29 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-09-10 11:42:50 +0200 |
| commit | d572ab1bb446e880fcb8d27294ba8149550f1659 (patch) | |
| tree | d29c449b551e47569c6d9f146ba9e86810c05353 /src/widgets/widgets/qlineedit.cpp | |
| parent | 211cef46f6d9d8738c09f906f9c0c3080b445dc8 (diff) | |
| parent | 71df09b6cca7cd7a673bf39f49d0dda28b78a860 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: Id4997327cc01bd4bb397a463bdffbd15e80398ef
Diffstat (limited to 'src/widgets/widgets/qlineedit.cpp')
| -rw-r--r-- | src/widgets/widgets/qlineedit.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp index 2eb04d146e..213e72183f 100644 --- a/src/widgets/widgets/qlineedit.cpp +++ b/src/widgets/widgets/qlineedit.cpp @@ -1877,14 +1877,12 @@ void QLineEdit::paintEvent(QPaintEvent *) { Q_D(QLineEdit); QPainter p(this); - - QRect r = rect(); QPalette pal = palette(); QStyleOptionFrameV2 panel; initStyleOption(&panel); style()->drawPrimitive(QStyle::PE_PanelLineEdit, &panel, &p, this); - r = style()->subElementRect(QStyle::SE_LineEditContents, &panel, this); + QRect r = style()->subElementRect(QStyle::SE_LineEditContents, &panel, this); r.setX(r.x() + d->effectiveLeftTextMargin()); r.setY(r.y() + d->topTextMargin); r.setRight(r.right() - d->effectiveRightTextMargin()); |