diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-11 14:14:31 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-10-11 14:14:31 +0000 |
| commit | e166d7d1351834e21332ffd3b3523f06e691f26f (patch) | |
| tree | 3da8d74b30adb8bc50fc1b5932886dd72da31799 /src/widgets/widgets/qtextedit.cpp | |
| parent | 182f4877bf9d9ff6dc92912751d5c7c4fb746fcb (diff) | |
| parent | 905329200f2f3f9372bf07a001371c30c0663684 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8
Diffstat (limited to 'src/widgets/widgets/qtextedit.cpp')
| -rw-r--r-- | src/widgets/widgets/qtextedit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp index af6d13a647..f354495e70 100644 --- a/src/widgets/widgets/qtextedit.cpp +++ b/src/widgets/widgets/qtextedit.cpp @@ -1514,7 +1514,7 @@ void QTextEditPrivate::paint(QPainter *p, QPaintEvent *e) if (layout) layout->setViewport(QRect()); - if (!placeholderText.isEmpty() && doc->isEmpty()) { + if (!placeholderText.isEmpty() && doc->isEmpty() && !control->isPreediting()) { QColor col = control->palette().text().color(); col.setAlpha(128); p->setPen(col); |