summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Always accept values reported directly using QTest::setBenchmarkResult.Samuel Rødal2010-02-181-1/+1
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Gunnar Sletta2010-02-1815-33/+110
|\
| * Run firstRun initialization in declarative/painting benchmarkEskil Abrahamsen Blomfeldt2010-02-181-1/+1
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-185-19/+21
| |\
| | * Enable QStaticText in QtDeclarative painting benchmarkRhys Weatherley2010-02-171-9/+5
| | * Fix no-webkit compiler helpviewerRhys Weatherley2010-02-174-10/+16
| * | Optimization for text drawing on OpenGLEskil Abrahamsen Blomfeldt2010-02-182-2/+8
| |/
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-1778-481/+1416
| |\
| | * Fixes crash when destroying a QGraphicsItem.Yoann Lopes2010-02-172-2/+60
| | * Move benchmarks/qvector to benchmarks/corelib/tools/qvectorBjørn Erik Nilsen2010-02-175-1/+2
| * | Make sure height of glyph cache is a power of twoEskil Abrahamsen Blomfeldt2010-02-171-8/+18
* | | Make threading use-cases work for X11Gunnar Sletta2010-02-181-12/+28
| |/ |/|
* | Some threading improvements to the GL moduleGunnar Sletta2010-02-177-18/+575
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-17178-10269/+45987
|\ \
| * | Fixed compile on Mac.Kim Motoyoshi Kalland2010-02-161-1/+1
| * | Changelog update for 4.7.Trond Kjernåsen2010-02-161-1/+5
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Jason McDonald2010-02-164-44/+84
| |\ \ | | |/
| | * Rename QStaticText::setUseBackendOptimizations to setPerformanceHint()Eskil Abrahamsen Blomfeldt2010-02-163-32/+45
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-161-1/+1
| | |\
| | * | doc: Update documentation for QStaticTextEskil Abrahamsen Blomfeldt2010-02-162-12/+39
| * | | Fix license headers.Jason McDonald2010-02-164-70/+70
| | |/ | |/|
| * | Fixed a compile error on Mac/Leopard.Trond Kjernåsen2010-02-161-1/+1
| |/
| * Fix alpha check for OpenGL/ES in GL2 paint engineRhys Weatherley2010-02-151-0/+4
| * Compile fix for QStaticText - include declaration of QColorRhys Weatherley2010-02-151-0/+1
| * Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-152718-3250/+320991
| |\
| * | Support Qt::AutoTest in QStaticText::setTextFormat()Eskil Abrahamsen Blomfeldt2010-02-151-3/+3
| * | Merge branch 'qt-graphics-team-qstatictext-4.7'Eskil Abrahamsen Blomfeldt2010-02-15351-4172/+3881
| |\ \
| | * \ Merge branch 'qstatictext-4.7' of git@scm.dev.nokia.troll.no:qt/qt-graphics-t...Eskil Abrahamsen Blomfeldt2010-02-15680-25919/+43818
| | |\ \
| | | * \ Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7Eskil Abrahamsen Blomfeldt2010-02-15680-25919/+43818
| | | |\ \
| | * | | | Separate out textFormat property from setText() function and removeEskil Abrahamsen Blomfeldt2010-02-154-25/+41
| | |/ / /
| | * | | Add API for rich text and getting actual size of QStaticTextEskil Abrahamsen Blomfeldt2010-02-144-31/+78
| | * | | Remove fluxuating tests for QStaticTextEskil Abrahamsen Blomfeldt2010-02-101-209/+0
| | * | | Make QStaticText public API againEskil Abrahamsen Blomfeldt2010-02-1014-254/+253
| | * | | Revert 004b09ffd423cd3100e346825dd7d730fc86d366Eskil Abrahamsen Blomfeldt2010-02-101-5/+1
| | * | | Merge branch 'qstatictext-4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-t...Eskil Abrahamsen Blomfeldt2010-02-101-1/+5
| | |\ \ \
| | | * | | Make the GL glyph cache a POT textureEskil Abrahamsen Blomfeldt2010-02-091-1/+5
| | * | | | 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
generated by cgit v0.12 at 2025-01-09 10:18:19 (GMT)