summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-272-15/+4
|\
| * Moved the partial deployment section to qbase.pri.axis2010-09-271-15/+0
| * Made the Symbian menu close when switching native focus.axis2010-09-271-0/+4
* | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2412-170/+246
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-241-84/+96
| |\
| | * Fixed floating point overflow issues in QRasterizer::rasterizeLineSamuel Rødal2010-09-231-60/+79
| | * Fixed scaled point drawing with square cap in raster paint engine.Samuel Rødal2010-09-231-24/+17
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-231-2/+7
| |\ \ | | |/ | |/|
| | * Incorrect translations for application menu items on Mac OS X.Prasanth Ullattil2010-09-231-2/+7
| * | Compile on Symbian - rework the X11 mask patch a bit.Trond Kjernåsen2010-09-235-20/+17
| * | Fix text direction setting in QTextBlock layoutJiang Jiang2010-09-231-6/+0
| * | Fix text direction handling in QLabelJiang Jiang2010-09-232-11/+17
| * | Fixed QPixmap::resize() for X11 pixmap with masks.Trond Kjernåsen2010-09-231-9/+14
| * | QPainter not restored correctly in Graphics View.Bjørn Erik Nilsen2010-09-222-1/+4
| * | Setting QGraphicsItem::ItemClipsChildrenToShape forces ItemClipsToShapeBjørn Erik Nilsen2010-09-221-45/+79
| * | 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 git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-09-2411-85/+33
|\ \ \ | |/ /
| * | 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
| |/
* | Doc: call qApp->precessEvents after QSplashScreen::showMessageGeir Vattekar2010-09-241-0/+7
* | Doc: Said that QApplication exits when not able to open X11 displayGeir Vattekar2010-09-241-0/+6
|/
* 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