summaryrefslogtreecommitdiffstats
path: root/src/gui/painting
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-2229-184/+1096
|\
| * Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-2024-84/+769
| |\
| | * Fix fallback for QStaticText when it's unsupported in paint engineEskil Abrahamsen Blomfeldt2010-02-191-1/+1
| | * Fix warnings on gccEskil Abrahamsen Blomfeldt2010-02-181-2/+3
| | * Fixed old trace files no longer working.Samuel Rødal2010-02-181-1/+3
| | * Reduced the memory footprint of qttrace files.Samuel Rødal2010-02-182-8/+107
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-172-2/+10
| | |\
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-1724-68/+641
| | | |\
| | | | * Fixed compile on Mac.Kim Motoyoshi Kalland2010-02-161-1/+1
| | * | | Make sure height of glyph cache is a power of twoEskil Abrahamsen Blomfeldt2010-02-171-8/+18
| | | |/ | | |/|
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-161-1/+1
| | |\ \
| | | * | Fixed a compile error on Mac/Leopard.Trond Kjernåsen2010-02-161-1/+1
| | * | | doc: Update documentation for QStaticTextEskil Abrahamsen Blomfeldt2010-02-161-0/+23
| | |/ /
| | * | Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-151-0/+3
| | |\ \
| | * \ \ Merge branch 'qt-graphics-team-qstatictext-4.7'Eskil Abrahamsen Blomfeldt2010-02-1515-80/+278
| | |\ \ \
| | | * \ \ Merge branch 'qstatictext-4.7' of git@scm.dev.nokia.troll.no:qt/qt-graphics-t...Eskil Abrahamsen Blomfeldt2010-02-154-18/+57
| | | |\ \ \
| | | | * \ \ Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7Eskil Abrahamsen Blomfeldt2010-02-154-18/+57
| | | | |\ \ \
| | | * | | | | Separate out textFormat property from setText() function and removeEskil Abrahamsen Blomfeldt2010-02-151-1/+1
| | | |/ / / /
| | | * | | | Add API for rich text and getting actual size of QStaticTextEskil Abrahamsen Blomfeldt2010-02-141-5/+10
| | | * | | | Make QStaticText public API againEskil Abrahamsen Blomfeldt2010-02-105-51/+61
| | | * | | | Merge branch '4.6' into qstatictext-4.6Eskil Abrahamsen Blomfeldt2010-02-106-52/+76
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '4.6' into qstatictext-4.6Eskil Abrahamsen Blomfeldt2010-02-081-3/+1
| | | |\ \ \ \ \
| | | * | | | | | Remove redundant friend declaration for QPainterPrivate in QPainterEskil Abrahamsen Blomfeldt2010-02-051-1/+0
| | | * | | | | | Temporarily remove QPainter::drawStaticText() for Qt 4.6.x integrationEskil Abrahamsen Blomfeldt2010-02-054-66/+45
| | | * | | | | | Use state in QPaintBuffer rather than search for the transform cmdEskil Abrahamsen Blomfeldt2010-02-051-10/+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-043-5/+12
| | | |\ \ \ \ \ \
| | | * | | | | | | Make QRasterPaintEngine::drawStaticText public.Anders Bakken2010-02-021-2/+2
| | | * | | | | | | Merge branch '4.6' into qstatictext-4.6Eskil Abrahamsen Blomfeldt2010-02-016-39/+84
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Clarify comment in QPainterEskil Abrahamsen Blomfeldt2010-02-011-1/+1
| | | * | | | | | | | Make QStaticText private APIEskil Abrahamsen Blomfeldt2010-02-015-3/+11
| | | * | | | | | | | Improve performance of QStaticText on OpenGL by caching data on GPUEskil Abrahamsen Blomfeldt2010-01-291-0/+1
| | | * | | | | | | | CompileEskil Abrahamsen Blomfeldt2010-01-201-5/+2
| | | * | | | | | | | Implement QPaintBufferEngine::drawStaticTextItem()Eskil Abrahamsen Blomfeldt2010-01-183-1/+40
| | | * | | | | | | | Use fallback when drawing projected textEskil Abrahamsen Blomfeldt2010-01-151-1/+1
| | | * | | | | | | | Optimize drawStaticText() with rectangle destinationEskil Abrahamsen Blomfeldt2010-01-141-1/+1
| | | * | | | | | | | CompileEskil Abrahamsen Blomfeldt2010-01-141-1/+1
| | | * | | | | | | | Implement drawStaticTextItem() in OpenGL paint enginesEskil Abrahamsen Blomfeldt2010-01-147-13/+29
| | | * | | | | | | | Remove font property in QStaticText and fix handling translation onEskil Abrahamsen Blomfeldt2010-01-141-11/+24
| | | * | | | | | | | Apply painter matrix to position in QPainter::drawStaticText()Eskil Abrahamsen Blomfeldt2010-01-141-10/+9
| | | * | | | | | | | Support transformations in drawStaticText() and optimize for spaceEskil Abrahamsen Blomfeldt2010-01-146-34/+51
| | | * | | | | | | | Optimize QStaticText for spaceEskil Abrahamsen Blomfeldt2010-01-147-31/+83
| | | * | | | | | | | Respect font settings of QStaticText and clip to maximum sizeEskil Abrahamsen Blomfeldt2010-01-141-1/+20
| | | * | | | | | | | Support maximumSize for the layout of the text in a QStaticTextEskil Abrahamsen Blomfeldt2010-01-141-5/+1
| | | * | | | | | | | Speed optimization for QStaticTextEskil Abrahamsen Blomfeldt2010-01-141-5/+9
| | | * | | | | | | | Space optimization in QStaticTextEskil Abrahamsen Blomfeldt2010-01-141-6/+2
| | | * | | | | | | | Optimize QStaticText for one line stringsEskil Abrahamsen Blomfeldt2010-01-141-20/+9
| | | * | | | | | | | doc: Add documentation for QStaticText and QPainter::drawStaticText()Eskil Abrahamsen Blomfeldt2010-01-141-3/+25
| | | * | | | | | | | Add convenience overloads to QPainter::drawStaticText()Eskil Abrahamsen Blomfeldt2010-01-141-0/+12