summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ | | |/
| | * Major refactoring: creating a new QPixmapData subclass for live textures.Michael Dominic K2010-10-217-112/+60
| | * Fix recording of visual tests.Michael Brasser2010-10-191-0/+2
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-181-3/+6
| | |\
| | | * Use the real screen size in meegographics surface scaling, not hardcoded one.Michael Dominic K2010-10-181-3/+6
| | * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-163-7/+7
| | |\ \ | | | |/
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-154-9/+10
| | | |\
| | | | * Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-1415-126/+125
| | | | |\
| | * | | \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-154-19/+21
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-1517-143/+142
| | | |\ \ \
| | | | * | | Workaround for QFileSystemWatcher regressionJarek Kobus2010-10-141-3/+3
| | | | * | | Assistant: Insert all keywords with empty ids, as ids are not mendatory.kh12010-10-121-6/+7
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-1115-134/+132
| | | | |\ \ \
| | | | | * | | Make qtconfig help messages translatableVictor Ostashevsky2010-10-111-10/+10
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-0814-124/+122
| | | | | |\ \ \
| | | | | | * \ \ Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-072-4/+4
| | | | | | |\ \ \
| | | | | | * \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-10-072-0/+166
| | | | | | |\ \ \ \
| | | * | | | | | | | Keep qmlviewer from disappearingAlan Alpert2010-10-151-0/+1
| | | |/ / / / / / /
| | * | | | | | | | Doc: fixing unclosed <p>Morten Engvoldsen2010-10-151-1/+1
| | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-111-5/+12
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | * | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0813-407/+199
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | Added Q_INVOKABLE to ignore file.Jerome Pasion2010-10-081-2/+3
| | * | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-072-0/+166
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | / / | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | qdoc: Don't generate html output for png files.Martin Smith2010-10-071-2/+2
| | * | | | | | Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cppMorten Engvoldsen2010-10-071-2/+2
| | | |_|_|/ / | | |/| | | |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-0410-5/+19
| | |\ \ \ \ \
| | * | | | | | Doc: Fixed the in-repository licenses for the documentation.David Boddie2010-10-0411-55/+55