Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6 | Justin McPherson | 2009-12-14 | 1 | -2/+9 |
|\ | |||||
| * | Add -audio-backend and -no-audio-backend configure option. | Kurt Korbatits | 2009-12-09 | 1 | -2/+9 |
* | | Merge oslo-staging-2/4.6 into upstream/4.6 | Olivier Goffart | 2009-12-09 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge commit 'origin/4.6' into 4.6 | Olivier Goffart | 2009-12-04 | 4 | -3/+10 |
| |\ \ | |||||
| * \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6 | Jan-Arve Sæther | 2009-12-03 | 16 | -46/+90 |
| |\ \ \ | |||||
| * | | | | Make lrelease link again with the win32-icc and win32-g++ mkspecs | Jan-Arve Sæther | 2009-12-03 | 1 | -1/+1 |
* | | | | | Merge remote branch 'staging/4.6' into 4.6 | Oswald Buddenhagen | 2009-12-07 | 3 | -5/+4 |
|\ \ \ \ \ | |||||
| * | | | | | make qdoc3 a proper tools subtarget and install it | Oswald Buddenhagen | 2009-12-04 | 2 | -0/+4 |
| * | | | | | remove dead file | Oswald Buddenhagen | 2009-12-04 | 1 | -5/+0 |
* | | | | | | Merge commit '33441e2a611f07207b0b942368aab9010cdf8ab1' of oslo-staging-1/4.6... | Simon Hausmann | 2009-12-05 | 10 | -26/+168 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6 | Martin Smith | 2009-12-04 | 7 | -11/+11 |
| |\ \ \ \ \ | |||||
| * | | | | | | doc: Example page now lists images used by the example | Martin Smith | 2009-12-04 | 10 | -26/+168 |
* | | | | | | | Merge commit 'c0b81480b2909b18ac15bdd124a562ae005c2f41' into origin-4.6 | Olivier Goffart | 2009-12-04 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | / / | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st... | axis | 2009-12-03 | 1 | -2/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fixed "illegal empty declaration" warning from \tools\xmlpatterns | Janne Anttila | 2009-12-02 | 1 | -2/+2 |
| | | |_|/ / | | |/| | | | |||||
* | | | | | | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-12-03 | 9 | -14/+19 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge commit 'upstream/4.6' into 4.6 | Bradley T. Hughes | 2009-12-02 | 7 | -11/+11 |
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | | | |||||
| | * | | | Bump version to 4.6.1 | Jason McDonald | 2009-12-01 | 7 | -11/+11 |
| * | | | | Creator crashes when reloading externally modified .ui files on Mac | Prasanth Ullattil | 2009-12-01 | 1 | -0/+1 |
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6 | Simon Hausmann | 2009-11-29 | 8 | -33/+77 |
| |\ \ \ \ | | |/ / / | |||||
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6 | Simon Hausmann | 2009-11-27 | 1 | -0/+7 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | 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 |
| |_|/ / |/| | | | |||||
* | | | | fix crash on closing all files under certain circumstances | Oswald Buddenhagen | 2009-11-26 | 3 | -11/+11 |
* | | | | ignore Alt+Space acelerators - useless and too many false positives | Oswald Buddenhagen | 2009-11-26 | 1 | -2/+13 |
* | | | | offer only possible countries for each language | Oswald Buddenhagen | 2009-11-25 | 2 | -8/+27 |
* | | | | make qph use language attributes | Oswald Buddenhagen | 2009-11-25 | 1 | -5/+18 |
* | | | | the definition needs xml escaping, too | Oswald Buddenhagen | 2009-11-25 | 1 | -1/+1 |
* | | | | don't write context into <definition> field | Oswald Buddenhagen | 2009-11-25 | 1 | -3/+2 |
* | | | | qph: don't clobber <definition> fields | Oswald Buddenhagen | 2009-11-25 | 1 | -1/+1 |
* | | | | fix class/struct mismatch in the bootstrap magic | Oswald Buddenhagen | 2009-11-25 | 1 | -2/+4 |
* | | | | Assistant: Move tab widget allocation up. | ck | 2009-11-25 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-25 | 1 | -0/+36 |
|\ \ \ | |/ / | |||||
| * | | updates french phrasebook | Pierre Rossi | 2009-11-23 | 1 | -0/+36 |
* | | | Fix build on AIX: all of the .a file is linked into the program. | Oswald Buddenhagen | 2009-11-24 | 1 | -0/+7 |
|/ / | |||||
* | | Merge remote branch 'staging/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-23 | 6 | -28/+44 |
|\ \ | |||||
| * | | don't use qWarning for things which are not really warnings | Oswald Buddenhagen | 2009-11-20 | 2 | -6/+15 |
| * | | fix crash on closing "rightmost" file | Oswald Buddenhagen | 2009-11-20 | 1 | -2/+4 |
| * | | fix encodings, take N | Oswald Buddenhagen | 2009-11-20 | 3 | -17/+21 |
| * | | don't overwrite explicitly specified CODECFORTR on UTF-16 input | Oswald Buddenhagen | 2009-11-19 | 3 | -2/+3 |
| * | | fix potentially wrong output codec for UTF-16 input files | Oswald Buddenhagen | 2009-11-19 | 1 | -1/+1 |
* | | | revert QT -= xml nonsense | Oswald Buddenhagen | 2009-11-20 | 1 | -2/+0 |
* | | | QT —= xml for bootstrapped lrelease | Oswald Buddenhagen | 2009-11-20 | 1 | -0/+2 |
* | | | 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 | 63 | -681/+710 |
| |\ \ \ | |||||
| * | | | | Enabled documentMode in assistant only on Mac. | Denis Dzyubenko | 2009-11-19 | 1 | -1/+1 |
* | | | | | fix accepting of old license keys (pre 4.6) | Peter Hartmann | 2009-11-19 | 1 | -2/+5 |
| |_|/ / |/| | | | |||||
* | | | | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-19 | 66 | -718/+785 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch '4.6' of oslo-staging-1 into 4.6 | Simon Hausmann | 2009-11-19 | 1 | -36/+68 |
| |\ \ \ | | |/ / | |||||
| | * | | Fixed a few license checks in configure.exe. | axis | 2009-11-18 | 1 | -13/+5 |