summaryrefslogtreecommitdiffstats
path: root/src/declarative/fx/qfxtext.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Remove an unused method in QFxItemLars Knoll2009-07-221-6/+0
| | | | | propertyInfo was not used by anything, let's just get rid of it.
* CompileEskil Abrahamsen Blomfeldt2009-07-171-16/+16
| | | | | Change 6626a9 broke compilation because several files indirectly depended on a #include that was removed.
* Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-101-4/+99
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv Conflicts: examples/itemviews/frozencolumn/main.cpp src/declarative/canvas/qsimplecanvas.cpp src/declarative/canvas/qsimplecanvas_p.h src/declarative/canvas/qsimplecanvasitem.h src/declarative/extra/qfxparticles.cpp src/declarative/fx/fx.pri src/declarative/fx/qfxblurfilter.h src/declarative/fx/qfxcontentwrapper.cpp src/declarative/fx/qfxflickable.cpp src/declarative/fx/qfxfocuspanel.h src/declarative/fx/qfxfocusrealm.h src/declarative/fx/qfxhighlightfilter.cpp src/declarative/fx/qfxhighlightfilter.h src/declarative/fx/qfximage.cpp src/declarative/fx/qfxitem.cpp src/declarative/fx/qfxitem.h src/declarative/fx/qfxrect.cpp src/declarative/fx/qfxreflectionfilter.h src/declarative/fx/qfxshadowfilter.cpp src/declarative/fx/qfxshadowfilter.h src/declarative/fx/qfxtext.cpp src/declarative/fx/qfxtext.h src/declarative/fx/qfxtextedit.cpp src/declarative/opengl/glbasicshaders.h src/declarative/test/qfxtestengine.cpp src/declarative/test/qfxtestengine.h src/declarative/test/qfxtestobjects.cpp src/declarative/test/qfxtestobjects.h src/declarative/test/qfxtestview.h src/declarative/util/qfxglobal.h src/declarative/util/qfxview.cpp src/gui/graphicsview/qgraphicsitem_p.h tools/qmlviewer/qmlviewer.cpp
| * Add textFormat property to the Text element.Michael Brasser2009-07-061-2/+73
| |
| * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-021-0/+25
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Add smooth property to Text element.Yann Bodson2009-07-021-0/+25
| | |
| * | Make performance logging classes private.Michael Brasser2009-07-021-1/+1
| |/
* | Merge branch 'kinetic-declarativeui' into kinetic-declarativeui-gvAaron Kennedy2009-06-241-1/+0
|\ \ | |/ | | | | | | | | | | Conflicts: src/declarative/canvas/qsimplecanvasitem.cpp src/declarative/canvas/qsimplecanvasitem_p.h src/declarative/fx/qfxwebview.cpp
| * Only objects or lists of objects can be default properties.Michael Brasser2009-06-221-1/+0
| |
* | Remove simple canvasAaron Kennedy2009-06-231-7/+0
| |
* | Remove OpenGL support from Fluid UI primitivesAaron Kennedy2009-06-191-88/+0
|/
* Fix OpenGL texture access issuesAaron Kennedy2009-06-091-6/+13
|
* Use POT textures onlyAaron Kennedy2009-06-031-6/+7
|
* OpenGL perf improvementsAaron Kennedy2009-06-031-82/+10
|
* Make compile under Open GL ES 2.Michael Brasser2009-05-291-1/+1
| | | | We will need to optimize the pixmap.toImage calls.
* Merge branch 'kinetic-declarativeui-pixmapopt' of ↵Michael Brasser2009-05-291-26/+28
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Switch from QImage to QPixmap, to allow OpenVG optimization.Warwick Allison2009-05-251-26/+28
| | | | | | | | | | | | | | Switch QFxPixmap to use QPixmapCache, not own partial QImage cache. OpenGL prefers QImage for optimization, but that optimization is only partially preserved (QFxPixmap deals ONLY with QPixmap now). Opaque QFxPixmap no longer available.
* | Remove extraneous semicolons.Martin Jones2009-05-261-1/+1
|/ | | | Caused massive number of warnings with winscw
* Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-221-1/+0
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * fix warningsWarwick Allison2009-05-211-1/+0
| |
* | Add support for baseline anchoring.Michael Brasser2009-05-221-4/+0
|/
* Don't recreate text layout everytime it is used.Michael Brasser2009-05-191-12/+6
|
* Clip text drawing to bounding rectAaron Kennedy2009-05-151-0/+9
|
* docWarwick Allison2009-05-011-14/+14
|
* Documentation work.Michael Brasser2009-04-301-28/+22
|
* Coding style refactor, changing 'if(' and 'for(' to 'if (' and 'for ('Leonardo Sobral Cunha2009-04-281-17/+17
|
* Documentation fixes.Michael Brasser2009-04-241-2/+0
| | | | | Reduce the number of warnings from qdoc. \todo's have been made into tasks instead.
* Merge in changes to old kinetic-dui branch.Michael Brasser2009-04-231-1/+1
|
* Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-221-0/+958
generated by cgit v0.12 at 2025-03-05 01:19:56 (GMT)