summaryrefslogtreecommitdiffstats
path: root/tools/assistant
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-1912-10/+31
|\
| * Fix compilation of Qt Assistant when WebKit isn't built.Thiago Macieira2010-02-174-4/+10
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-168-6/+21
| |\
| | * Fix copyright year.Jason McDonald2010-02-166-6/+6
| | * Fix broken license headers.Jason McDonald2010-02-162-0/+15
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-1817-821/+1127
|\ \ \ | |/ /
| * | Assistant: Rebuild search index at most once at start-up.ck2010-02-153-3/+34
| |/
| * Refactor font and zoom handling, reduces clutter in central widget.kh12010-02-1210-167/+212
| * Some more refactoring.kh12010-02-1212-358/+462
| * Move the QWebView based help viewer into it's own source files.kh12010-02-129-434/+560
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-16139-11404/+6530
|\ \ | |/
| * Help system: Handle all Clucene exceptions.ck2010-02-121-118/+112
| * Assistant: Remove assertion for all files being watched.ck2010-02-101-9/+13
| * Move find widget in it's own source file. Some further cleanup.kh12010-02-095-266/+394
| * Assistant: Add missing license header.ck2010-02-092-7/+34
| * Compile fixes.ck2010-02-083-12/+12
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-0832-1284/+2298
| |\
| | * Rewrote bookmark handling, the previous code was just plain awful.kh12010-02-0519-1199/+2174
| | * Small style cleanup.kh12010-02-051-6/+4
| | * Fix some warnings.kh12010-02-051-0/+3
| | * Assistant: Treat "unfiltered" filter in a apecial way.ck2010-02-024-29/+30
| | * Assistant: Give meaningful context to translations.ck2010-02-027-48/+85
| | * Assistant: Eliminate private tr contexts.ck2010-01-292-2/+2
| * | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-0415-58/+60
| |\ \
| * | | Add Qt help hungarian translationLaszlo Papp2010-02-031-0/+1
| * | | Add Assistant hungarian translationLaszlo Papp2010-02-031-0/+1
| * | | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-011-10/+10
| |\ \ \
| * \ \ \ 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