summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* 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 branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-221-4/+4
|\
| * Assistant: Set correct mime type for text documents.ck2010-01-211-4/+4
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-216-51/+115
|\ \ | |/ |/|
| * Merge from upstreamShane Kearns2010-01-213-23/+45
| * Merge from upstreamShane Kearns2010-01-213-22/+33
| * Fix pro file error affecting windows buildsShane Kearns2010-01-211-1/+1
| * Merge TRK client changes from upstream (QtCreator)Shane Kearns2010-01-212-5/+36
* | QtHelp: Enable dynamic translation.ck2010-01-214-20/+63
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-211-0/+2
|\ \ | |/ |/|
| * Designer: Fixed a crash when previewing in a non-existent style.Friedemann Kleint2010-01-211-0/+2
* | 1st attempt at USB serial port enumerator for linuxShane Kearns2010-01-204-0/+127
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-197-11/+11
|\ \ | |/ |/|
| * Bump version to 4.6.2.Jason McDonald2010-01-197-11/+11
* | Return some fake data if we can't handle the network request.kh12010-01-191-1/+2
|/
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-151-1/+2
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-141-1/+2
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Iain2010-01-131211-1225/+1225
| | |\
| | * | Use MMP keyword, not compiler flags, to update FPU option on SymbianIain2010-01-131-1/+2
* | | | Doc: Added placeholder pages for new examples and updated the overviews.David Boddie2010-01-151-1/+1
|/ / /
* | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2010-01-131211-1225/+1225
|\ \ \ | | |/ | |/|
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-091211-1225/+1225
| |\ \ | | |/ | |/|
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-071211-1225/+1225
| | |\
| | | * Use the lowercase/shortname.h headers for Phonon includesThiago Macieira2010-01-061-2/+2
| | | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6Jason McDonald2010-01-066-33/+183
| | | |\
| | | | * Remove warning "statement with no effect"Thiago Macieira2010-01-061-1/+1
| | | * | Update copyright year to 2010Jason McDonald2010-01-061211-1222/+1222
* | | | | QFile cannot deal with crlf-translated stdio, so use binary modeOswald Buddenhagen2010-01-121-0/+12
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-093-56/+49
|\ \ \ \ \ | |/ / / / |/| | | |