summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-246-25/+20
|\ \ | |/ |/|
| * QML Debugging: Documentation fixesLasse Holmstedt2010-09-241-15/+3
| * dist/changes: QML Debugging changesLasse Holmstedt2010-09-241-1/+5
| * Updated changes-4.7.1.Kim Motoyoshi Kalland2010-09-241-1/+3
| * 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-1 into 4.7-integ...Qt Continuous Integration System2010-09-245-8/+23
|\
| * Assistant: Don't register internal doc when using custom collection.Christian Kandeler2010-09-234-3/+16
| * Assistant: Move comment to the right place.Christian Kandeler2010-09-231-5/+7
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-244-114/+125
|\ \
| * | Fixed floating point overflow issues in QRasterizer::rasterizeLineSamuel Rødal2010-09-232-61/+79
| * | Fixed scaled point drawing with square cap in raster paint engine.Samuel Rødal2010-09-232-24/+39
| * | 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-247-34/+98
|\ \ \ | |_|/ |/| |
| * | Disallow patching capabilities of executablesMiikka Heikkinen2010-09-232-17/+33
| * | Merge branch 'eventStarvationFixes' into 4.7-s60axis2010-09-234-16/+59
| |\ \
| | * | 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-233-4/+17
| | * | Fixed deployment when using shadow builds.axis2010-09-231-1/+1
| | * | Marked a test as XFAIL on Symbian.axis2010-09-231-0/+4
| | * | Made posted events part of the round robin queue.axis2010-09-233-6/+32
| * | | 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-235-7/+37
|\ \ \ \ | |_|_|/ |/| | |
| * | | Designer: Minor BT issue: '-' button in Signal/Slot editor not updated.Friedemann Kleint2010-09-231-1/+1
| * | | Changelog: 4.7.1 (uic/Designer).Friedemann Kleint2010-09-231-0/+1
| * | | Incorrect translations for application menu items on Mac OS X.Prasanth Ullattil2010-09-231-2/+7
| * | | Update the changelog with the SSE work done for Qt 4.7.1Benjamin Poulain2010-09-231-2/+7
| * | | build configure.exe directly in source dirOswald Buddenhagen2010-09-231-1/+1
| * | | fix build key generation for realOswald Buddenhagen2010-09-231-1/+1
| * | | my changes for 4.7.1Peter Hartmann2010-09-231-0/+10
| * | | My Qt 4.7.1 changesEskil Abrahamsen Blomfeldt2010-09-231-0/+9
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-2320-148/+526
|\ \ \ \
| * | | | 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-2319-117/+493
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-2319-117/+493
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-2219-117/+493
| | | |\ \ \
| | | | * | | QPainter not restored correctly in Graphics View.Bjørn Erik Nilsen2010-09-223-6/+47
| | | | * | | Setting QGraphicsItem::ItemClipsChildrenToShape forces ItemClipsToShapeBjørn Erik Nilsen2010-09-222-45/+267
| | | | * | | 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-2210-64/+157
| | | | |\ \ \
| | | | | * | | Fix warning on MSVCOlivier Goffart2010-09-221-1/+1
| | | | | * | | QThread: make sure start works even if called after exitOlivier Goffart2010-09-223-0/+45
| | | | | * | | 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