summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0444-540/+412
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-041-1/+1
| |\
| | * Fix QTBUG-13730. QGraphicsScene::render clipping bug. Includes test case.Chris Meyer2010-10-041-1/+1
| * | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-10-0410-40/+141
| |\ \ | | |/ | |/|
| | * Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-10-0412-40/+150
| | |\
| | | * Build fix for -qtnamespace.Leandro Melo2010-09-302-0/+9
| | | * Fix compile failure in QtMultimedia.Andrew den Exter2010-09-231-3/+3
| | | * Verify the audio format before trying to open an audio device.Andrew den Exter2010-09-2210-35/+141
| * | | Fixed antialiased rendering error in raster engine due to wrong merge.Samuel Rødal2010-10-011-2/+0
| * | | FocusOut even when QGraphicsItem gets hidden.Frederik Gladhorn2010-10-011-3/+5
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-0132-494/+265
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-0132-494/+265
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-3032-494/+265
| | | |\ \
| | | | * | Fixed accessing freed memory in raster engine.Kim Motoyoshi Kalland2010-09-301-2/+2
| | | | * | Build fix for -qtnamespace.Leandro Melo2010-09-302-0/+9
| | | | * | Fixed parsing of SVGs with absolute font sizes.Kim Motoyoshi Kalland2010-09-301-1/+32
| | | | * | Moving QPdf::stripSpecialCharacter to fontengineJørgen Lind2010-09-307-37/+23
| | | | * | Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine"Thierry Bastian2010-09-304-318/+13
| | | | * | Fixed a layout issue where you could get NaN as dimensionsThierry Bastian2010-09-301-12/+11
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-3018-133/+216
| | | | |\ \
| | | | | * | QTextCodec: Fix valgrind warning when using QTextCodec in destructions funct...Olivier Goffart2010-09-291-24/+28
| | | | | * | Fix double painting when adding an item into a linear layoutThierry Bastian2010-09-291-2/+6
| | | | | * | Fixed antialiased rasterization bug in raster engine.Samuel Rødal2010-09-293-7/+41
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-2815-100/+141
| | | | | |\ \
| | | | | | * | Fixed potential crash when loading corrupt GIFs.Kim Motoyoshi Kalland2010-09-281-2/+11
| | | | | | * | Work around an ATI driver problem with mutli-sampled pbuffers.Trond Kjernåsen2010-09-281-11/+18
| | | | | | * | Fixed regression in clipping.qps autotest on 64-bit.Samuel Rødal2010-09-281-1/+1
| | | | | | * | Fixed crash when using Qt::WA_DeleteOnClose on a QPrintDialog on Mac.Trond Kjernåsen2010-09-281-9/+0
| | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-2811-77/+111
| | | | | | |\ \
| | | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-2711-77/+111
| | | | | | | |\ \
| | | | | | | | * | Fixed performance regression in curve stroking.Samuel Rødal2010-09-273-6/+8
| | | | | | | | * | Don't disable texture_from_pixmap on GLX/X11 by default.Trond Kjernåsen2010-09-272-7/+29
| | | | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-09-27100-654/+1261
| | | | | | | | |\ \
| | | | | | | | | * \ Merge branch 'staging' into 4.7-integrationQt Continuous Integration System2010-09-275-4/+10
| | | | | | | | | |\ \
| | | | | | | | | | * | fix documentation of drawText(int, int, int, int, ...Gunnar Sletta2010-09-271-1/+1
| | | | | | | | | | * | Merge branch 'staging' into 4.7-integrationQt Continuous Integration System2010-09-274-3/+9
| | | | | | | | | | |\ \
| | | | | | | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-244-3/+9
| | | | | | | | | | | |\ \
| | | | | | | | | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Yoann Lopes2010-09-243-2/+6
| | | | | | | | | | | | |\ \
| | | | | | | | | | | | | * | Don't pretend to support single buffered EGL surfaces.Trond Kjernåsen2010-09-242-0/+4
| | | | | | | | | | | | | * | Named anonymous struct in the OpenGL paint engine.Kim Motoyoshi Kalland2010-09-241-2/+2
| | | | | | | | | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Yoann Lopes2010-09-245-102/+140
| | | | | | | | | | | | |\ \ \ | | | | | | | | | | | | | |/ /
| | | | | | | | | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Yoann Lopes2010-09-235-60/+64
| | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | * | | | Fixes gray_raster incorrectly reporting out of memory error.Yoann Lopes2010-09-231-1/+3
| | | | | | | | * | | | | | | | Avoid creating copy of an image in memory when storing as pngaavit2010-09-271-47/+45
| | | | | | | | * | | | | | | | Optimization of pixel conversion when storing jpegaavit2010-09-241-13/+19
* | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-10-0445-245/+251
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-0481-621/+7678
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | doc: Changed \i to \e.Martin Smith2010-10-041-4/+4
| | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge branch '4.7' of ../qt-doc-team-licenses into 4.7David Boddie2010-10-0439-195/+195
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Doc: Fixed the in-repository licenses for the documentation.David Boddie2010-10-0439-195/+195