aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/items/qsgtext.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Update licenseheader text in source files for qtdeclarative Qt moduleJyri Tahtela2011-07-081-17/+17
| | | | | | | | Replace old license header with correct one. Change-Id: I492ddaaa0227b2c8faf11bdcd6e12e7231a54a10 Reviewed-on: http://codereview.qt.nokia.com/1312 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Merge branch 'master' into qtquick2Gunnar Sletta2011-06-151-1/+0
|\ | | | | | | | | | | | | | | | | Conflicts: src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp Change-Id: Id2267925c4f77b41f63bbbf555b816ca1f55a0ec
| * Doc: Cleaned up the scene graph documentation a little.David Boddie2011-06-091-1/+0
| |
* | Make complex rich text works with the threaded renderer.Yoann Lopes2011-06-011-9/+24
| | | | | | | | Painting must be done from the GUI thread.
* | Fix images not being rendered when embedded in a rich text.Yoann Lopes2011-06-011-9/+7
| | | | | | | | | | | | | | | | | | In that case the whole text is cached in a QImage, but that cache was not updated when the embedded image was finished to be loaded. Depends on ac7dcaec90d7603cd4dd80cdb3dcbdc689f376c2. Task-number: QTBUG-19428
* | Avoid recursive updates in QSGText.Yoann Lopes2011-05-311-2/+7
|/
* Fix potential crash when displaying multiscripted textEskil Abrahamsen Blomfeldt2011-05-061-1/+7
| | | | | | | | | | | | | | Shaping has to be done in the current thread, otherwise the font engines index for each glyph (referenced in the msb of the glyph index) might not be valid yet, because the font engines list is populated when shaping is done. So we need to make sure that the render thread relayouts. Geometry changes will already cause a relayout, which will in turn cause another relayout when the paint node is updated. There doesn't seem to be any convenient and safe way of avoiding this doubling of the layout step if we want to have rendering in a different thread than the QML graph. Reviewed-by: Gunnar
* Update SG items with GV item changes.Martin Jones2011-05-041-6/+18
|
* Make text align in the same baselineJiang Jiang2011-04-291-3/+0
| | | | (cherry picked from commit 3f0e1ac647cc8ab700b85772264bc2a95e5301fa)
* Initial import from qtquick2.Qt by Nokia2011-04-271-0/+1240
Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469