summaryrefslogtreecommitdiffstats
path: root/tools/assistant
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Assistant: Fix bugs related to setting the current filter remotely.ck2009-11-093-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.
* | Merge branch '4.6-api-review' into 4.6Marius Storm-Olsen2009-11-095-12/+23
|\ \ | |/ |/|
| * API review: *Count() are not pluralMarius Storm-Olsen2009-11-095-12/+23
| | | | | | | | | | | | Obsolete the plural version, and replace its usage in Qt. Reviewed-by: Andreas Aardal Hanssen
* | Assistant: Fixes related to search configuration.ck2009-11-062-3/+2
| | | | | | | | | | | | | | | | 1. Remove superfluous definition of QT_CLUCENE_SUPPORT in assistant.pro. It was not evaluated anywhere. 2. Bugfix for searvh widget when working with non-CLucene search lib. Reviewed-by: kh1
* | Assistant: Fix bugs on cached collection file handling.ck2009-11-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | 1. When the dates between the caller-supplied and the cached versions of a collection file differed, we used to overwrite the cached with the original version. This was obviously wrong - we should only overwrite when the cached version is older. 2. We also forgot to set the zoom factor when overwriting. Task-number: QTBUG-4899 Reviewed-by: kh1
* | Assistant: Reset default homepage on collection file update.ck2009-11-051-0/+2
| | | | | | | | Reviewed-by: kh1
* | Assistant: Look for document encoding in XML headers as well.ck2009-11-056-57/+124
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-1770 Reviewed-by: kh1 Conflicts: tools/assistant/lib/lib.pro
* | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-041-1/+1
|\ \ | |/
| * Merge commit '51c9b68' into 4.6Morten Johan Sørvig2009-11-041-1/+1
| |\ | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0 src/gui/kernel/qevent.h
| | * Removed the margin in assistant on Mac.Denis Dzyubenko2009-10-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change 9551b8c349ce4e15a57c24a2408ee1b73c2b7510 enabled documentMode on the tabbar in Assistant. To make it look more native we also remove the margin around the tabwidget. Reviewed-by: Prasanth
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-platform-team into 4.6Bradley T. Hughes2009-10-301-0/+1
| | |\
* | | | Fix Assistant to never access the network.kh12009-11-041-17/+15
|/ / / | | | | | | | | | | | | Task-number: QT-1684 Reviewed-by: ck
* | | Add a French translation to Assistant. Update the phrase book.Benjamin Poulain2009-10-301-0/+1
| | | | | | | | | | | | Reviewed-by: Pierre Rossi
* | | Merge commit '8c4edbd04f350294462fd689748de2dd7cc84d47' into 4.6-upstreamBradley T. Hughes2009-10-301-0/+1
|\ \ \ | |/ / |/| / | |/
generated by cgit v0.12 at 2024-10-22 15:24:08 (GMT)