summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qtwebkit-4.6' into qt-4.6Jocelyn Turcotte2009-11-0434-152/+517
|\
| * Re-apply change 62923e7edacf6a1d28accaff70cbdc0176890d62 by Joerg BornemannJoerg Bornemann2009-11-041-0/+11
| * Re-apply change cadd19cd98b9a6ff7ff8755f7774027400aadb0f by Shane KearnsShane Kearns2009-11-041-0/+15
| * Re-apply change b4be512bffba65bf4577a2b8275d7c38ce5501a1 by David BoddieDavid Boddie2009-11-041-0/+17
| * Re-apply change 7293097060383bcb75ee9f3e6a270de3b5bee2dc by Thiago MacieiraThiago Macieira2009-11-041-0/+37
| * Re-apply change cbb2efb13cdf05aabc245e2b0157883146cf069d by Thiago MacieiraThiago Macieira2009-11-041-1/+2
| * Re-apply change 914de965a8380e7620209c7b26e984ed9fbccc57 by David BoddieDavid Boddie2009-11-042-7/+91
| * Re-apply change 422c747c5108f9f0c544b5dd0789df32aa498fb7 by Martin SmithMartin Smith2009-11-041-1/+1
| * Re-apply change 2fbc823bb66db6ef6f6acc74d2baa96ebe1dec81 by Jocelyn TurcotteJocelyn Turcotte2009-11-041-2/+6
| * Re-apply change 1db4a133a9d35e00bad50541fb8d64079a7debea by Liang QILiang QI2009-11-044-2/+10
| * Updated WebKit from /home/jturcott/dev/webkit/ to qtwebkit/qtwebkit-4.6 ( 16a...Jocelyn Turcotte2009-11-0440-342/+530
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-11-0415-117/+237
|\ \ | |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Eskil Abrahamsen Blomfeldt2009-11-0473-873/+1227
| |\
| * | Add QMacGLCompatTypes to QGLShaderProgram APITom Cooksey2009-11-042-0/+61
| * | update harfbuzz to the latest version from fd.orgLars Knoll2009-11-048-82/+167
| * | Fixed crash with nullptr in QPixmapData::transformedGunnar Sletta2009-11-041-2/+2
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6Gunnar Sletta2009-11-043-32/+5
| |\ \
| | * | Fixed hardcoded GL library names on WinCE.Trond Kjernåsen2009-11-041-16/+1
| | * | Fixed compilation and linking of EGL on Windows CE.Trond Kjernåsen2009-11-042-16/+4
| | * | Compile on Mac OS XEskil Abrahamsen Blomfeldt2009-11-041-1/+1
| * | | Fixed crash when QImage::createAlphaMask() runs out of memoryGunnar Sletta2009-11-041-1/+2
| |/ /
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-049-22/+43
|\ \ \ | |_|/ |/| |
| * | Doc: Fixed qdoc warnings.David Boddie2009-11-048-24/+37
| * | Doc: fix broken link in QBitmapAndy Nichols2009-11-041-1/+1
* | | Merge commit '51c9b68' into 4.6Morten Johan Sørvig2009-11-0440-580/+802
|\ \ \
| * | | Compile fix after the last gesture api changeDenis Dzyubenko2009-11-036-55/+47
| * | | Toolbar Icons are clipped on Leopard in Cocoa port.Prasanth Ullattil2009-11-031-1/+2
| * | | Gesture api review.Denis Dzyubenko2009-11-0324-265/+270
| * | | Modified gesture events propagation.Denis Dzyubenko2009-11-035-12/+54
| * | | Made native Pan gesture work on Windows.Denis Dzyubenko2009-11-038-72/+90
| * | | Implemented pinch gesture recognizer.Denis Dzyubenko2009-11-038-91/+123
| * | | Added QGraphicsObject::ungrabGesture()Denis Dzyubenko2009-11-033-4/+18
| * | | Documentation fixes related to gestures doc.Denis Dzyubenko2009-11-032-3/+4
| * | | Cocoa: fix double emit bug from file dialogRichard Moe Gustavsen2009-11-031-3/+7
| * | | Titlebar icon (for e.g. Assistant) not visible in Cocoa.Prasanth Ullattil2009-11-023-0/+31
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-platform-team into 4.6Morten Johan Sørvig2009-10-305-22/+109
| |\ \ \
| | * | | Make GestureCancelPolicy work for graphicsviewThomas Zander2009-10-305-22/+109
| * | | | Fix QDesktopServices::DataLocation on Mac.Morten Johan Sørvig2009-10-302-12/+6
| * | | | Fix indentation.Morten Johan Sørvig2009-10-301-89/+89
| * | | | Fix issue with wrong QMessagebox icons on Mac.Morten Johan Sørvig2009-10-301-2/+3
| |/ / /
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-platform-team into 4.6Bradley T. Hughes2009-10-3043-397/+1344
| |\ \ \
* | | | | Fix compiler error.Aleksandar Sasha Babic2009-11-041-1/+1
* | | | | Merge branch '4.6-s60' into 4.6axis2009-11-0425-145/+284
|\ \ \ \ \
| * | | | | Made xmlpatterns autotests compile for SymbianMiikka Heikkinen2009-11-032-2/+2
| * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merilä2009-11-032-2/+4
| |\ \ \ \ \
| | * | | | | Fixed an input method bug when erasing the last character.axis2009-11-032-2/+4
| * | | | | | Inclusion of QtOpenVg overwrites all other modules in s60install.proSami Merilä2009-11-031-1/+1
| |/ / / / /
| * | | | | Fix cleanupstack crash on exit in Symbian OS 9.2Shane Kearns2009-11-032-6/+13
| * | | | | Fix for potential crash in S60 styleShane Kearns2009-11-031-7/+7
| * | | | | Fix crash in QApplication autotest introduced by native pixmaps (S60 3.1)Shane Kearns2009-11-031-11/+11