diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-02 15:27:38 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-03 16:30:44 +0000 |
| commit | cd3b88c5949de902b5ee83711264dcab398df8eb (patch) | |
| tree | f1f9a79fdd48c7ab7b001f37a500a3a1803cd9f2 /src | |
| parent | a6c752333d6dbe76e07db39684fdb878f5fbf865 (diff) | |
TextEdit: add editingFinished signal
Autotest is included.
[ChangeLog][TextEdit] add editingFinished signal
Task-number: QTBUG-44734
Change-Id: Ib632e589419758bea09442e6efcf4d977b9a13e8
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quick/items/qquickitemsmodule.cpp | 2 | ||||
| -rw-r--r-- | src/quick/items/qquicktextedit.cpp | 12 | ||||
| -rw-r--r-- | src/quick/items/qquicktextedit_p.h | 1 |
3 files changed, 15 insertions, 0 deletions
diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp index b1116bdb64..94bfd9ba4e 100644 --- a/src/quick/items/qquickitemsmodule.cpp +++ b/src/quick/items/qquickitemsmodule.cpp @@ -267,6 +267,8 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor) qmlRegisterUncreatableType<QQuickOpenGLInfo>(uri, 2, 4,"OpenGLInfo", QQuickOpenGLInfo::tr("OpenGLInfo is only available via attached properties")); qmlRegisterType<QQuickPinchArea, 1>(uri, 2, 5,"PinchArea"); + + qmlRegisterType<QQuickTextEdit, 6>(uri, 2, 6, "TextEdit"); } static void initResources() diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index 20416da69a..a6755d84d7 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -2403,10 +2403,13 @@ void QQuickTextEditPrivate::handleFocusEvent(QFocusEvent *event) qGuiApp->inputMethod()->show(); q->connect(qApp->inputMethod(), SIGNAL(inputDirectionChanged(Qt::LayoutDirection)), q, SLOT(q_updateAlignment())); +#endif } else { +#ifndef QT_NO_IM q->disconnect(qApp->inputMethod(), SIGNAL(inputDirectionChanged(Qt::LayoutDirection)), q, SLOT(q_updateAlignment())); #endif + emit q->editingFinished(); } } @@ -2575,6 +2578,15 @@ bool QQuickTextEditPrivate::isLinkHoveredConnected() */ /*! + \qmlsignal QtQuick::TextEdit::editingFinished() + \since 5.6 + + This signal is emitted when the text edit loses focus. + + The corresponding handler is \c onEditingFinished. +*/ + +/*! \qmlproperty string QtQuick::TextEdit::hoveredLink \since 5.2 diff --git a/src/quick/items/qquicktextedit_p.h b/src/quick/items/qquicktextedit_p.h index bf6763f772..c260cea146 100644 --- a/src/quick/items/qquicktextedit_p.h +++ b/src/quick/items/qquicktextedit_p.h @@ -283,6 +283,7 @@ Q_SIGNALS: void baseUrlChanged(); void inputMethodHintsChanged(); void renderTypeChanged(); + Q_REVISION(6) void editingFinished(); public Q_SLOTS: void selectAll(); |