diff options
| author | Liang Qi <[email protected]> | 2015-12-30 10:44:10 +0100 |
|---|---|---|
| committer | Liang Qi <[email protected]> | 2016-01-13 18:09:58 +0000 |
| commit | 24d06e7ab56bd8f0262d4135207adee20befc7c1 (patch) | |
| tree | 1c5d2e8a43cc6d9dba68a0d63b0743a0e80f8ee6 /src/quick/items/qquicktextedit.cpp | |
| parent | 1a4346d11224243b39da991585738d74fd03a98f (diff) | |
QQuickTextEdit: added preeditText property
Task-number: QTBUG-49503
Change-Id: I3390e72893e4125e00e8e0835a8d2fae11ea276f
Reviewed-by: J-P Nurmi <[email protected]>
Diffstat (limited to 'src/quick/items/qquicktextedit.cpp')
| -rw-r--r-- | src/quick/items/qquicktextedit.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index 8282c09770..0535bc4e6b 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -351,6 +351,19 @@ void QQuickTextEdit::setText(const QString &text) } /*! + \qmlproperty string QtQuick::TextEdit::preeditText + \readonly + \since 5.7 + + This property contains partial text input from an input method. +*/ +QString QQuickTextEdit::preeditText() const +{ + Q_D(const QQuickTextEdit); + return d->control->preeditText(); +} + +/*! \qmlproperty enumeration QtQuick::TextEdit::textFormat The way the text property should be displayed. @@ -2166,6 +2179,7 @@ void QQuickTextEditPrivate::init() qmlobject_connect(control, QQuickTextControl, SIGNAL(linkActivated(QString)), q, QQuickTextEdit, SIGNAL(linkActivated(QString))); qmlobject_connect(control, QQuickTextControl, SIGNAL(linkHovered(QString)), q, QQuickTextEdit, SIGNAL(linkHovered(QString))); qmlobject_connect(control, QQuickTextControl, SIGNAL(textChanged()), q, QQuickTextEdit, SLOT(q_textChanged())); + qmlobject_connect(control, QQuickTextControl, SIGNAL(preeditTextChanged()), q, QQuickTextEdit, SIGNAL(preeditTextChanged())); #ifndef QT_NO_CLIPBOARD qmlobject_connect(QGuiApplication::clipboard(), QClipboard, SIGNAL(dataChanged()), q, QQuickTextEdit, SLOT(q_canPasteChanged())); #endif |