summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0455-929/+680
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-044-27/+40
| |\
| | * Fix QTBUG-13730. QGraphicsScene::render clipping bug. Includes test case.Chris Meyer2010-10-044-27/+40
| * | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-10-0412-40/+235
| |\ \
| | * \ Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-10-0414-40/+244
| | |\ \
| | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-09-302-0/+9
| | | |\ \
| | | | * | Build fix for -qtnamespace.Leandro Melo2010-09-302-0/+9
| | | |/ /
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-09-2312-35/+235
| | | |\ \
| | | | * | 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-2212-35/+235
| | | |/ /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-0439-862/+405
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | 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-012-3/+39
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-0138-857/+366
| | |\ \ | |/ / /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-0138-857/+366
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-3038-857/+366
| | | |\ \
| | | | * | Stabilize tst_QGraphicsWidget::QT_BUG_13865_doublePaintWhenAddingASubItemBjørn Erik Nilsen2010-09-301-0/+1
| | | | * | 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-305-678/+17
| | | | * | 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
| | | | | | | | | | | | | |\ \ \ \