diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-20 13:24:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-20 13:24:42 (GMT) |
| commit | e1ffbc04131dc6f76fa76821c297d08162e4b1ee (patch) | |
| tree | 3759931edbad1f7dfbcdc11dc05cb0c161cf1073 /src/gui/widgets | |
| parent | 55b84a03e33b87e44b2e65ed1c02f93aa553c323 (diff) | |
| parent | 5184d55d434296710041812976656ed6825447ec (diff) | |
| download | Qt-e1ffbc04131dc6f76fa76821c297d08162e4b1ee.zip Qt-e1ffbc04131dc6f76fa76821c297d08162e4b1ee.tar.gz Qt-e1ffbc04131dc6f76fa76821c297d08162e4b1ee.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
QDeclarativeDebug: Fix endless loop for property with SCRITABLE false
Fix Symbian/Linux compilation breakage in plugins/qmltooling
Make QMLViewer startup animation stop after a while
Fix excessive scrolling in TextInput with mid string pre-edit text.
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qlinecontrol.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp index 5a281ad..d03e5de 100644 --- a/src/gui/widgets/qlinecontrol.cpp +++ b/src/gui/widgets/qlinecontrol.cpp @@ -435,7 +435,7 @@ void QLineControl::processInputMethodEvent(QInputMethodEvent *event) removeSelectedText(); } if (!event->commitString().isEmpty()) { - insert(event->commitString()); + internalInsert(event->commitString()); cursorPositionChanged = true; } |