Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/master' into bearermanagement/unit-tests | Aaron McCarthy | 2010-02-22 | 29 | -184/+1096 |
|\ | |||||
| * | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-20 | 24 | -84/+769 |
| |\ | |||||
| | * | Fix fallback for QStaticText when it's unsupported in paint engine | Eskil Abrahamsen Blomfeldt | 2010-02-19 | 1 | -1/+1 |
| | * | Fix warnings on gcc | Eskil Abrahamsen Blomfeldt | 2010-02-18 | 1 | -2/+3 |
| | * | Fixed old trace files no longer working. | Samuel Rødal | 2010-02-18 | 1 | -1/+3 |
| | * | Reduced the memory footprint of qttrace files. | Samuel Rødal | 2010-02-18 | 2 | -8/+107 |
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 | Eskil Abrahamsen Blomfeldt | 2010-02-17 | 2 | -2/+10 |
| | |\ | |||||
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-02-17 | 24 | -68/+641 |
| | | |\ | |||||
| | | | * | Fixed compile on Mac. | Kim Motoyoshi Kalland | 2010-02-16 | 1 | -1/+1 |
| | * | | | Make sure height of glyph cache is a power of two | Eskil Abrahamsen Blomfeldt | 2010-02-17 | 1 | -8/+18 |
| | | |/ | | |/| | |||||
| | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 | Eskil Abrahamsen Blomfeldt | 2010-02-16 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | Fixed a compile error on Mac/Leopard. | Trond Kjernåsen | 2010-02-16 | 1 | -1/+1 |
| | * | | | doc: Update documentation for QStaticText | Eskil Abrahamsen Blomfeldt | 2010-02-16 | 1 | -0/+23 |
| | |/ / | |||||
| | * | | Merge remote branch 'qt/master' into staging-2-master | Qt Continuous Integration System | 2010-02-15 | 1 | -0/+3 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'qt-graphics-team-qstatictext-4.7' | Eskil Abrahamsen Blomfeldt | 2010-02-15 | 15 | -80/+278 |
| | |\ \ \ | |||||
| | | * \ \ | Merge branch 'qstatictext-4.7' of git@scm.dev.nokia.troll.no:qt/qt-graphics-t... | Eskil Abrahamsen Blomfeldt | 2010-02-15 | 4 | -18/+57 |
| | | |\ \ \ | |||||
| | | | * \ \ | Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7 | Eskil Abrahamsen Blomfeldt | 2010-02-15 | 4 | -18/+57 |
| | | | |\ \ \ | |||||
| | | * | | | | | Separate out textFormat property from setText() function and remove | Eskil Abrahamsen Blomfeldt | 2010-02-15 | 1 | -1/+1 |
| | | |/ / / / | |||||
| | | * | | | | Add API for rich text and getting actual size of QStaticText | Eskil Abrahamsen Blomfeldt | 2010-02-14 | 1 | -5/+10 |
| | | * | | | | Make QStaticText public API again | Eskil Abrahamsen Blomfeldt | 2010-02-10 | 5 | -51/+61 |
| | | * | | | | Merge branch '4.6' into qstatictext-4.6 | Eskil Abrahamsen Blomfeldt | 2010-02-10 | 6 | -52/+76 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch '4.6' into qstatictext-4.6 | Eskil Abrahamsen Blomfeldt | 2010-02-08 | 1 | -3/+1 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | Remove redundant friend declaration for QPainterPrivate in QPainter | Eskil Abrahamsen Blomfeldt | 2010-02-05 | 1 | -1/+0 |
| | | * | | | | | | Temporarily remove QPainter::drawStaticText() for Qt 4.6.x integration | Eskil Abrahamsen Blomfeldt | 2010-02-05 | 4 | -66/+45 |
| | | * | | | | | | Use state in QPaintBuffer rather than search for the transform cmd | Eskil Abrahamsen Blomfeldt | 2010-02-05 | 1 | -10/+1 |
| | | * | | | | | | Clean up diff for QStaticText | Eskil Abrahamsen Blomfeldt | 2010-02-04 | 2 | -3/+2 |
| | | * | | | | | | Remove unused code | Eskil Abrahamsen Blomfeldt | 2010-02-04 | 1 | -7/+0 |
| | | * | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into qstat... | Eskil Abrahamsen Blomfeldt | 2010-02-04 | 3 | -5/+12 |
| | | |\ \ \ \ \ \ | |||||
| | | * | | | | | | | Make QRasterPaintEngine::drawStaticText public. | Anders Bakken | 2010-02-02 | 1 | -2/+2 |
| | | * | | | | | | | Merge branch '4.6' into qstatictext-4.6 | Eskil Abrahamsen Blomfeldt | 2010-02-01 | 6 | -39/+84 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Clarify comment in QPainter | Eskil Abrahamsen Blomfeldt | 2010-02-01 | 1 | -1/+1 |
| | | * | | | | | | | | Make QStaticText private API | Eskil Abrahamsen Blomfeldt | 2010-02-01 | 5 | -3/+11 |
| | | * | | | | | | | | Improve performance of QStaticText on OpenGL by caching data on GPU | Eskil Abrahamsen Blomfeldt | 2010-01-29 | 1 | -0/+1 |
| | | * | | | | | | | | Compile | Eskil Abrahamsen Blomfeldt | 2010-01-20 | 1 | -5/+2 |
| | | * | | | | | | | | Implement QPaintBufferEngine::drawStaticTextItem() | Eskil Abrahamsen Blomfeldt | 2010-01-18 | 3 | -1/+40 |
| | | * | | | | | | | | Use fallback when drawing projected text | Eskil Abrahamsen Blomfeldt | 2010-01-15 | 1 | -1/+1 |
| | | * | | | | | | | | Optimize drawStaticText() with rectangle destination | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 1 | -1/+1 |
| | | * | | | | | | | | Compile | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 1 | -1/+1 |
| | | * | | | | | | | | Implement drawStaticTextItem() in OpenGL paint engines | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 7 | -13/+29 |
| | | * | | | | | | | | Remove font property in QStaticText and fix handling translation on | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 1 | -11/+24 |
| | | * | | | | | | | | Apply painter matrix to position in QPainter::drawStaticText() | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 1 | -10/+9 |
| | | * | | | | | | | | Support transformations in drawStaticText() and optimize for space | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 6 | -34/+51 |
| | | * | | | | | | | | Optimize QStaticText for space | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 7 | -31/+83 |
| | | * | | | | | | | | Respect font settings of QStaticText and clip to maximum size | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 1 | -1/+20 |
| | | * | | | | | | | | Support maximumSize for the layout of the text in a QStaticText | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 1 | -5/+1 |
| | | * | | | | | | | | Speed optimization for QStaticText | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 1 | -5/+9 |
| | | * | | | | | | | | Space optimization in QStaticText | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 1 | -6/+2 |
| | | * | | | | | | | | Optimize QStaticText for one line strings | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 1 | -20/+9 |
| | | * | | | | | | | | doc: Add documentation for QStaticText and QPainter::drawStaticText() | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 1 | -3/+25 |
| | | * | | | | | | | | Add convenience overloads to QPainter::drawStaticText() | Eskil Abrahamsen Blomfeldt | 2010-01-14 | 1 | -0/+12 |