summaryrefslogtreecommitdiffstats
path: root/tools/assistant
Commit message (Expand)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
* | 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 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
* | 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
| * Fix Assistant losing font settings across invocations.kh12009-11-112-62/+67
| * Fix some warnings.kh12009-11-111-3/+2
| * Assistant: Fix bugs related to setting the current filter remotely.qt-info@nokia.com2009-11-113-10/+14
| * Doc: Fixed whitespace.David Boddie2009-11-111-6/+5
* | 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
|\ \ | |/ |/|
| * Assistant: Add missing initialization of member variable.ck2009-11-091-0/+1
| * Fix Assistant losing font settings across invocations.kh12009-11-092-62/+67
| * Fix some warnings.kh12009-11-091-3/+2
| * Assistant: Fix bugs related to setting the current filter remotely.ck2009-11-093-10/+14
* | 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
* | Assistant: Fixes related to search configuration.ck2009-11-062-3/+2
* | Assistant: Fix bugs on cached collection file handling.ck2009-11-061-1/+7
* | Assistant: Reset default homepage on collection file update.ck2009-11-051-0/+2
* | Assistant: Look for document encoding in XML headers as well.ck2009-11-056-57/+124
* | 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
| |\
| | * Removed the margin in assistant on Mac.Denis Dzyubenko2009-10-301-1/+1
| | * 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
|/ / /
* | | Add a French translation to Assistant. Update the phrase book.Benjamin Poulain2009-10-301-0/+1
* | | Merge commit '8c4edbd04f350294462fd689748de2dd7cc84d47' into 4.6-upstreamBradley T. Hughes2009-10-301-0/+1
|\ \ \ | |/ / |/| / | |/