summaryrefslogtreecommitdiffstats
path: root/tools/assistant
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-1119-47/+54
|\
| * Assistant: Fix compile warning for empty header.ck2010-03-086-29/+17
| * Assistant: Fix warnings about unused variables.ck2010-03-053-4/+4
| * Set database write behavior to synchronous=OFF and increase page cache.kh12010-03-042-0/+11
| * Assistant: Don't warn for non-existing English to English translations.ck2010-03-021-1/+1
| * Assistant: Un-watch files at shutdown.ck2010-03-021-0/+7
| * Help system: Build search index with low priority.ck2010-03-022-2/+2
| * Fixed the close button of the find widget in AssistantThorbjørn Lindeijer2010-03-011-0/+1
| * Merge remote branch 'origin/master' into berlin-masterJoerg Bornemann2010-02-262-2/+2
| |\
| * | Assistant: Make ~AbstractHelpViewer() virtual.ck2010-02-241-1/+1
| * | tr()-Fixes in Assistant/QHelpLib code.Friedemann Kleint2010-02-243-10/+10
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-012-2/+2
|\ \ \ | | |/ | |/|
| * | improve 64 bit support on windowsThierry Bastian2010-02-231-1/+1
| * | Fix compilationOlivier Goffart2010-02-221-1/+1
| |/
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-2331-236/+773
|\ \ | |/
| * Assistant: Remove 'namespace qt' from new files in 4.7Thiago Macieira2010-02-203-6/+0
| * Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-2018-178/+738
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-1917-168/+728
| | |\
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-1817-168/+728
| | | |\
| | | | * Implement bookmark manager widget.kh12010-02-178-52/+606
| | | | * Fix memmory leak.kh12010-02-171-0/+1
| | | | * Fix spacing.kh12010-02-171-0/+3
| | | | * Prevent renaming the bookmarks menu root item, it's just a placeholder.kh12010-02-172-4/+17
| | | | * Fix broken set last shown pagen when the last page was about:blank.kh12010-02-171-2/+3
| | | | * Move launch with external app in base class.kh12010-02-176-103/+82
| | | | * Make sure the bookmarks menu updates on add/ remove as well.kh12010-02-171-4/+6
| | | | * Fix broken Drag&Drop, reset and clear the model if we set new bookmarks.kh12010-02-171-3/+10
| | * | | Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-188-6/+21
| | |\ \ \ | | | |/ /
| | * | | Fix no-webkit compiler helpviewerRhys Weatherley2010-02-174-10/+16
| | | |/ | | |/|
| * | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-1910-52/+35
| |\ \ \ | | |_|/ | |/| |
| | * | Help system: Remove hard-coded qt namespace.ck2010-02-1811-58/+39
| | * | Help system: Handle all Clucene exceptions.ck2010-02-181-118/+112
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-171-2/+3
| | |\ \
| | | * | Fix broken image loading on windows.kh12010-02-161-2/+3
| | * | | Bump version to 4.6.3.Jason McDonald2010-02-151-1/+1
| | |/ /
* | | | 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