summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-19209-10339/+47187
|\
| * Fixed compile of autotests.Rohan McGovern2010-02-182-3/+1
| * Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-18644-1954/+13821
| |\
| * | Fix warnings on gccEskil Abrahamsen Blomfeldt2010-02-183-7/+8
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2010-02-1817-50/+522
| |\ \
| | * | Fix threaded gl autotest build failure on GLES2Tom Cooksey2010-02-182-13/+20
| | * | Removed redundant debug output from trace benchmark.Samuel Rødal2010-02-181-1/+0
| | * | Added two QML based traces to trace benchmark.Samuel Rødal2010-02-184-0/+4
| | * | 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-185-15/+131
| | * | Added trace replayer benchmark.Samuel Rødal2010-02-188-1/+275
| | * | Added --range and --single arguments to qttracereplay.Samuel Rødal2010-02-181-9/+63
| | * | 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
| | |\ \
| | * | | Make threading use-cases work for X11Gunnar Sletta2010-02-181-12/+28
| * | | | Add experimental VBO support for drawCachedGlyphs()'s index arrayEskil Abrahamsen Blomfeldt2010-02-182-1/+32
| | |/ / | |/| |
| * | | 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
| | |/ /
| | * | 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
| | | |\ \
| | | * | | Fix license headers.Jason McDonald2010-02-164-70/+70
| * | | | | Make sure height of glyph cache is a power of twoEskil Abrahamsen Blomfeldt2010-02-171-8/+18
| | |_|/ / | |/| | |
| * | | | 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
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fixed a compile error on Mac/Leopard.Trond Kjernåsen2010-02-161-1/+1
| * | | | doc: Update documentation for QStaticTextEskil Abrahamsen Blomfeldt2010-02-162-12/+39
| |/ / /
| * | | 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
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |