summaryrefslogtreecommitdiffstats
path: root/tools/assistant
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-171-2/+3
|\ | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Fix broken image loading on windows.
| * Fix broken image loading on windows.kh12010-02-161-2/+3
| | | | | | | | | | | | | | | | | | | | | | Make sure the url is valid and we could find the file in the compressed help, otherwise pass on an error message. We might have got garbage in the first patch, so the isEmpty() check was not sufficient. Do not integrate in master, since it was fixed already there. Task-number: QTBUG-8082, QTBUG-8248 Reviewed-by: ck
* | Bump version to 4.6.3.Jason McDonald2010-02-151-1/+1
|/
* Added Czech translations.Pavel Fric2010-02-022-0/+2
| | | | | Merge-request: 440 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Assistant: Fix spelling mistakes.ck2010-02-016-16/+16
|
* Assistant: Use const references in foreach loops.ck2010-02-0111-46/+46
| | | | Reviewed-by: kh1
* Assistant: Fix unintended tr context change.ck2010-01-291-10/+10
| | | | | | Bug was introduced by af30aeb6a1ebb7307f06c122c0c93d152f4d958c Contributed-by: Ritt Konstantin
* Compile with no-webkit - add missing semi-colons.Rhys Weatherley2010-01-261-2/+2
| | | | Reviewed-by: Sarah Smith
* Use HighlightAllOccurrences to have highlighting after full text search.kh12010-01-222-36/+67
| | | | | | | | Also use HighlightAllOccurrences to have highlighting during type and search. Some more refactoring. Task-number: QTBUG-3335 Reviewed-by: ck
* Assistant: Set correct mime type for text documents.ck2010-01-211-4/+4
| | | | | Task-number: QTBUG-6796 Reviewed-by: kh1
* QtHelp: Enable dynamic translation.ck2010-01-214-20/+63
| | | | | Task-number: QTBUG-7420 Reviewed-by: kh1
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-191-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Memory leak in native Toolbar cleanup in Cocoa Fix copyright year. Bump version to 4.6.2. Add skeleton changes file for 4.6.2. Add released version of 4.6.1 changes file for posterity. Designer crashes when previewing QMainWindow with native Toolbar on Mac
| * Bump version to 4.6.2.Jason McDonald2010-01-191-1/+1
| | | | | | | | Reviewed-by: Trust Me
* | Return some fake data if we can't handle the network request.kh12010-01-191-1/+2
|/ | | | | | | | | | Since we are the only handler for network request and cannot forward the request to our parent (e.g. unwanted net access), we work arround the case we can't handle it. We do create a reply with dummy data which will prevent some blocking and allows further processing of requested data. Task-number: QTBUG-7427 Reviewed-by: kh
* 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
| | | | | | | | Reviewed-By: TrustMe
* | Update copyright year to 2010Jason McDonald2010-01-06167-169/+169
|/ | | | Reviewed-by: Trust Me
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2009-12-122-51/+69
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | qt-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Update Polish translations Assistant: Add documentation for -remove-search-index. Designer: Handle "visible"-properties of item view headers correctly. Fix .gitignore to not ignore qdoc.pro Update polish translations Fix broken delete key, some cleanup. Assistant: Fix race condition in index creation. Don't forget to append current $MAC_CONFIG_TEST_COMMANDLINE when setting the SDK to use.
| * Fix broken delete key, some cleanup.kh12009-12-081-48/+68
| | | | | | | | Reviewed-by: ck
| * Assistant: Fix race condition in index creation.ck2009-12-081-3/+1
| | | | | | | | Reviewed-by: kh1
* | Compile with QT_NO_DEPRECATEDOlivier Goffart2009-12-091-0/+2
|/ | | | | | | uses of QT_DEPRECATED must be protected by #ifdef Task-number: QTBUG-6649 Reviewed-by: João Abecasis
* 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
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | On Mac up/down arrow keys move the cursor to the beginning/end of the lineedit, however if the lineedit is used to control the indexwidget in assistant, we need to prevent it to get those events and move the text cursor. Reviewed-by: kh
* | | Assistant: Fix race condition in CLucene indexer.ck2009-12-012-0/+2
| |/ |/| | | | | | | | | | | We need to make sure the running thread can respond to the cancel request before overwriting it. Reviewed-by: kh1
* | Assistant: Move tab widget allocation up.ck2009-11-251-1/+1
|/ | | | | | | We follow the controversial RABU ("Resource Acquisition Before Usage") pattern here. Patch is actually by con. Reviewed-by: con
* Merge commit 'b345b96dc14cc0da3a9ff44216d447e6f2c8ad97' from oslo-staging-1 ↵Simon Hausmann2009-11-201-1/+1
|\ | | | | | | into 4.6
| * 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
| | | | | | | | | | | | | | | | | | | | | The doc says setting a document mode removes a frame, which makes assistant look weird on non-Mac platforms. Reviewed-by: Prasanth
* | | 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
| | | | | | | | | | | | Over src/ tools/ examples/ and demos/
| | * Fix Qt file header, as spotted by tst_headers.Thiago Macieira2009-11-131-1/+1
| | | | | | | | | | | | Reviewed-By: Trust Me
* | | Properly return the absolute file path for help files.kh12009-11-191-11/+13
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug that can only be seen on windows when we have the collection storage location on e.g. Drive c:\ while the help files reside on a different drive. QHelpEngineCore::registerDocumentation would fail to gather the proper relative file path, thus register the file with it's absolute path. In QHelpEngineCore::documentationFileName we still assumed that all files in the collection are registered relative and fail to concatenate the proper path. Now we check if the path is already absolute and return. Reviewed-by: ck
* | Fix crash on windows running while without gui. Should be 4.6 main.kh12009-11-161-1/+4
| | | | | | | | Reviewed-by: ck
* | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-133-9/+9
|\ \ | |/
| * Add tr() to strings of Assistant that need to be translatedBenjamin Poulain2009-11-111-2/+2
| |
| * french translation of qt_helpPierre Rossi2009-11-111-1/+2
| |
| * Assistant: Add missing initialization of member variable.qt-info@nokia.com2009-11-111-0/+1
| | | | | | | | Reviewed-by: kh1
| * Fix Assistant losing font settings across invocations.kh12009-11-112-62/+67
| | | | | | | | | | Task-number: QTBUG-5333 Reviewed-by: ck
| * Fix some warnings.kh12009-11-111-3/+2
| | | | | | | | Reviewed-by: ck
| * Assistant: Fix bugs related to setting the current filter remotely.qt-info@nokia.com2009-11-113-10/+14
| | | | | | | | | | | | 1. Filter combo box now gets updated on remote setCurrentFilter. 2. Argument to remote setCurrentFilter now gets checked. If there is no such filter, we reject it.
| * Doc: Fixed whitespace.David Boddie2009-11-111-6/+5
| | | | | | | | Reviewed-by: Trust Me
* | Assistant: Fix license header.ck2009-11-131-1/+1
| |
* | Merge branch 'tools-team/4.6' (early part) into 4.6Oswald Buddenhagen2009-11-107-75/+84
|\ \ | |/ |/| | | | | Conflicts: src/corelib/tools/qscopedpointer.h
| * Assistant: Add missing initialization of member variable.ck2009-11-091-0/+1
| | | | | | | | Reviewed-by: kh1
| * Fix Assistant losing font settings across invocations.kh12009-11-092-62/+67
| | | | | | | | | | Task-number: QTBUG-5333 Reviewed-by: ck
| * Fix some warnings.kh12009-11-091-3/+2
| | | | | | | | Reviewed-by: ck
generated by cgit v0.12 at 2024-12-28 21:32:25 (GMT)