diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-20 19:12:17 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-20 19:12:17 (GMT) |
| commit | a334ad303d2763cd53fc5bd62945d08d3555b8a7 (patch) | |
| tree | d8db1cdd55af236fd212385f8d7990ef424a5f8c /src/gui/text | |
| parent | 7ef9f99301a7c71fdb835f9e1f27d3111557aa2e (diff) | |
| parent | 36e0a25a36823a9c425851fc742ce1b3df9060ca (diff) | |
| download | Qt-a334ad303d2763cd53fc5bd62945d08d3555b8a7.zip Qt-a334ad303d2763cd53fc5bd62945d08d3555b8a7.tar.gz Qt-a334ad303d2763cd53fc5bd62945d08d3555b8a7.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (69 commits)
Fix compilation with symbian-armcc
Updated Russian translation
Ukrainian translation updated
Fix wrong merge of 3aa39b0164ce4bb9e
Symbol table is very limited in numeric input mode
Fix build of Qt/DirectFB without graphics view support.
Add new QSysInfo::symbianVersion() enums
QDesktopServices::openUrl() doesn't handle URL encodings correctly
Build fix for transition effect support on S60 5.0.
Make EGL surface transparency working on Symbian.
QmlDebug: Fix license headers in new ost plugin
Fixed autotest after b4b85257ccff6ba21bcbcbd46a9f7f09884abe79
Resolve unqualified attached properties correctly
Adding plugin qmltooling/qmlostplugin for QML debugging over OST (USB) on Symbian.
QmlDebug: Rename 'tcpserver' library to 'qmldbg_tcp'
QDeclarativeDebug: Don't crash when connection is closed
Splitview flag should also be updated to inputcontext
QGraphicsView with vertical scrollbar flickers when splitview opens
Splitview: opening a context menu should not re-position of focusItem
Trigger fullscreen transition effects properly on app exit.
...
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qtextcontrol.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp index 66ce64b..faf4e77 100644 --- a/src/gui/text/qtextcontrol.cpp +++ b/src/gui/text/qtextcontrol.cpp @@ -1951,6 +1951,7 @@ void QTextControlPrivate::inputMethodEvent(QInputMethodEvent *e) if (isGettingInput) layout->setPreeditArea(cursor.position() - block.position(), e->preeditString()); QList<QTextLayout::FormatRange> overrides; + const int oldPreeditCursor = preeditCursor; preeditCursor = e->preeditString().length(); hideCursor = false; for (int i = 0; i < e->attributes().size(); ++i) { @@ -1973,6 +1974,8 @@ void QTextControlPrivate::inputMethodEvent(QInputMethodEvent *e) cursor.endEditBlock(); if (cursor.d) cursor.d->setX(); + if (oldPreeditCursor != preeditCursor) + emit q->microFocusChanged(); } QVariant QTextControl::inputMethodQuery(Qt::InputMethodQuery property) const |