summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Make lupdate recognize TRANSLATOR comments in QtScript filesKent Hansen2010-11-222-12/+92
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-196-24/+42
|\
| * Record images on more than just the first frame.Alan Alpert2010-11-161-1/+1
| * Turn off font antialiasing during tests.Alan Alpert2010-11-161-10/+9
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-151-1/+6
| |\
| | * Take snapshots starting from the first frameAlan Alpert2010-11-151-1/+6
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-119-12/+282
| |\ \ | | |/
| * | qdoc: Added QML Elements to the Assistant indexMartin Smith2010-11-113-10/+20
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2010-11-117-10/+10
| |\ \
| * | | qdoc: Fixed virtualness and constness of the fileBase() function.Martin Smith2010-11-112-4/+7
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-1218-59/+518
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-118-11/+282
| |\ \ \
| | * | | Helper-side support for QMeeGoFenceSync.Michael Dominic K2010-11-118-11/+282
| | | |/ | | |/|
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-111-1/+0
| |\ \ \ | | |/ / | |/| |
| | * | remove pointless assignment of deprecated variableOswald Buddenhagen2010-11-101-1/+0
| | |/
| * | Doc: Fixing typoSergio Ahumada2010-11-093-4/+4
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-085-7/+7
| |\ \ | | |/ | |/|
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-055-7/+7
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-035-7/+7
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-11-035-7/+7
| | | | |\
| | | | | * Doc: Fixing typoSergio Ahumada2010-11-015-7/+7
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-051-2/+2
| |\ \ \ \ \
| | * | | | | Doc: adding html clasnames to the next and previous linksMorten Engvoldsen2010-11-041-2/+2
| | |/ / / /
| * | | | | Doc: Updated the configuration file to use the Qt 4.7 style sheets.David Boddie2010-11-051-34/+219
| * | | | | qdoc: Remove leading QML: text from certain node names.David Boddie2010-11-041-1/+5
| |/ / / /
* | | | | Ensured that the document nodes are sorted in the generated index.David Boddie2010-11-081-2/+69
* | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-11-051-1/+1
|\ \ \ \ \
| * \ \ \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-051-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Morten Engvoldsen2010-11-042-20/+7
| | |\ \ \ \ | | | |/ / /
| | * | | | Doc: Correcting character escape bugMorten Engvoldsen2010-11-041-1/+1
* | | | | | Prevent multiple modprobe messages for the same phoneShane Kearns2010-11-051-24/+9
* | | | | | Fix detection of N95 with linux 2.6.34+Shane Kearns2010-11-051-1/+1
|/ / / / /
* | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-042-4/+34
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-11-032-4/+34
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | qdoc: Added next and previous links to top of pages.Martin Smith2010-11-031-3/+1
| | * | Doc: updating the template to support search feature better.Morten Engvoldsen2010-11-031-1/+33
| | |/
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-032-20/+7
|\ \ \ | |/ /
| * | make the dtd reflect realityOswald Buddenhagen2010-11-021-18/+5
| * | fix qdoc doc generationOswald Buddenhagen2010-11-011-2/+2
| |/
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-011-0/+8
|\ \ | |/
| * Fix QML visual tests on Mac.Yann Bodson2010-11-011-0/+8
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-301-4/+2
|\ \ | |/
| * Update webview visual tests to new skip modeAlan Alpert2010-10-291-4/+2
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-294-6/+33
|\ \ | |/
| * Add 'skip' property that QML visual tests can useAlan Alpert2010-10-294-6/+33
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-276-6/+6
|\ \
| * \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-266-6/+6
| |\ \ | | |/
| | * Doc : Fixing typo.Sergio Ahumada2010-10-266-6/+6
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2637-272/+546
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-2527-261/+215
| |\ \ | | |/