summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-2157-342/+516
|\
| * 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
| | | * | | | | | | | | | | Fixed spelling, broken links, and missing default values.Jerome Pasion2010-08-3010-18/+18
| * | | | | | | | | | | | | Fixed compilation of qdrawhelper.cpp with XLC 10Rohan McGovern2010-09-161-1/+1
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-161-17/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2010-09-162-1/+10
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | QS60style: itemview selection indication works incorrectlySami Merila2010-09-161-17/+23
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-163-13/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Fixed regression in QPixmap::size() for null pixmaps.Samuel Rødal2010-09-161-1/+1
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-1557-382/+608
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Make sure mapSelectionFromSource does not return a selection with invalid ran...Stephen Kelly2010-09-151-4/+12
| | | |/ / / / / / / / / /
| | * | | | | | | | | | | Doc: Continued work on the QML documentation.David Boddie2010-09-141-8/+7
| | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Fix bug in 34b805d66c09fb324d1b6a7bcf259e8743ef3894Thomas Hartmann2010-09-151-2/+3
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-142-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Completing the interface for children/data/resourcesThomas Hartmann2010-09-142-1/+9
| * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-141-2/+4
| |\ \ \ \ \ \ \ \ \ \ \