diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2015-03-06 11:03:27 +0100 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2015-03-06 11:05:09 +0100 |
| commit | a005dcb57eb2938032c3e4c983ea04472190455c (patch) | |
| tree | b6b064e257c4d76708e5a52fed3e1a80660790d3 /src/quick/items/qquicktextedit.cpp | |
| parent | e7c18e2a2b39f35667e76aaafa7135bde161a806 (diff) | |
| parent | af9e21cd91abcff9e084161cb7ed15fbedc8f931 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/quick/items/qquicktextedit.cpp
Change-Id: I354093ceb996aae40254f2143dec2bb74cf5eb17
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 a6755d84d7..729624c904 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -2292,7 +2292,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() @@ -2401,12 +2408,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(); |