diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-02 09:17:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-02 09:17:48 (GMT) |
| commit | b31b4c46e70401745572b808c916088afb839614 (patch) | |
| tree | ac7d9b722b515dcfd3fcc32a6939c9a01748811d /demos/browser/tabwidget.cpp | |
| parent | a7c557dad0d5a1024a048eef27c6cf77ffb60113 (diff) | |
| parent | 2123a7ff6a04aec331fada5e03aa99395a0de1db (diff) | |
| download | Qt-b31b4c46e70401745572b808c916088afb839614.zip Qt-b31b4c46e70401745572b808c916088afb839614.tar.gz Qt-b31b4c46e70401745572b808c916088afb839614.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:
Make the TextInput cursorRectangle relative to the item.
Don't assert if font engine creates new glyphs
Doc: remove experimental GestureArea from contents and add PinchArea
Add QML file for TextEdit positionAt test.
Don't return positions within preedit text from positionAt().
Add an is input method composing property to TextEdit and TextInput.
Diffstat (limited to 'demos/browser/tabwidget.cpp')
0 files changed, 0 insertions, 0 deletions