summaryrefslogtreecommitdiffstats
path: root/tools/assistant
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | 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
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix broken delete key, some cleanup.kh12009-12-081-48/+68
| | * | | Assistant: Fix race condition in index creation.ck2009-12-081-3/+1
| | | |/ | | |/|
| * | | Compile with QT_NO_DEPRECATEDOlivier Goffart2009-12-091-0/+2
| |/ /
| * | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-12-032-4/+8
| |\ \ | | |/
| | * Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-12-021-1/+1
| | |\
| | | * Bump version to 4.6.1Jason McDonald2009-12-011-1/+1
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-291-1/+1
| | |\ \ | | | |/
| | * | Fixed key handling in the documentation index widgetDenis Dzyubenko2009-11-251-3/+7
| * | | Assistant: Fix race condition in CLucene indexer.ck2009-12-012-0/+2
| | |/ | |/|
| * | Assistant: Move tab widget allocation up.ck2009-11-251-1/+1
| |/
* | Merge branch '4.6'Thiago Macieira2009-11-2518-56/+61
|\ \ | |/
| * Merge commit 'b345b96dc14cc0da3a9ff44216d447e6f2c8ad97' from oslo-staging-1 i...Simon Hausmann2009-11-201-1/+1
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-1917-45/+45
| | |\
| | * | Enabled documentMode in assistant only on Mac.Denis Dzyubenko2009-11-191-1/+1
| * | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-1917-45/+45
| |\ \ \ | | | |/ | | |/|
| | * | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-1917-45/+45
| | |\ \ | | | |/ | | |/|
| | | * Ran the script utils/normalizeOlivier Goffart2009-11-1817-45/+45
| | | * Fix Qt file header, as spotted by tst_headers.Thiago Macieira2009-11-131-1/+1
| * | | Properly return the absolute file path for help files.kh12009-11-191-11/+13
| |/ /
| * | Fix crash on windows running while without gui. Should be 4.6 main.kh12009-11-161-1/+4