summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ma...Pulse Build System2010-01-221-4/+5
|\
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ma...Pulse Build System2010-01-221-4/+5
| |\
| | * Fixed compile when Qt is configured with -no-webkitRohan McGovern2010-01-221-2/+2
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ma...Pulse Build System2010-01-221-4/+5
| | |\
| | | * Merge remote branch 'origin/master'Olivier Goffart2010-01-0847-1084/+5000
| | | |\
| | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Bill King2009-12-161-4/+5
| | | |\ \
| | | | * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtGunnar Sletta2009-11-1329-547/+1120
| | | | |\ \
| | | | * \ \ Merge branch '4.6' of ..\qt-graphics-4.6Gunnar Sletta2009-11-1355-603/+933
| | | | |\ \ \
| | | | * \ \ \ Merge branch '4.6' of c:\dev\qt-graphics-4.6Gunnar Sletta2009-11-0426-90/+273
| | | | |\ \ \ \
* | | | | | | | | QtHelp: Minor clean-ups.ck2010-01-222-7/+4
|/ / / / / / / /
* | | | | | | | Assistant: Fix compliation for -no-webkit.ck2010-01-221-2/+5
|/ / / / / / /
* | | | | | | Merge branch '4.6'Thiago Macieira2010-01-219-20/+192
|\ \ \ \ \ \ \
| * | | | | | | QtHelp: Enable dynamic translation.ck2010-01-214-20/+63
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-211-0/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Designer: Fixed a crash when previewing in a non-existent style.Friedemann Kleint2010-01-211-0/+2
| * | | | | | | | 1st attempt at USB serial port enumerator for linuxShane Kearns2010-01-204-0/+127
| * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-197-11/+11
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Bump version to 4.6.2.Jason McDonald2010-01-197-11/+11
| * | | | | | | | Return some fake data if we can't handle the network request.kh12010-01-191-1/+2
| |/ / / / / / /
* | | | | | | | Use HighlightAllOccurrences to have highlighting after full text search.kh12010-01-212-36/+68
* | | | | | | | Assistant: Simplify check for SQLITE plugin.ck2010-01-211-14/+4
* | | | | | | | Assistant: Fix translations.ck2010-01-211-15/+18
* | | | | | | | Force the creation of the default collection file directory.kh12010-01-191-1/+2
* | | | | | | | Merge branch '4.6'Thiago Macieira2010-01-182-2/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-151-1/+2
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-141-1/+2
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Iain2010-01-131211-1225/+1225
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | Use MMP keyword, not compiler flags, to update FPU option on SymbianIain2010-01-131-1/+2
| * | | | | | | | | | Doc: Added placeholder pages for new examples and updated the overviews.David Boddie2010-01-151-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Assistant: Extend list of file types to open internally.ck2010-01-141-1/+2
* | | | | | | | | | Assistant: Use isLocalUrl() to decide whether a page is internal.ck2010-01-143-21/+18
* | | | | | | | | | Assistant: Fix bug that can lead to infinite loop in edge cases.ck2010-01-141-2/+3
* | | | | | | | | | Assistant: Extend 54d1ad11a4f35c0484418e5d18537daaccc2c6ab.ck2010-01-141-1/+2
* | | | | | | | | | Assistant: Open non-HTML content in external application.ck2010-01-144-14/+20
* | | | | | | | | | Use QTemporaryFile for opening documents in external applications.ck2010-01-141-12/+12
* | | | | | | | | | Merge branch '4.6'Thiago Macieira2010-01-131186-1253/+1260
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2010-01-131211-1225/+1225
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-091211-1225/+1225
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-071211-1225/+1225
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Use the lowercase/shortname.h headers for Phonon includesThiago Macieira2010-01-061-2/+2
| | | | * | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Jason McDonald2010-01-066-33/+183
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Remove warning "statement with no effect"Thiago Macieira2010-01-061-1/+1
| | | | * | | | | | | | Update copyright year to 2010Jason McDonald2010-01-061211-1222/+1222
| * | | | | | | | | | | QFile cannot deal with crlf-translated stdio, so use binary modeOswald Buddenhagen2010-01-121-0/+12
| * | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-093-56/+49
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | don't complain about unresolved base when the reference is absoluteOswald Buddenhagen2010-01-071-1/+1
| | * | | | | | | | | | fix sametext and number heuristicsOswald Buddenhagen2010-01-061-45/+46
| | * | | | | | | | | | fix number heuristics, part 1Oswald Buddenhagen2010-01-061-2/+2
| | * | | | | | | | | | remove dead codeOswald Buddenhagen2010-01-061-8/+0
| | |/ / / / / / / / /
* | | | | | | | | | | Merge branch '4.6'Thiago Macieira2010-01-123-11/+7
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /