summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Improve the reliability of tst_QGridLayout::minMaxSize()Bradley T. Hughes2009-11-051-2/+2
* My changelog for Qt 4.6.0Denis Dzyubenko2009-11-051-1/+26
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-platform-team into 4.6Morten Johan Sørvig2009-11-057-23/+497
|\
| * Fixed pinching in the imagegestures example.Denis Dzyubenko2009-11-052-8/+11
| * Implemented Tap and TapAndHold gestures.Denis Dzyubenko2009-11-056-1/+303
| * Small improvement in the imagegesture example.Denis Dzyubenko2009-11-051-1/+1
| * Improved pinch gesture.Denis Dzyubenko2009-11-051-1/+7
| * Implemented QSwipeGesture recognizer using touch events.Denis Dzyubenko2009-11-055-13/+176
* | Make configure warn on incompatible gcc / SDK.Morten Johan Sørvig2009-11-051-0/+12
|/
* Merge remote branch 'qt-official/4.6' into 4.6Morten Johan Sørvig2009-11-051017-40116/+29765
|\
| * Cascade delete to cleanup autotest properly.Bill King2009-11-051-2/+2
| * Add new cross schema relation autotestBill King2009-11-051-5/+31
| * 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
| * | Added changes to ChangeLog.Gabriel de Dietrich2009-11-041-2/+5
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-11-0427-155/+432
| |\ \
| | * | Some of my changes in the changelogOlivier Goffart2009-11-041-2/+56
| | * | added my changes to the ChangeLogHarald Fernengel2009-11-041-0/+19
| | |/
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Eskil Abrahamsen Blomfeldt2009-11-04117-1220/+1883
| | |\
| | | * eval: add key for the installer to grep for.Daniel Molkentin2009-11-043-2/+2
| | * | Add QMacGLCompatTypes to QGLShaderProgram APITom Cooksey2009-11-042-0/+61
| | * | updates to the test after harfbuzz updateLars Knoll2009-11-043-14/+78
| | * | 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-048-52/+45
| | |\ \
| | | * | Fixed hardcoded GL library names on WinCE.Trond Kjernåsen2009-11-044-33/+11
| | | * | Fixed compilation and linking of EGL on Windows CE.Trond Kjernåsen2009-11-044-19/+34
| | | * | 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-0411-28/+49
| |\ \ \ | | |_|/ | |/| |
| | * | Doc: Fixed qdoc warnings.David Boddie2009-11-0411-33/+46
| | * | Doc: fix broken link in QBitmapAndy Nichols2009-11-041-1/+1
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-11-04225-3869/+5024
| |\ \ \
| | * \ \ Merge commit '51c9b68' into 4.6Morten Johan Sørvig2009-11-0455-806/+1161
| | |\ \ \
| | * | | | Fix compiler error.Aleksandar Sasha Babic2009-11-041-1/+1
| | * | | | Changelog 4.6.0: Designer/uic/uic3.Friedemann Kleint2009-11-041-0/+23
| | * | | | Merge branch '4.6-s60' into 4.6axis2009-11-0441-186/+365
| | |\ \ \ \
| | | * | | | Made xmlpatterns autotests compile for SymbianMiikka Heikkinen2009-11-0315-32/+48
| | | * | | | 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
| | | |/ / / /