summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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-183-10/+114
* Always accept values reported directly using QTest::setBenchmarkResult.Samuel Rødal2010-02-181-1/+1
* 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-1723-149/+200
|\
| * Fixes crash when destroying a QGraphicsItem.Yoann Lopes2010-02-171-2/+3
| * Some threading improvements to the GL moduleGunnar Sletta2010-02-173-18/+56
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-17172-10249/+45478
| |\
| | * Fixed compile on Mac.Kim Motoyoshi Kalland2010-02-161-1/+1
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Jason McDonald2010-02-163-34/+73
| | |\
| | * | Fix license headers.Jason McDonald2010-02-163-54/+54
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-02-166-36/+48
| |\ \ \
| | * \ \ Merge remote branch 'qt/master' into s60-masterQt Continuous Integration System2010-02-162-3/+8
| | |\ \ \
| | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-1677-258/+611
| | |\ \ \ \
| | | * | | | Fixed missing repaints on S60 3.1.axis2010-02-151-1/+9
| | | * | | | Build break fix for QS60Style.Sami Merila2010-02-151-1/+2
| | | * | | | QS60Style: Branch indicator in tree view is misplacedSami Merila2010-02-151-7/+9
| | | * | | | Compilation error fix: missing comma in enum list in QS60StyleSami Merila2010-02-151-1/+1
| | | * | | | Scroll bar handle/groove ends are squeezed (in nHD resolution)Sami Merila2010-02-151-4/+7
| | | * | | | QS60Style draws drop area as a black rectSami Merila2010-02-153-2/+12
| | | * | | | Remove scrollbar context menu from QS60StyleSami Merila2010-02-151-0/+3
| | | * | | | Change a name of a variable to be more descriptiveSami Merila2010-02-141-2/+2
| | * | | | | Enabled commit 2b60b542a for all platforms.axis2010-02-162-20/+5
| * | | | | | doc: A QPlainTextEdit is never a QTextBrowserThorbjørn Lindeijer2010-02-161-1/+1
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-158-37/+37
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Prepare translations of the declarative module.Friedemann Kleint2010-02-158-37/+37
* | | | | | | 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-162-22/+34
* | | | | | 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-15365-211/+106877
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-13338-269/+107080
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-131-1/+1
| | |\ \ \
| | | * | | add qt5 todoOswald Buddenhagen2010-02-121-1/+1
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-131-2/+7
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-124-12/+29
| | | |\ \ \ | | | | |/ /
| | | * | | Fix scrolling backwards when pathItemCount != model.countAlan Alpert2010-02-121-2/+7
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-02-131-2/+12
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Enabled searching of IM plugins on Symbian.axis2010-02-121-2/+12
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-12317-109/+106597
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | | * | Fix warningsAaron Kennedy2010-02-124-6/+2
| | | * | Reference count shared expression dataAaron Kennedy2010-02-122-1/+7
| | | * | Cleanup public QmlMetaType APIAaron Kennedy2010-02-1212-158/+112
| | | * | Adds inputMethodHint property to TextEdit and TextInput.Joona Petrell2010-02-122-0/+3
| | | * | Decouple Loader from QmlGraphicsItemJoona Petrell2010-02-124-38/+119
| | | * | Explicitly pass size to standard pixmap icon loaders.Michael Brasser2010-02-121-95/+95
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-11316-14/+106462
| | | |\ \