diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-11 07:40:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-11 07:40:32 +0200 |
| commit | 905329200f2f3f9372bf07a001371c30c0663684 (patch) | |
| tree | e6f072ea693c377ae306b3960f4bde36ee20bc17 /src/widgets/widgets/qwidgettextcontrol_p.h | |
| parent | 91cde062968f97041bca8d2a30d13aa03b606c3d (diff) | |
| parent | 1a78ef09b93b0a7337075555dc91032f39fab2a9 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/gui/image/qpixmap.cpp
src/widgets/kernel/qformlayout.cpp
Change-Id: I8a8391a202adf7f18464a22ddf0a6c4974eab692
Diffstat (limited to 'src/widgets/widgets/qwidgettextcontrol_p.h')
| -rw-r--r-- | src/widgets/widgets/qwidgettextcontrol_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/widgets/widgets/qwidgettextcontrol_p.h b/src/widgets/widgets/qwidgettextcontrol_p.h index e1687f83a3..b45f4fff74 100644 --- a/src/widgets/widgets/qwidgettextcontrol_p.h +++ b/src/widgets/widgets/qwidgettextcontrol_p.h @@ -173,6 +173,8 @@ public: bool isWordSelectionEnabled() const; void setWordSelectionEnabled(bool enabled); + bool isPreediting(); + void print(QPagedPaintDevice *printer) const; virtual int hitTest(const QPointF &point, Qt::HitTestAccuracy accuracy) const; |