summaryrefslogtreecommitdiffstats
path: root/tools/assistant
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge commit 'oslo1/master' into oslo1-masterRohan McGovern2010-02-0142-1103/+2319
|\ \ \ | | |/ | |/|
| * | 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-214-20/+63
| |\ \
| * | | 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
| * | | 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-13142-144/+144
| |\ \ \
| * | | | Fix compilation of builds without WebKitSimon Hausmann2010-01-121-1/+1
| * | | | Merge branch '4.6'Thiago Macieira2009-12-262-51/+69
| |\ \ \ \
| * | | | | Assistant: Refactor help engine wrapper.ck2009-12-213-144/+187
| * | | | | Assistant: Fix console output glitch.ck2009-12-161-1/+1
| * | | | | Merge commit 'origin/4.6'Olivier Goffart2009-12-151-0/+2
| |\ \ \ \ \
| * | | | | | 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
| * | | | | | 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
| * | | | | | Assistant: More small refactorings + compile fix.ck2009-12-041-37/+49
| * | | | | | Merge branch '4.6'Thiago Macieira2009-12-032-0/+2
| |\ \ \ \ \ \
| * | | | | | | Assistant: Another small refactoring.ck2009-12-031-14/+33
| * | | | | | | Assistant: Small refactoring to prepare for upcoming functional change.ck2009-12-031-18/+24
| * | | | | | | Assistant: Compile fix for namespaced Qt.ck2009-12-032-0/+8
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtck2009-12-032-4/+8
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-12-022-4/+8
| | |\ \ \ \ \ \ \
| * | | | | | | | | Assistant: Encapsulate accesses to help engine.ck2009-12-0326-772/+1224
| |/ / / / / / / /
* | | | | | | | | Merge commit 'origin/4.6' into oslo1-masterRohan McGovern2010-02-01142-222/+291
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Assistant: Set correct mime type for text documents.ck2010-01-211-4/+4
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | QtHelp: Enable dynamic translation.ck2010-01-214-20/+63
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-191-1/+1
| |\ \ \ \ \ \
| | * | | | | | Bump version to 4.6.2.Jason McDonald2010-01-191-1/+1
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Return some fake data if we can't handle the network request.kh12010-01-191-1/+2
| |/ / / / /
| * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Jason McDonald2010-01-061-1/+1
| |\ \ \ \ \
| | * | | | | Remove warning "statement with no effect"Thiago Macieira2010-01-061-1/+1
| | | |_|_|/ | | |/| | |
| * | | | | Update copyright year to 2010Jason McDonald2010-01-06167-169/+169
| |/ / / /
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into qt-inte...Qt Continuous Integration System2009-12-122-51/+69
| |\ \ \ \ | | |_|_|/ | |/| | |