Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-02-19 | 209 | -10339/+47187 |
|\ | |||||
| * | Fixed compile of autotests. | Rohan McGovern | 2010-02-18 | 2 | -3/+1 |
| * | Merge remote branch 'qt/master' into staging-2-master | Qt Continuous Integration System | 2010-02-18 | 644 | -1954/+13821 |
| |\ | |||||
| * | | Fix warnings on gcc | Eskil Abrahamsen Blomfeldt | 2010-02-18 | 3 | -7/+8 |
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 | Eskil Abrahamsen Blomfeldt | 2010-02-18 | 17 | -50/+522 |
| |\ \ | |||||
| | * | | Fix threaded gl autotest build failure on GLES2 | Tom Cooksey | 2010-02-18 | 2 | -13/+20 |
| | * | | Removed redundant debug output from trace benchmark. | Samuel Rødal | 2010-02-18 | 1 | -1/+0 |
| | * | | Added two QML based traces to trace benchmark. | Samuel Rødal | 2010-02-18 | 4 | -0/+4 |
| | * | | 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 | 5 | -15/+131 |
| | * | | Added trace replayer benchmark. | Samuel Rødal | 2010-02-18 | 8 | -1/+275 |
| | * | | Added --range and --single arguments to qttracereplay. | Samuel Rødal | 2010-02-18 | 1 | -9/+63 |
| | * | | Always accept values reported directly using QTest::setBenchmarkResult. | Samuel Rødal | 2010-02-18 | 1 | -1/+1 |
| | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 | Gunnar Sletta | 2010-02-18 | 15 | -33/+110 |
| | |\ \ | |||||
| | * | | | Make threading use-cases work for X11 | Gunnar Sletta | 2010-02-18 | 1 | -12/+28 |
| * | | | | Add experimental VBO support for drawCachedGlyphs()'s index array | Eskil Abrahamsen Blomfeldt | 2010-02-18 | 2 | -1/+32 |
| | |/ / | |/| | | |||||
| * | | | Run firstRun initialization in declarative/painting benchmark | Eskil Abrahamsen Blomfeldt | 2010-02-18 | 1 | -1/+1 |
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 | Eskil Abrahamsen Blomfeldt | 2010-02-18 | 5 | -19/+21 |
| |\ \ \ | |||||
| | * | | | Enable QStaticText in QtDeclarative painting benchmark | Rhys Weatherley | 2010-02-17 | 1 | -9/+5 |
| | * | | | Fix no-webkit compiler helpviewer | Rhys Weatherley | 2010-02-17 | 4 | -10/+16 |
| * | | | | Optimization for text drawing on OpenGL | Eskil Abrahamsen Blomfeldt | 2010-02-18 | 2 | -2/+8 |
| |/ / / | |||||
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 | Eskil Abrahamsen Blomfeldt | 2010-02-17 | 78 | -481/+1416 |
| |\ \ \ | |||||
| | * | | | Fixes crash when destroying a QGraphicsItem. | Yoann Lopes | 2010-02-17 | 2 | -2/+60 |
| | * | | | Move benchmarks/qvector to benchmarks/corelib/tools/qvector | Bjørn Erik Nilsen | 2010-02-17 | 5 | -1/+2 |
| | |/ / | |||||
| | * | | Some threading improvements to the GL module | Gunnar Sletta | 2010-02-17 | 7 | -18/+575 |
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-02-17 | 178 | -10269/+45987 |
| | |\ \ | |||||
| | | * | | Fixed compile on Mac. | Kim Motoyoshi Kalland | 2010-02-16 | 1 | -1/+1 |
| | | * | | Changelog update for 4.7. | Trond Kjernåsen | 2010-02-16 | 1 | -1/+5 |
| | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 | Jason McDonald | 2010-02-16 | 4 | -44/+84 |
| | | |\ \ | |||||
| | | * | | | Fix license headers. | Jason McDonald | 2010-02-16 | 4 | -70/+70 |
| * | | | | | Make sure height of glyph cache is a power of two | Eskil Abrahamsen Blomfeldt | 2010-02-17 | 1 | -8/+18 |
| | |_|/ / | |/| | | | |||||
| * | | | | Rename QStaticText::setUseBackendOptimizations to setPerformanceHint() | Eskil Abrahamsen Blomfeldt | 2010-02-16 | 3 | -32/+45 |
| * | | | | 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 | 2 | -12/+39 |
| |/ / / | |||||
| * | | | Fix alpha check for OpenGL/ES in GL2 paint engine | Rhys Weatherley | 2010-02-15 | 1 | -0/+4 |
| * | | | Compile fix for QStaticText - include declaration of QColor | Rhys Weatherley | 2010-02-15 | 1 | -0/+1 |
| * | | | Merge remote branch 'qt/master' into staging-2-master | Qt Continuous Integration System | 2010-02-15 | 2718 | -3250/+320991 |
| |\ \ \ | |||||
| * | | | | Support Qt::AutoTest in QStaticText::setTextFormat() | Eskil Abrahamsen Blomfeldt | 2010-02-15 | 1 | -3/+3 |
| * | | | | Merge branch 'qt-graphics-team-qstatictext-4.7' | Eskil Abrahamsen Blomfeldt | 2010-02-15 | 351 | -4172/+3881 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'qstatictext-4.7' of git@scm.dev.nokia.troll.no:qt/qt-graphics-t... | Eskil Abrahamsen Blomfeldt | 2010-02-15 | 680 | -25919/+43818 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7 | Eskil Abrahamsen Blomfeldt | 2010-02-15 | 680 | -25919/+43818 |
| | | |\ \ \ \ | |||||
| | * | | | | | | Separate out textFormat property from setText() function and remove | Eskil Abrahamsen Blomfeldt | 2010-02-15 | 4 | -25/+41 |
| | |/ / / / / | |||||
| | * | | | | | Add API for rich text and getting actual size of QStaticText | Eskil Abrahamsen Blomfeldt | 2010-02-14 | 4 | -31/+78 |
| | * | | | | | Remove fluxuating tests for QStaticText | Eskil Abrahamsen Blomfeldt | 2010-02-10 | 1 | -209/+0 |
| | * | | | | | Make QStaticText public API again | Eskil Abrahamsen Blomfeldt | 2010-02-10 | 14 | -254/+253 |
| | * | | | | | Revert 004b09ffd423cd3100e346825dd7d730fc86d366 | Eskil Abrahamsen Blomfeldt | 2010-02-10 | 1 | -5/+1 |
| | * | | | | | Merge branch 'qstatictext-4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-t... | Eskil Abrahamsen Blomfeldt | 2010-02-10 | 1 | -1/+5 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Make the GL glyph cache a POT texture | Eskil Abrahamsen Blomfeldt | 2010-02-09 | 1 | -1/+5 |
| | * | | | | | | Merge branch '4.6' into qstatictext-4.6 | Eskil Abrahamsen Blomfeldt | 2010-02-10 | 380 | -9220/+2627 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | |