summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'c1f9978c9d61bcbdb2f280185a3abdea13d7f532' into master-from-4.7Rohan McGovern2010-10-0523-135/+280
|\
| * 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-3023-136/+312
| |\
| | * QTextCodec: Fix valgrind warning when using QTextCodec in destructions funct...Olivier Goffart2010-09-292-24/+37
| | * Fix double painting when adding an item into a linear layoutThierry Bastian2010-09-292-2/+46
| | * 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-2818-103/+188
| | |\
| | | * 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
| | | * tst_qstatemachine.cpp: fix compilation with Sun StudioOlivier Goffart2010-09-281-1/+1
| | | * 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-2813-79/+157
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-2713-79/+157
| | | | |\
| | | | | * 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-27183-972/+2671
| | | | | |\
| | | | | | * Doc update for the support of MSVC 2010 64-bitThierry Bastian2010-09-271-2/+3
| | | | | | * 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-264-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-248-10/+29
| | | | | | | | | | |\
| | | | | | | | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-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-2414-126/+253
| | | | | | | | | | |\ \ \ | | | | | | | | | | | | |/ | | | | | | | | | | | |/|
| | | | | | | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Yoann Lopes2010-09-236-86/+100
| | | | | | | | | | |\ \ \
| | | | | | | | | | * | | | 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-272-47/+88
| | | | | * | | | | | | | | Optimization of pixel conversion when storing jpegaavit2010-09-241-13/+19
* | | | | | | | | | | | | | Fixed compile for symbian.Rohan McGovern2010-10-041-1/+1
* | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-041287-6850/+181193
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-0115-3/+6514
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-0115-3/+6514
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | hybrid heap improvement in the disabling of BTracemread2010-09-302-9/+1
| | * | | | | | | | | | | | | | Further hybrid heap review changesmread2010-09-301-2/+1
| | * | | | | | | | | | | | | | hybrid heap further review changesmread2010-09-303-18/+14
| | * | | | | | | | | | | | | | lower case name for allocator support headermread2010-09-301-0/+0
| | * | | | | | | | | | | | | | hybrid allocator integration review updatesmread2010-09-304-12/+14
| | * | | | | | | | | | | | | | hybrid allocator tuningmread2010-09-302-1/+9
| | * | | | | | | | | | | | | | removing need for u32std.h in s60mainmread2010-09-301-1/+2
| | * | | | | | | | | | | | | | declaring fast allocation shrink hysteresis valuemread2010-09-301-0/+2
| | * | | | | | | | | | | | | | fast allocator compiling for S60 3.2mread2010-09-304-4/+19
| | * | | | | | | | | | | | | | moved fast allocator config to qt_hybridHeap_symbian_p.hmread2010-09-302-6/+6
| | * | | | | | | | | | | | | | getting fast allocator to compile on S60 5.0 SDKmread2010-09-306-14/+110
| | * | | | | | | | | | | | | | removing header use not in public SDKsmread2010-09-301-1/+5
| | * | | | | | | | | | | | | | added header to arch.primread2010-09-301-1/+2
| | * | | | | | | | | | | | | | added renamed headermread2010-09-301-0/+77