summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qpainter.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-121-2/+2
|\
| * Fix possible crash in QStaticText and QDeclarativeTextLayoutEskil Abrahamsen Blomfeldt2010-10-291-2/+2
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-301-1/+1
| |\
* | \ Merge commit 'c1f9978c9d61bcbdb2f280185a3abdea13d7f532' into master-from-4.7Rohan McGovern2010-10-051-1/+1
|\ \ \ | | |/ | |/|
| * | fix documentation of drawText(int, int, int, int, ...Gunnar Sletta2010-09-271-1/+1
* | | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-041-4/+4
|\ \ \ | | |/ | |/|
| * | Fixed performance issue in QML clipping with OpenGL 2.0 paint engine.Samuel Rødal2010-09-281-4/+4
| |/
* | Fix QPainter::clipBoundingRect() for QRectF clip.Andreas Kling2010-09-261-0/+2
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-211-1/+1
|\ \ | |/
| * Merge commit 'staging-1/4.7' into doc-4.7Morten Engvoldsen2010-09-031-2/+3
| |\
| * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Morten Engvoldsen2010-09-021-1/+1
| |\ \
| | * | Fixed spelling, broken links, and missing default values.Jerome Pasion2010-08-301-1/+1
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-101-2/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix a crash when passing a null pixmap to QPainter::drawPixmapFragments().Trond Kjernåsen2010-09-011-1/+1
| * | | Fix QStaticText with OpenGL1 engineEskil Abrahamsen Blomfeldt2010-08-301-1/+2
| |/ /
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-301-3/+3
|\ \ \ | |/ /
| * | Apparently QPen::brush() can't return a NoBrush for a NoPen.Trond Kjernåsen2010-08-271-4/+4
| |/
* | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-08-251-2/+5
|\ \
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-251-2/+5
| |\ \ | | |/
| | * Fix mispositioned text with QStaticText and OpenVG graphics systemEskil Abrahamsen Blomfeldt2010-08-241-2/+5
* | | Fix tabArray support for boundingRect measurementJiang Jiang2010-08-231-1/+8
|/ /
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-131-6/+59
|\ \ | |/
| * Add text decoration support to QStaticTextJiang Jiang2010-08-101-13/+71
* | Added QPainter::clipBoundingRect() which is significantly fasterGunnar Sletta2010-08-091-0/+55
* | Merge remote branch 'origin/master' into qt-master-from-4.7Thiago Macieira2010-07-151-13/+55
|\ \
| * | Support text decoration in QPainter::drawGlyphs()Eskil Abrahamsen Blomfeldt2010-07-141-13/+55
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-151-1/+10
|\ \ \ | |/ / |/| / | |/
| * Warn when drawPixmapFragments is called with an invalid source rectAndy Shaw2010-07-051-0/+9
| * Made -graphicssystem trace work with Qt::TextBypassShaping flag.Samuel Rødal2010-06-291-1/+1
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-07-061-6/+10
|\ \
| * | QGLPixelBuffer should not rely on temporary QGLWidgets.Trond Kjernåsen2010-07-051-5/+5
| * | Check Qt::AA_X11InitThreads to determine pixmap usage in threads.Trond Kjernåsen2010-07-021-6/+7
| * | More work on GL threading.Trond Kjernåsen2010-07-021-4/+7
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-011-9/+9
|\ \ \ | |/ / |/| / | |/
| * Speed up calls to QPainter::setCompositionMode when the mode is unchangedSimon Hausmann2010-06-171-0/+2
| * Fixed missing stroke for flat ellipses.Samuel Rødal2010-06-151-4/+0
| * LayoutDirectionAuto is the default layout direction for QPainterLars Knoll2010-06-091-5/+7
* | Merge remote branch 'origin/master'Olivier Goffart2010-06-151-10/+38
|\ \
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-06-081-10/+38
| |\ \ | | |/
| | * More Pixmap cache key optimizationsJens Bache-Wiig2010-06-021-4/+4
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-021-0/+17
| | |\
| | | * Add the Qt::TextBypassShaping flag.Jocelyn Turcotte2010-05-311-0/+17
| | * | Speed up QStaticText with affine transformation on GL2 engineEskil Abrahamsen Blomfeldt2010-06-011-6/+17
| | |/
* | | New class: QGlyphsEskil Abrahamsen Blomfeldt2010-06-041-12/+40
|/ /
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-05-201-22/+21
|\ \ | |/
| * Merge remote branch 'origin/4.7' into HEADOlivier Goffart2010-05-191-2/+7
| |\
| * | doc: Fixed many broken links.Martin Smith2010-05-191-22/+21
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-05-191-2/+7
|\ \ \ | | |/ | |/|
| * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-171-2/+7
| |\ \ | | |/ | |/|
| | * Recalculate script item widths when forcing justificationEskil Abrahamsen Blomfeldt2010-05-061-2/+7