diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-07 04:16:46 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-07 04:16:46 (GMT) |
| commit | e429284e7d6f6639d5e07c113c45f400a02a8fa1 (patch) | |
| tree | 36949f3ebf25dbdd93e68fd4be706c2f5effcc94 /src/declarative/graphicsitems/qdeclarativetextedit_p.h | |
| parent | 19f55bfa5bf15b5593f3021071374dbe2f71f8c8 (diff) | |
| parent | b4b1b118015d1dcef63b065a609234a18f332ba4 (diff) | |
| download | Qt-e429284e7d6f6639d5e07c113c45f400a02a8fa1.zip Qt-e429284e7d6f6639d5e07c113c45f400a02a8fa1.tar.gz Qt-e429284e7d6f6639d5e07c113c45f400a02a8fa1.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: (35 commits)
Make Text, TextInput, and TextEdit all have the same size for the same text.
More generated images in anticipation of QT-3574
Remove deprecated Flickable.flickDirection
Revert "Fix exponential behavior of QTextCursor::removeSelectedText"
Prevent a recursive debug output loop when writing to the logger widget.
Fix performance of QTextDocumentPrivate::adjustDocumentChangesAndCursors
Convert QtDeclarative def files to use LF line endings
Update QtDeclarative def files
doc improvements
Changing currentIndex shouldn't cancel a flick unnecessarily.
Fix input methods for TextInput elements with key handlers
Document the QML enumeration basic type
Fix TextEdit with no color property defined is drawn with wrong color
Export QDeclarativePixmap
doc
Fix inconsistent reporting of module import errors when using versions.
Make declarative pixmap cache easier to use
Prepare for QTest persistent store for visual tests.
Loosen font-sensitive test.
Set correct license header.
...
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextedit_p.h')
0 files changed, 0 insertions, 0 deletions