summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Doc: Updated the configuration file for the Simplified Chinese docs.David Boddie2010-02-081-11/+9
* qdoc: Standardized encoding names and updated the Chinese config files.David Boddie2010-02-054-2/+152
* Doc: Added Simplified Chinese documents and build rules for them.David Boddie2010-02-041-1/+3
* Merge branch 'master' into qdoc-i18nDavid Boddie2010-02-0315-27/+91
|\
| * qdoc3: Added support for the \qmlbasictype command.Martin Smith2010-02-036-8/+68
| * Add Qvfb hungarian translationLaszlo Papp2010-02-031-0/+1
| * Add Qtconfig hungarian translationLaszlo Papp2010-02-031-0/+1
| * Add Linguist hungarian translationLaszlo Papp2010-02-031-3/+4
| * Add Designer hungarian translationLaszlo Papp2010-02-031-0/+1
| * Add Qt help hungarian translationLaszlo Papp2010-02-031-0/+1
| * Add Assistant hungarian translationLaszlo Papp2010-02-031-0/+1
| * Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-0158-409/+406
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-011-10/+10
| | |\
| | | * Assistant: Fix unintended tr context change.ck2010-01-291-10/+10
| | * | audiodevices example: no devices availableKurt Korbatits2010-02-011-1/+4
| | |/
* | | qdoc: Added support for different source and output character encodings.David Boddie2010-02-0210-84/+125
* | | Doc: Synchronize configuration files for easier maintenance.David Boddie2010-02-022-4/+5
* | | Merge commit 'origin/4.6' into oslo1-masterRohan McGovern2010-02-0157-396/+395
|\ \ \ | |/ / |/| / | |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-2846-70/+68
| |\
| | * Designer: Fix source code scanning issues.Friedemann Kleint2010-01-2846-70/+68
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-281-3/+1
| |\ \ | | |/ | |/|
| | * don't build unneeded QtDesigner parts on Windows CEJoerg Bornemann2010-01-281-3/+1
| * | don't falsely complain about mismatched codecfortrOswald Buddenhagen2010-01-272-13/+14
| * | add directories with sources to list of project rootsOswald Buddenhagen2010-01-271-3/+12
| * | add -codecfortr optionOswald Buddenhagen2010-01-271-2/+17
| * | sanitize lupdate's behavior regarding SUBDIRS projectsOswald Buddenhagen2010-01-271-95/+169
| * | unshare pro post-processing codeOswald Buddenhagen2010-01-275-216/+73
| * | complain if both sources and projects are given on the cmdlineOswald Buddenhagen2010-01-271-0/+4
| * | still complain if only ts files where specified on the cmdlineOswald Buddenhagen2010-01-271-7/+7
| * | do not sort the TS filesOswald Buddenhagen2010-01-272-3/+1
| * | fix bogus warning messageOswald Buddenhagen2010-01-271-4/+1
| |/
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6...Pulse Build System2010-01-272-2/+5
| |\
| | * Designer: Add lower/raise to context menu.Friedemann Kleint2010-01-272-2/+5
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-i...Pulse Build System2010-01-272-8/+24
| |\ \
| | * | Compile with no-webkit - add missing semi-colons.Rhys Weatherley2010-01-261-2/+2
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-261-6/+22
| | |\ \ | | | |/ | | |/|
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-251-6/+22
| | | |\
| | | | * Made the trace replayer handle limited resolution cases better.Samuel Rødal2010-01-251-6/+22
| * | | | Updates to new Symbian DEF file systemIain2010-01-261-7/+9
| |/ / /
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-252-36/+67
| |\ \ \ | | |/ / | |/| |
| | * | Use HighlightAllOccurrences to have highlighting after full text search.kh12010-01-222-36/+67
| | |/
| * | Improve DEF file enable/disable mechanism on SymbianIain2010-01-221-2/+24
| |/
* | Merge commit 'oslo1/master' into oslo1-masterRohan McGovern2010-02-0145-1120/+2361
|\ \
| * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ma...Pulse Build System2010-01-221-4/+5
| |\ \
| | * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ma...Pulse Build System2010-01-221-4/+5
| | |\ \
| | | * | Fixed compile when Qt is configured with -no-webkitRohan McGovern2010-01-221-2/+2
| | | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ma...Pulse Build System2010-01-221-4/+5
| | | |\ \
| | | | * \ Merge remote branch 'origin/master'Olivier Goffart2010-01-0847-1084/+5000
| | | | |\ \
| | | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Bill King2009-12-161-4/+5
| | | | |\ \ \
| | | | | * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtGunnar Sletta2009-11-1329-547/+1120
| | | | | |\ \ \