summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | Merge branch '4.6' into qstatictext-4.6Eskil Abrahamsen Blomfeldt2010-02-10380-9220/+2627
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Use glDrawElements and triangle strips to draw glyphs in GL engineEskil Abrahamsen Blomfeldt2010-02-093-4/+34
| | * | | | | | Remove VBO caching and glDrawElements path in QStaticTextEskil Abrahamsen Blomfeldt2010-02-081-124/+43
| | * | | | | | Merge branch '4.6' into qstatictext-4.6Eskil Abrahamsen Blomfeldt2010-02-0857-470/+1296
| | |\ \ \ \ \ \
| | * | | | | | | Remove redundant friend declaration for QPainterPrivate in QPainterEskil Abrahamsen Blomfeldt2010-02-051-1/+0
| | * | | | | | | Add tests for using QStaticText with a QGLWidgetEskil Abrahamsen Blomfeldt2010-02-052-1/+212
| | * | | | | | | Temporarily remove QPainter::drawStaticText() for Qt 4.6.x integrationEskil Abrahamsen Blomfeldt2010-02-058-119/+106
| | * | | | | | | Clean up VBOs cached in QStaticText when context is deletedEskil Abrahamsen Blomfeldt2010-02-051-18/+36
| | * | | | | | | Use state in QPaintBuffer rather than search for the transform cmdEskil Abrahamsen Blomfeldt2010-02-051-10/+1
| | * | | | | | | Add explanatory comment to QGL2PaintEngineExPrivate::drawCachedGlyphsEskil Abrahamsen Blomfeldt2010-02-051-0/+3
| | * | | | | | | Recreate cached vertex arrays for QStaticText when drawn to new contextEskil Abrahamsen Blomfeldt2010-02-051-3/+11
| | * | | | | | | Revert changes made to QTextEngine for QStaticTextEskil Abrahamsen Blomfeldt2010-02-042-68/+1
| | * | | | | | | Clean up diff for QStaticTextEskil Abrahamsen Blomfeldt2010-02-042-3/+2
| | * | | | | | | Remove unused codeEskil Abrahamsen Blomfeldt2010-02-041-7/+0
| | * | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into qstat...Eskil Abrahamsen Blomfeldt2010-02-04173-738/+31174
| | |\ \ \ \ \ \ \
| | * | | | | | | | Small optimization for QStaticText when used with index arraysEskil Abrahamsen Blomfeldt2010-02-041-4/+13
| | * | | | | | | | Fix broken text drawing in OpenGL engine when text items are too longEskil Abrahamsen Blomfeldt2010-02-021-3/+3
| | * | | | | | | | Add experimental support for using drawElements to draw cached textEskil Abrahamsen Blomfeldt2010-02-021-3/+34
| | * | | | | | | | Lock before calling drawStaticTextItemAnders Bakken2010-02-023-2/+12
| | * | | | | | | | Make QRasterPaintEngine::drawStaticText public.Anders Bakken2010-02-021-2/+2
| | * | | | | | | | Merge branch '4.6' into qstatictext-4.6Eskil Abrahamsen Blomfeldt2010-02-01437-3294/+8129
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Fix transformed painting of QStaticText in GL2 paint engineEskil Abrahamsen Blomfeldt2010-02-012-8/+22
| | * | | | | | | | | Clarify comment in QPainterEskil Abrahamsen Blomfeldt2010-02-011-1/+1
| | * | | | | | | | | Fix one test and add tests for backend optimizationsEskil Abrahamsen Blomfeldt2010-02-011-3/+32
| | * | | | | | | | | Add private header warning to qstatictext_p.hEskil Abrahamsen Blomfeldt2010-02-011-0/+11
| | * | | | | | | | | Make QStaticText private APIEskil Abrahamsen Blomfeldt2010-02-0114-189/+198
| | * | | | | | | | | Don't compare bool to char (avoid warning on MSVC)Eskil Abrahamsen Blomfeldt2010-02-011-1/+2
| | * | | | | | | | | doc: Add \since to QStaticTextEskil Abrahamsen Blomfeldt2010-02-011-0/+1
| | * | | | | | | | | Compile on WindowsEskil Abrahamsen Blomfeldt2010-02-011-0/+8
| | * | | | | | | | | Remove reference to _ARB macrosEskil Abrahamsen Blomfeldt2010-02-011-9/+9
| | * | | | | | | | | Improve performance of QStaticText on OpenGL by caching data on GPUEskil Abrahamsen Blomfeldt2010-01-295-25/+173
| | * | | | | | | | | Remove unused constructor in QStaticTextPrivateEskil Abrahamsen Blomfeldt2010-01-292-11/+0
| | * | | | | | | | | Initialize member variables in QStaticTextPrivate constructorEskil Abrahamsen Blomfeldt2010-01-291-0/+1
| | * | | | | | | | | Compile for SymbianEskil Abrahamsen Blomfeldt2010-01-261-0/+1
| | * | | | | | | | | Compile for S60Eskil Abrahamsen Blomfeldt2010-01-262-14/+19
| | * | | | | | | | | Attempt at making OpenVG work with QStaticTextEskil Abrahamsen Blomfeldt2010-01-262-25/+37
| | * | | | | | | | | CompileEskil Abrahamsen Blomfeldt2010-01-202-6/+3
| | * | | | | | | | | Add font object to QStaticTextEskil Abrahamsen Blomfeldt2010-01-202-1/+3
| | * | | | | | | | | Inline QGL2PEXVertexArray::addRect()Eskil Abrahamsen Blomfeldt2010-01-192-16/+15
| | * | | | | | | | | Optimize speed of QGL2PEXVertexArrayEskil Abrahamsen Blomfeldt2010-01-191-2/+11
| | * | | | | | | | | Implement QPaintBufferEngine::drawStaticTextItem()Eskil Abrahamsen Blomfeldt2010-01-184-1/+42
| | * | | | | | | | | doc: Add some performance hints to the documentationEskil Abrahamsen Blomfeldt2010-01-151-4/+11
| | * | | | | | | | | Use fallback when drawing projected textEskil Abrahamsen Blomfeldt2010-01-152-1/+30
| | * | | | | | | | | Test current graphics system + initialize memoryEskil Abrahamsen Blomfeldt2010-01-151-23/+44
| | * | | | | | | | | Remove translationDoesNotCauseRelayout testEskil Abrahamsen Blomfeldt2010-01-151-45/+0
| | * | | | | | | | | Add tests for QStaticText::prepare()Eskil Abrahamsen Blomfeldt2010-01-151-0/+51
| | * | | | | | | | | Fix crash when wrapping textEskil Abrahamsen Blomfeldt2010-01-151-1/+1
| | * | | | | | | | | Update size commentEskil Abrahamsen Blomfeldt2010-01-151-1/+2
| | * | | | | | | | | CompileEskil Abrahamsen Blomfeldt2010-01-153-20/+5
| | * | | | | | | | | Update size comment in QStaticTextPrivateEskil Abrahamsen Blomfeldt2010-01-141-1/+1