summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-0220-75/+371
|\
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-02-018-12/+181
| * Fix a problem with overlay icons in the fileiconproviderJens Bache-Wiig2010-02-011-2/+3
| * Only set the _WIN32_WINNT define if it is not set or less than 0x0400Andy Shaw2010-02-011-0/+2
| * QPrintDialog::setPrinter(), QPrintDialog::printer(), QPrintDialog::addButton ...ulf2010-02-011-3/+3
| * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-2913-59/+183
| * Carbon: crash problem in QWidgetPrivate::hide_sys, v2Richard Moe Gustavsen2010-01-292-1/+3
| * Carbon: crash problem in QWidgetPrivate::hide_sysRichard Moe Gustavsen2010-01-291-0/+2
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-0190-992/+2145
|\ \ | |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-2813-31/+29
| |\
| | * Call cheaper clear() instead of assigning new QString()Markus Goetz2010-01-284-19/+19
| | * Fix some foreach usage to use const refsMarkus Goetz2010-01-285-6/+6
| | * Core classes, examples, demos: Some changes from string to charMarkus Goetz2010-01-283-4/+4
| | * Fix header labels on mac with rtlJens Bache-Wiig2010-01-281-2/+0
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-283-3/+44
| |\ \ | | |/ | |/|
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2010-01-2865-465/+1572
| | |\
| | | * Fixed an endless loop if printing web pages.Trond Kjernåsen2010-01-281-0/+5
| | | * Better support for user-generated binary shadersRhys Weatherley2010-01-271-3/+35
| | * | Fix a regression: icons with slightly wrong ICO header did not load.Jan-Arve Sæther2010-01-281-0/+4
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-2832-186/+333
| |\ \ \
| | * \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-285-8/+31
| | |\ \ \
| | | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6-os1Prasanth Ullattil2010-01-285-8/+31
| | | |\ \ \ | | | | | |/ | | | | |/|
| | * | | | doc: Fixed the last qdoc errors.Martin Smith2010-01-282-8/+13
| | |/ / /
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2010-01-2833-546/+807
| | |\ \ \
| | | * | | Fixes visibility update missing when doing setParentItem on graphicsitemLeonardo Sobral Cunha2010-01-273-36/+41
| | | * | | Fixed an infinite loop that could occur when reading invalid BMP images.Trond Kjernåsen2010-01-271-1/+1
| | | * | | Updated docs regarding QGLWidget::renderText() limitations.Trond Kjernåsen2010-01-271-0/+7
| | | * | | Added optimization flag to QGraphicsItemPrivate.Samuel Rødal2010-01-272-0/+25
| | | * | | Fixed child items with graphics effects not inheriting opacity.Samuel Rødal2010-01-272-4/+25
| | | * | | Small optimization in raster paint engine.Samuel Rødal2010-01-271-2/+2
| | | * | | Another ASSERT while deleting spansGabriel de Dietrich2010-01-271-1/+3
| | | * | | Implement QDirectFBPixmapData::scrollAnders Bakken2010-01-272-3/+29
| | | * | | Potential crash when adding items from QGraphicsWidget::polishEvent().Bjørn Erik Nilsen2010-01-272-16/+27
| | | * | | QGraphicsWidget is painted twice on the inital show.Bjørn Erik Nilsen2010-01-273-8/+18
| | | * | | Fix QPainter::redirection() to pass autotest.Gunnar Sletta2010-01-271-3/+2
| | | * | | Re-added the Close button in QPrintPreviewDialog for Mac/Carbon.Trond Kjernåsen2010-01-271-0/+10
| | | * | | Fix y-inverted pixmaps properly.Gunnar Sletta2010-01-271-9/+5
| | | * | | Fix rendering with simple shader in GL2 engineTom Cooksey2010-01-271-0/+3
| | | * | | removed a debug traceThierry Bastian2010-01-271-2/+0
| | | * | | Fix documentation bug in QColorGunnar Sletta2010-01-271-7/+4
| | | * | | Only send QGraphicsItem::ParentChange(d) notifications from setParentItem.Bjørn Erik Nilsen2010-01-273-20/+28
| | | * | | Pass value as const void *const to QGraphicsSceneIndex::itemChange.Bjørn Erik Nilsen2010-01-275-12/+12
| | | * | | Optimize QGraphicsItem::setFlags.Bjørn Erik Nilsen2010-01-271-9/+21
| | | * | | Optimize QGraphicsScenePrivate::itemAcceptsHoverEvents_helperBjørn Erik Nilsen2010-01-271-4/+4
| | | * | | Improve performance of QGraphicsItem::setParentItem.Bjørn Erik Nilsen2010-01-273-35/+62
| | | * | | Make sure cursor is painted at the correct position when we are using IM.Jan-Arve Sæther2010-01-272-2/+8
| | | * | | Purely cosmetic (formatting) changes to GL2 engine's GLSLTom Cooksey2010-01-271-333/+357
| | | * | | Use an attribute value for the PMV matrix rather than a uniformTom Cooksey2010-01-275-31/+42
| | | * | | Remove unnecessary depth uniform from GL2 engine's GLSLTom Cooksey2010-01-271-6/+0
| | | * | | Doc fixes: Remove some lies from QEasingCurve.Jan-Arve Sæther2010-01-271-3/+3