summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'oslo1/master' into oslo1-masterRohan McGovern2010-02-0145-1120/+2361
|\
| * 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
| |\ \ \ \ \ \ \
| * | | | | | | | 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
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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 branch '4.6'Thiago Macieira2010-01-123-11/+7
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix compilation of builds without WebKitSimon Hausmann2010-01-121-1/+1
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Merge branch '4.6'Thiago Macieira2010-01-0811-55/+240
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-12-2638-916/+4604
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Assistant: Refactor help engine wrapper.ck2009-12-213-144/+187
| * | | | | | | | | | | | Assistant: Fix console output glitch.ck2009-12-161-1/+1
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | qdbus: short forms to get/set propertiesGiuseppe Bilotta2009-12-151-12/+36
| * | | | | | | | | | | Merge branch '4.6'Thiago Macieira2009-12-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge commit 'origin/4.6'Olivier Goffart2009-12-153-3/+12
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Assistant: Topic chooser links correctly to Urls with identical titles.ck2009-12-142-12/+13
| * | | | | | | | | | | | | qhelpgenerator: Don't insert identical indices.ck2009-12-141-2/+12
| * | | | | | | | | | | | | Assistant: Performance improvements in qhelpgenerator.ck2009-12-142-13/+16
| * | | | | | | | | | | | | Assistant: Added rebuild-search-index command line option.ck2009-12-103-3/+40
| * | | | | | | | | | | | | Assistant: Make doc file watching work for the intended use case.ck2009-12-092-1/+75
| * | | | | | | | | | | | | Assistant: Try to reload open pages on doc file update.ck2009-12-095-10/+23
| * | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtck2009-12-093-5/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-12-083-5/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Assistant: Allow search tab to be displayed on start-up.ck2009-12-081-2/+2
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Assistant: Don't re-load saved pages that don't exist anymore.ck2009-12-081-11/+13
| * | | | | | | | | | | | | | Assistant: Add "shared" directory to dependency list.ck2009-12-071-0/+1
| * | | | | | | | | | | | | | Assistant: Use tracing macro in all functions.ck2009-12-0718-0/+472
| * | | | | | | | | | | | | | Assistant: Logical re-structuring of start-up code.ck2009-12-076-148/+172
| * | | | | | | | | | | | | | Cleanup, no functional change.kh12009-12-071-23/+30
| * | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-12-0511-28/+170
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Assistant: More small refactorings + compile fix.ck2009-12-041-37/+49