diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-03 18:47:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-03 18:47:14 (GMT) |
| commit | c968e6602aef04aba4b68af205cd29ad18e0a823 (patch) | |
| tree | 5dee68c5bd2e691218bd45c7b74da7c7c16b22cd /src/tools | |
| parent | 5414957f0feebe24a2aa0ac7c5ec32e53e49b57a (diff) | |
| parent | 8ddf96a15f707001755d5b934f3f900b825b5887 (diff) | |
| download | Qt-c968e6602aef04aba4b68af205cd29ad18e0a823.zip Qt-c968e6602aef04aba4b68af205cd29ad18e0a823.tar.gz Qt-c968e6602aef04aba4b68af205cd29ad18e0a823.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: (133 commits)
Use the generic QVoltileImage implementation on S60 3.1 and 3.2.
Position the TextInput cursor correctly after IM text is commited.
fix DLLDESTDIR handling in nmake generator when QMAKE_POST_LINK is used
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.
un-document semicolon-splitting of INCLUDEPATH
Changed some parts of QVolatileImage autotest to be Symbian specific.
Have QVolatileImage backed by a bitmap in all cases.
Removing extra tabs from def file.
Don't return positions within preedit text from positionAt().
Add an is input method composing property to TextEdit and TextInput.
Fix style issue in qvgimagepool.cpp
Add internal function for releasing cached GPU resources.
Changed QPixmap VG backend to use CFbsBitmap on Symbian.
Fix typo in qglthreads auto test.
Add selected P1 tasks to changes file.
My 4.7.2 changes (cherry picked from commit ab38731fe5dcfaa1a7a70bc290a8856b5b01524d)
4.7.2 changes
...
Diffstat (limited to 'src/tools')
0 files changed, 0 insertions, 0 deletions