diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2015-03-06 11:16:18 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-03-06 11:16:18 +0000 |
| commit | 85c4904ec8d29ad8074bebef880ffe362ea3241e (patch) | |
| tree | b4b832881482f89cd2f7a2b05ece9d19162cb642 /src/quick/items/qquicktextedit.cpp | |
| parent | b049085a2c13abe9cf89308d02a90b9a0be6cde1 (diff) | |
| parent | a005dcb57eb2938032c3e4c983ea04472190455c (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'src/quick/items/qquicktextedit.cpp')
| -rw-r--r-- | src/quick/items/qquicktextedit.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index db66e333d3..29300644b9 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -2348,7 +2348,14 @@ void QQuickTextEdit::updateWholeDocument() void QQuickTextEdit::invalidateBlock(const QTextBlock &block) { + Q_D(QQuickTextEdit); markDirtyNodesForRange(block.position(), block.position() + block.length(), 0); + + polish(); + if (isComponentComplete()) { + d->updateType = QQuickTextEditPrivate::UpdatePaintNode; + update(); + } } void QQuickTextEdit::updateCursor() @@ -2457,12 +2464,12 @@ void QQuickTextEditPrivate::handleFocusEvent(QFocusEvent *event) #ifndef QT_NO_IM if (focusOnPress && !q->isReadOnly()) qGuiApp->inputMethod()->show(); - q->connect(qApp->inputMethod(), SIGNAL(inputDirectionChanged(Qt::LayoutDirection)), + q->connect(QGuiApplication::inputMethod(), SIGNAL(inputDirectionChanged(Qt::LayoutDirection)), q, SLOT(q_updateAlignment())); #endif } else { #ifndef QT_NO_IM - q->disconnect(qApp->inputMethod(), SIGNAL(inputDirectionChanged(Qt::LayoutDirection)), + q->disconnect(QGuiApplication::inputMethod(), SIGNAL(inputDirectionChanged(Qt::LayoutDirection)), q, SLOT(q_updateAlignment())); #endif emit q->editingFinished(); |