summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-12-091-1/+1
|\
| * Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-12-044-3/+10
| |\
| * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2009-12-0316-46/+90
| |\ \
| * | | Make lrelease link again with the win32-icc and win32-g++ mkspecsJan-Arve Sæther2009-12-031-1/+1
* | | | Merge remote branch 'staging/4.6' into 4.6Oswald Buddenhagen2009-12-073-5/+4
|\ \ \ \
| * | | | make qdoc3 a proper tools subtarget and install itOswald Buddenhagen2009-12-042-0/+4
| * | | | remove dead fileOswald Buddenhagen2009-12-041-5/+0
* | | | | Merge commit '33441e2a611f07207b0b942368aab9010cdf8ab1' of oslo-staging-1/4.6...Simon Hausmann2009-12-0510-26/+168
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Martin Smith2009-12-047-11/+11
| |\ \ \ \
| * | | | | doc: Example page now lists images used by the exampleMartin Smith2009-12-0410-26/+168
* | | | | | Merge commit 'c0b81480b2909b18ac15bdd124a562ae005c2f41' into origin-4.6Olivier Goffart2009-12-041-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-12-031-2/+2
| |\ \ \ \
| | * | | | Fixed "illegal empty declaration" warning from \tools\xmlpatternsJanne Anttila2009-12-021-2/+2
| | | |_|/ | | |/| |
* | | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-12-039-14/+19
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-12-027-11/+11
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | Bump version to 4.6.1Jason McDonald2009-12-017-11/+11
| * | | Creator crashes when reloading externally modified .ui files on MacPrasanth Ullattil2009-12-011-0/+1
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-298-33/+77
| |\ \ \ | | |/ /
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-271-0/+7
| |\ \ \ | | | |/ | | |/|
| * | | 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
| |_|/ |/| |
* | | fix crash on closing all files under certain circumstancesOswald Buddenhagen2009-11-263-11/+11
* | | ignore Alt+Space acelerators - useless and too many false positivesOswald Buddenhagen2009-11-261-2/+13
* | | offer only possible countries for each languageOswald Buddenhagen2009-11-252-8/+27
* | | make qph use language attributesOswald Buddenhagen2009-11-251-5/+18
* | | the definition needs xml escaping, tooOswald Buddenhagen2009-11-251-1/+1
* | | don't write context into <definition> fieldOswald Buddenhagen2009-11-251-3/+2
* | | qph: don't clobber <definition> fieldsOswald Buddenhagen2009-11-251-1/+1
* | | fix class/struct mismatch in the bootstrap magicOswald Buddenhagen2009-11-251-2/+4
* | | Assistant: Move tab widget allocation up.ck2009-11-251-1/+1
| |/ |/|
* | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-251-0/+36
|\ \ | |/
| * updates french phrasebookPierre Rossi2009-11-231-0/+36
* | Fix build on AIX: all of the .a file is linked into the program.Oswald Buddenhagen2009-11-241-0/+7
|/
* Merge remote branch 'staging/4.6' into 4.6Oswald Buddenhagen2009-11-236-28/+44
|\
| * don't use qWarning for things which are not really warningsOswald Buddenhagen2009-11-202-6/+15
| * fix crash on closing "rightmost" fileOswald Buddenhagen2009-11-201-2/+4
| * fix encodings, take NOswald Buddenhagen2009-11-203-17/+21
| * don't overwrite explicitly specified CODECFORTR on UTF-16 inputOswald Buddenhagen2009-11-193-2/+3
| * fix potentially wrong output codec for UTF-16 input filesOswald Buddenhagen2009-11-191-1/+1
* | revert QT -= xml nonsenseOswald Buddenhagen2009-11-201-2/+0
* | QT —= xml for bootstrapped lreleaseOswald Buddenhagen2009-11-201-0/+2
* | 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-1963-681/+710
| |\ \
| * | | Enabled documentMode in assistant only on Mac.Denis Dzyubenko2009-11-191-1/+1
* | | | fix accepting of old license keys (pre 4.6)Peter Hartmann2009-11-191-2/+5
| |_|/ |/| |
* | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-1966-718/+785
|\ \ \ | | |/ | |/|
| * | Merge branch '4.6' of oslo-staging-1 into 4.6Simon Hausmann2009-11-191-36/+68
| |\ \ | | |/
| | * Fixed a few license checks in configure.exe.axis2009-11-181-13/+5
| | * configure.exe: Update to the new licensing structure.Thiago Macieira2009-11-181-26/+66
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-1813-85/+235
| | |\