summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/
| * 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
| | | | | |\ \ \
| | | | | * \ \ \ Merge branch '4.6' of ..\qt-graphics-4.6Gunnar Sletta2009-11-1355-603/+933
| | | | | |\ \ \ \
| | | | | * \ \ \ \ Merge branch '4.6' of c:\dev\qt-graphics-4.6Gunnar Sletta2009-11-0426-90/+273
| | | | | |\ \ \ \ \
| * | | | | | | | | | QtHelp: Minor clean-ups.ck2010-01-222-7/+4
| |/ / / / / / / / /
| * | | | | | | | | Assistant: Fix compliation for -no-webkit.ck2010-01-221-2/+5
| |/ / / / / / / /
| * | | | | | | | Merge branch '4.6'Thiago Macieira2010-01-219-20/+192
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Use HighlightAllOccurrences to have highlighting after full text search.kh12010-01-212-36/+68
| * | | | | | | | | Assistant: Simplify check for SQLITE plugin.ck2010-01-211-14/+4
| * | | | | | | | | Assistant: Fix translations.ck2010-01-211-15/+18
| * | | | | | | | | Force the creation of the default collection file directory.kh12010-01-191-1/+2
| * | | | | | | | | Merge branch '4.6'Thiago Macieira2010-01-182-2/+3
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Assistant: Extend list of file types to open internally.ck2010-01-141-1/+2
| * | | | | | | | | | Assistant: Use isLocalUrl() to decide whether a page is internal.ck2010-01-143-21/+18
| * | | | | | | | | | Assistant: Fix bug that can lead to infinite loop in edge cases.ck2010-01-141-2/+3
| * | | | | | | | | | Assistant: Extend 54d1ad11a4f35c0484418e5d18537daaccc2c6ab.ck2010-01-141-1/+2