summaryrefslogtreecommitdiffstats
path: root/tests/auto/qmap
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-2/+2
|\
| * Merge license header changes from 4.5Volker Hilsheimer2009-06-161-2/+2
| |\
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
* | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-251-8/+9
|\ \ \ | |/ /
| * | Fix compilation with strict iteratorsDavid Faure2009-05-181-8/+9
| |/
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-04-271-10/+0
|\ \ | |/
| * Remove obsolete code from autotests.Jason McDonald2009-04-161-10/+0
| * Long live Qt 4.5!Lars Knoll2009-03-233-0/+861
* Long live Qt for S60!axis2009-04-243-0/+859