summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make the qWarnings in the animation API more useful.Alexis Menard2010-01-191-5/+12
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-192-7/+46
|\
| * Fix X11/EGL builds using OpenGL ES 1.1Tom Cooksey2010-01-191-6/+45
| * Fix TypoThomas Zander2010-01-191-1/+1
* | Fixed y-inverted pixmaps on N900.Gunnar Sletta2010-01-191-4/+8
|/
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-182-0/+35
|\
| * Fixes: When calling QDesktopWidget::screenGeometry() with a nullAndy Shaw2010-01-182-0/+35
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-181-1/+1
|\ \
| * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-181-1/+1
| |\ \ | | |/ | |/|
| | * Fix compilation on IA-64 with the Intel compiler: cast properly.Thiago Macieira2010-01-161-1/+1
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i...Qt Continuous Integration System2010-01-180-0/+0
|\ \ \ | |/ / |/| |
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-1625-974/+897
| |\ \ | |/ / |/| |
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-151-1/+1
|\ \ \ | |_|/ |/| |
| * | Avoid an unnecessary copy in QImage::scaled().Trond Kjernåsen2010-01-151-1/+1
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-1516-133/+839
|\ \ \
| * \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-1575-1508/+1039
| |\ \ \
| | * | | Fixes: Cosmetic fix for maemo spin boxJens Bache-Wiig2010-01-151-1/+1
| | * | | Adding texture glyph cache default.Adrian Constantin2010-01-151-0/+2
| * | | | Doc: Added placeholder pages for new examples and updated the overviews.David Boddie2010-01-1514-132/+836
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-155-5/+28
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-155-5/+28
| |\ \ \ \
| | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-145-5/+28
| | |\ \ \ \
| | | * | | | Enable surface transparency support on Symbian^4.Jason Barron2010-01-142-0/+12
| | | * | | | Improve the behavior of expose events on Symbian.Jason Barron2010-01-144-5/+16
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-152-14/+29
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Clarify the docs slightly for QPainter::beginNativePainting().Trond Kjernåsen2010-01-151-6/+11
| * | | | | | Fixed the encoding of the Tile and Creator tags in the PDF engine.Trond Kjernåsen2010-01-151-8/+18
| |/ / / / /
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-151-821/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove unused file.Rohan McGovern2010-01-151-821/+0
| | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i...Qt Continuous Integration System2010-01-151-1/+1
| | | | | |\ | |_|_|_|/ / |/| | | | |
| | | | | * Fixed error in unit test xml file.Kurt Korbatits2010-01-151-1/+1
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-142-7/+16
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | QListView in icon view mode, drop enabled items wouldn't receive anythingGabriel de Dietrich2010-01-141-0/+7
| * | | | | Fixes wrong stroke clipping with the raster engine.Yoann Lopes2010-01-141-7/+9
| |/ / / /
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-147-9/+119
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | QFile::remove: don't fail for unrelated errorsJoão Abecasis2010-01-142-0/+37
| * | | | Fix tst_qmlgraphicstext::letterSpacing tst_qmlgraphicstext::wordSpacing Sent ...Warwick Allison2010-01-141-1/+9
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-144-1/+18
| * | | | network internals: fix uploading of dataPeter Hartmann2010-01-141-1/+1
| * | | | File dialog mode is not correctly updated in Mac (Cocoa).Prasanth Ullattil2010-01-142-6/+16
| * | | | add tests for QFlags behavior in QtScriptKent Hansen2010-01-141-1/+56
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-1432-483/+645
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-144-1/+18
| * | | | Better fix for build!=src Makefile generationThomas Zander2010-01-141-5/+3
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Alan Alpert2010-01-148977-11607/+14009
| |\ \ \ \
| | * | | | Fix QGLWidget::renderPixmap() on Windows.Trond Kjernaasen2010-01-141-6/+6
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-1427-472/+617
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-1487-956/+674
| | | |\ \ \ \ | | | | |/ / /
| | | * | | | Fix rules for recreating the Makefile in a subdirThomas Zander2010-01-131-8/+8
| | | * | | | Disable some tests that require high floating point precision.Jan-Arve Sæther2010-01-132-3/+18