summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Fixed drawing of QPixmaps with masks in the GL 2 and X11 engines.Trond Kjernåsen2010-09-224-1/+17
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-223-7/+11
|\
| * Fix warning on MSVCOlivier Goffart2010-09-221-1/+1
| * Fix a crash with D&d on mingwThierry Bastian2010-09-221-6/+6
| * Revert "Keep other text format with QTextOption::SuppressColors tag on"Jiang Jiang2010-09-221-6/+2
| * Keep other text format with QTextOption::SuppressColors tag onJiang Jiang2010-09-221-2/+6
| * QTreeView: do not scroll to top if last item is removedFrank Reininghaus2010-09-221-0/+4
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-226-6/+1
|\ \ | |/ |/|
| * fix build with QT_NO_GESTURESRomain Pokrzywka2010-09-211-1/+1
| * remove extra includesRitt Konstantin2010-09-215-5/+0
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-224-77/+31
|\ \
| * | Fixed drawing a large number of glyphs with the same font under GL.Trond Kjernåsen2010-09-212-8/+18
| * | Fixes bezier curves not being drawn when it is a line.Yoann Lopes2010-09-211-41/+0
| * | Avoid creating copy of an image in memory when storing as jpegaavit2010-09-211-28/+13
| |/
* | Button remains pressed if release event happens outside of widgetSami Merila2010-09-211-2/+1
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-203-13/+10
|\
| * Fixed compile warning on Windows.Kim Motoyoshi Kalland2010-09-201-1/+1
| * Fixed color of cosmetic pens when printing under Windows.Trond Kjernåsen2010-09-201-1/+1
| * Fixed infinite loop when loading jpeg without EOI from memory.Kim Motoyoshi Kalland2010-09-201-11/+8
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-201-4/+4
|\ \ | |/ |/|
| * Fixed memory leak in Symbian when Options menu was launched.Janne Anttila2010-09-201-4/+4
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-203-7/+21
|\ \ | |/ |/|
| * Give a warning in QPixmap::handle() if pixmap is not X11 class.Samuel Rødal2010-09-201-2/+6
| * Make QStaticText honor QPainter::pen() for rich text on X11 w/rasterEskil Abrahamsen Blomfeldt2010-09-201-1/+4
| * Fixed memory corruption issue in qt_blurImage for Indexed8 images.Samuel Rødal2010-09-171-4/+11
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-172-0/+8
|\ \ | |/ |/|
| * Make qml debugging work with command line argumentsLasse Holmstedt2010-09-172-0/+8
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-173-30/+32
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-173-30/+32
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-163-30/+32
| | |\ \
| | | * | QGraphicsItem::childrenBoundingRect behavior breaks QGraphicsEffect::sourceBo...Bjørn Erik Nilsen2010-09-162-12/+19
| | | * | Wrong bounding rect returned by QGraphicsEffect::boundingRect().Bjørn Erik Nilsen2010-09-162-20/+12
| | | * | Compile on MacEskil Abrahamsen Blomfeldt2010-09-161-0/+3
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-172-13/+29
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | QS60Style does not show checkbox for checkable item in QTreeViewSami Merila2010-09-171-2/+2
| * | | | Panic in qs60style.cpp while drawing a QTreeViewSami Merila2010-09-172-11/+27
| |/ / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-1712-20/+40
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-166-31/+53
| |\ \ \ | | |/ /
| * | | Doc: Listed undoable operations in QTextDocumentGeir Vattekar2010-09-151-1/+12
| * | | Doc: Note on updating proxy models with dynamic sort filtersGeir Vattekar2010-09-151-0/+8
| * | | git Merge branch '4.7-upstream' into 4.7-docJesper Thomschutz2010-09-1524-140/+263
| |\ \ \
| * \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-138-80/+18
| |\ \ \ \
| * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-112-2/+6
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-107-7/+40
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-0922-150/+270
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-074-10/+18
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-0716-311/+333
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge commit 'staging-1/4.7' into doc-4.7Morten Engvoldsen2010-09-0326-234/+517
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Morten Engvoldsen2010-09-0211-20/+21
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Clarified iterator semantic in documentation and added a code snippet to a QM...Jerome Pasion2010-08-311-2/+3