| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-01-19 | 1 | -1/+1 |
|\ |
|
| * | Bump version to 4.6.2. | Jason McDonald | 2010-01-19 | 1 | -1/+1 |
|
|
* | | Return some fake data if we can't handle the network request. | kh1 | 2010-01-19 | 1 | -1/+2 |
|/ |
|
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6 | Jason McDonald | 2010-01-06 | 1 | -1/+1 |
|\ |
|
| * | Remove warning "statement with no effect" | Thiago Macieira | 2010-01-06 | 1 | -1/+1 |
|
|
* | | Update copyright year to 2010 | Jason McDonald | 2010-01-06 | 167 | -169/+169 |
|/ |
|
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into qt-inte... | Qt Continuous Integration System | 2009-12-12 | 2 | -51/+69 |
|\ |
|
| * | Fix broken delete key, some cleanup. | kh1 | 2009-12-08 | 1 | -48/+68 |
|
|
| * | Assistant: Fix race condition in index creation. | ck | 2009-12-08 | 1 | -3/+1 |
|
|
* | | Compile with QT_NO_DEPRECATED | Olivier Goffart | 2009-12-09 | 1 | -0/+2 |
|/ |
|
* | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-12-03 | 2 | -4/+8 |
|\ |
|
| * | Merge commit 'upstream/4.6' into 4.6 | Bradley T. Hughes | 2009-12-02 | 1 | -1/+1 |
| |\ |
|
| | * | Bump version to 4.6.1 | Jason McDonald | 2009-12-01 | 1 | -1/+1 |
|
|
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6 | Simon Hausmann | 2009-11-29 | 1 | -1/+1 |
| |\ \
| | |/ |
|
| * | | Fixed key handling in the documentation index widget | Denis Dzyubenko | 2009-11-25 | 1 | -3/+7 |
|
|
* | | | Assistant: Fix race condition in CLucene indexer. | ck | 2009-12-01 | 2 | -0/+2 |
| |/
|/| |
|
* | | Assistant: Move tab widget allocation up. | ck | 2009-11-25 | 1 | -1/+1 |
|/ |
|
* | Merge commit 'b345b96dc14cc0da3a9ff44216d447e6f2c8ad97' from oslo-staging-1 i... | Simon Hausmann | 2009-11-20 | 1 | -1/+1 |
|\ |
|
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6 | Simon Hausmann | 2009-11-19 | 17 | -45/+45 |
| |\ |
|
| * | | Enabled documentMode in assistant only on Mac. | Denis Dzyubenko | 2009-11-19 | 1 | -1/+1 |
|
|
* | | | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-19 | 17 | -45/+45 |
|\ \ \
| | |/
| |/| |
|
| * | | Merge oslo-staging-2/4.6 into upstream/4.6 | Olivier Goffart | 2009-11-19 | 17 | -45/+45 |
| |\ \
| | |/
| |/| |
|
| | * | Ran the script utils/normalize | Olivier Goffart | 2009-11-18 | 17 | -45/+45 |
|
|
| | * | Fix Qt file header, as spotted by tst_headers. | Thiago Macieira | 2009-11-13 | 1 | -1/+1 |
|
|
* | | | Properly return the absolute file path for help files. | kh1 | 2009-11-19 | 1 | -11/+13 |
|/ / |
|
* | | Fix crash on windows running while without gui. Should be 4.6 main. | kh1 | 2009-11-16 | 1 | -1/+4 |
|
|
* | | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-13 | 3 | -9/+9 |
|\ \
| |/ |
|
| * | Add tr() to strings of Assistant that need to be translated | Benjamin Poulain | 2009-11-11 | 1 | -2/+2 |
|
|
| * | french translation of qt_help | Pierre Rossi | 2009-11-11 | 1 | -1/+2 |
|
|
| * | Assistant: Add missing initialization of member variable. | qt-info@nokia.com | 2009-11-11 | 1 | -0/+1 |
|
|
| * | Fix Assistant losing font settings across invocations. | kh1 | 2009-11-11 | 2 | -62/+67 |
|
|
| * | Fix some warnings. | kh1 | 2009-11-11 | 1 | -3/+2 |
|
|
| * | Assistant: Fix bugs related to setting the current filter remotely. | qt-info@nokia.com | 2009-11-11 | 3 | -10/+14 |
|
|
| * | Doc: Fixed whitespace. | David Boddie | 2009-11-11 | 1 | -6/+5 |
|
|
* | | Assistant: Fix license header. | ck | 2009-11-13 | 1 | -1/+1 |
|
|
* | | Merge branch 'tools-team/4.6' (early part) into 4.6 | Oswald Buddenhagen | 2009-11-10 | 7 | -75/+84 |
|\ \
| |/
|/| |
|
| * | Assistant: Add missing initialization of member variable. | ck | 2009-11-09 | 1 | -0/+1 |
|
|
| * | Fix Assistant losing font settings across invocations. | kh1 | 2009-11-09 | 2 | -62/+67 |
|
|
| * | Fix some warnings. | kh1 | 2009-11-09 | 1 | -3/+2 |
|
|
| * | Assistant: Fix bugs related to setting the current filter remotely. | ck | 2009-11-09 | 3 | -10/+14 |
|
|
* | | Merge branch '4.6-api-review' into 4.6 | Marius Storm-Olsen | 2009-11-09 | 5 | -12/+23 |
|\ \
| |/
|/| |
|
| * | API review: *Count() are not plural | Marius Storm-Olsen | 2009-11-09 | 5 | -12/+23 |
|
|
* | | Assistant: Fixes related to search configuration. | ck | 2009-11-06 | 2 | -3/+2 |
|
|
* | | Assistant: Fix bugs on cached collection file handling. | ck | 2009-11-06 | 1 | -1/+7 |
|
|
* | | Assistant: Reset default homepage on collection file update. | ck | 2009-11-05 | 1 | -0/+2 |
|
|
* | | Assistant: Look for document encoding in XML headers as well. | ck | 2009-11-05 | 6 | -57/+124 |
|
|
* | | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-04 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Merge commit '51c9b68' into 4.6 | Morten Johan Sørvig | 2009-11-04 | 1 | -1/+1 |
| |\ |
|
| | * | Removed the margin in assistant on Mac. | Denis Dzyubenko | 2009-10-30 | 1 | -1/+1 |
|
|
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-platform-team into 4.6 | Bradley T. Hughes | 2009-10-30 | 1 | -0/+1 |
| | |\ |
|