summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-2459-410/+1006
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-09-2411-5/+332
| |\
| | * Updated WebKit to 6e15c3404d15a8ab72242152ec966e5e388161a2Simon Hausmann2010-09-2411-5/+332
| * | Do not set DESTDIR to the current directoryDenis Dzyubenko2010-09-243-7/+7
| * | Fix dependency on the plugins rule for multimediaAndy Shaw2010-09-241-1/+2
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-243-113/+103
| |\
| | * 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
| | * Don't try to use the texture_from_pixmap extension in GL on desktop/X11.Trond Kjernåsen2010-09-232-29/+7
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-09-243-16/+37
| |\ \
| | * \ Merge branch 'eventStarvationFixes' into 4.7-s60axis2010-09-232-15/+31
| | |\ \
| | | * | Made it more clear what the okToRun function does by renaming it.axis2010-09-232-12/+12
| | | * | Fixed event starvation on Symbian if timers were constantly recreatedaxis2010-09-232-0/+17
| | | * | Made posted events part of the round robin queue.axis2010-09-232-6/+5
| | * | | Avoid OpenVG rendering errors when stroking an aliased path.Jason Barron2010-09-231-1/+6
| * | | | 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
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-2316-143/+232
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Compile on Symbian - rework the X11 mask patch a bit.Trond Kjernåsen2010-09-236-22/+19
| | * | | 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
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-2315-112/+199
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-2315-112/+199
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-2215-112/+199
| | | | |\ \
| | | | | * | 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
| | | | | * | Fix compilationOlivier Goffart2010-09-221-2/+2
| | | | | * | Fixed drawing of QPixmaps with masks in the GL 2 and X11 engines.Trond Kjernåsen2010-09-226-2/+22
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-228-64/+94
| | | | | |\ \
| | | | | | * | Fix warning on MSVCOlivier Goffart2010-09-221-1/+1
| | | | | | * | QThread: make sure start works even if called after exitOlivier Goffart2010-09-222-0/+4
| | | | | | * | Revert "Fixed painter path drawing on FBO without stencil buffer."Kim Motoyoshi Kalland2010-09-222-30/+0
| | | | | | * | 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
| | | | | | * | Fixed stencil buffer on FBOs with OpenGL ES.Kim Motoyoshi Kalland2010-09-222-27/+79
| | | | | | * | 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
| * | | | | | | Improved Symbian4 platform detectionMiikka Heikkinen2010-09-233-31/+57
| |/ / / / / /
| * | | | | | Various declarative autotest additions.Michael Brasser2010-09-231-1/+1
| * | | | | | Update QtDeclarative def filesJoona Petrell2010-09-232-3/+7
| * | | | | | Fix ListModel::set() so the implementation and docs areBea Lam2010-09-231-2/+3
| * | | | | | Improve docs for Qt.quit()Bea Lam2010-09-231-1/+3
| * | | | | | Doc fix.Michael Brasser2010-09-231-1/+1
| * | | | | | Remove unused, unexported class.Michael Brasser2010-09-234-127/+0
| * | | | | | Remove dead code paths in declarative list model code.Michael Brasser2010-09-234-44/+0
| |/ / / / /
| * | | | | Move includes after copyright blockMartin Jones2010-09-221-5/+2
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-229-10/+314
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Mitigate private header problems in QtCreator by adding semi-private APIKai Koehne2010-09-222-0/+98
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-229-10/+216
| | |\ \ \ \ | | | |/ / / | | |/| | |