summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* qmlplugindump: Fix missing flush for objects that don't fit a line.Christian Kamm2011-12-021-2/+1
* qmlplugindump: Avoid reporting types as attaching to themselves.Christian Kamm2011-12-021-2/+6
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-12-015-10/+22
|\
| * Qt Linguist: Fix crashesTakumi ASAKI2011-11-304-9/+19
| * fixed error generating wrong introspection string in header output fileRalf Habacker2011-11-301-1/+3
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-11-2913-0/+0
|\ \ | |/ |/|
| * Fix permission (no execute bit).Frederik Gladhorn2011-11-2213-0/+0
* | Merge remote-tracking branch 'qt-qa-review/master'Sergio Ahumada2011-11-262-2/+2
|\ \
| * \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-08-222-2/+2
| |\ \
| | * | Doc: Fixing typoSergio Ahumada2011-08-172-2/+2
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-11-231-5/+30
|\ \ \ \
| * | | | qmlplugindump: Fix dumping empty names for generated QMetaObjects.Christian Kamm2011-11-161-4/+29
| * | | | qmlplugindump: Add flush to fix output redirection on windows.Christian Kamm2011-11-031-1/+1
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-11-223-0/+39
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix qdoc output for <dependency> tag.Daniel Molkentin2011-11-221-6/+3
| * | | | Merge remote-tracking branch 'qt-doc-review/master'Casper van Donderen2011-11-223-0/+22
| |\ \ \ \
| | * | | | qdoc3: qdoc supports \depends in 4.8Martin Smith2011-11-211-3/+8
| | * | | | qdoc3: qdoc supports \depends in 4.8Martin Smith2011-11-213-0/+17
| * | | | | Compile fix.Daniel Molkentin2011-11-211-2/+1
| * | | | | Doc: Create relative pathes in Manifest files.Daniel Molkentin2011-11-211-0/+21
* | | | | | Qt Linguist: Fix crash after select 2nd translation in lengthvariantTakumi ASAKI2011-11-174-1/+12
|/ / / / /
* | | | | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-11-163-2/+12
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-11-151-0/+5
| |\ \ \ \ \
| | * | | | | Increase qdoc3 stack size when using MSVC to 4M.Casper van Donderen2011-11-141-0/+5
| | |/ / / /
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-11-112-2/+7
| |\ \ \ \ \ | | |/ / / /
| | * | | | qdoc3: Replace %REPLACEME% with the correct pathMartin Smith2011-10-312-2/+7
* | | | | | Windows: Add gcc 4.6.Friedemann Kleint2011-11-163-15/+105
|/ / / / /
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-082-3/+18
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Qt Designer: Fix static linking on Mac.Friedemann Kleint2011-11-082-3/+18
* | | | | Fix security issue on website due to bad JS.Casper van Donderen2011-10-214-47/+1
* | | | | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-10-144-7/+28
|\ \ \ \ \ | |/ / / /
| * | | | add -list-languages option to lupdateOswald Buddenhagen2011-10-063-0/+28
| * | | | remove dead codeOswald Buddenhagen2011-10-041-7/+0
| * | | | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-09-288-14/+190
| |\ \ \ \
| * | | | | Removed obsolete QWS_ALPHA_CURSOR feature.jaanttil2011-09-271-0/+0
* | | | | | runonphone timestamps nanosecond formating set to 9 chars, 0 paddedmread2011-10-132-2/+2
* | | | | | runonphone - Implement CODA autodetectionShane Kearns2011-10-043-8/+36
| |/ / / / |/| | | |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-261-2/+18
|\ \ \ \ \ | |/ / / /
| * | | | Don't store the alignment attribute for spacersJarek Kobus2011-09-231-2/+18
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-09-207-5/+181
|\ \ \ \ \
| * | | | | runonphone: Include USB serial ports on OS X for CODA, tooMartin Storsjo2011-09-191-0/+15
| * | | | | runonphone: Implement traceswitch support for codaShane Kearns2011-09-165-3/+160
| * | | | | runonphone: Add a missing space between a message and the file nameMartin Storsjo2011-09-071-1/+1
| * | | | | runonphone: Allow overriding the temporary sis file nameMartin Storsjo2011-09-071-2/+6
* | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-09-161-9/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-09-14313-10174/+18486
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Migrate addMarkUp function to QChar.Casper van Donderen2011-09-081-9/+9
| * | | | | Fix assert error on Windows with a negative char.Casper van Donderen2011-09-021-4/+4
* | | | | | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-09-1515-249/+490
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-09-101-2/+8
| |\ \ \ \ \