summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \
| | * \ \ Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-09-0820-313/+499
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Fixed compiling error in qvfb.luohua2011-09-022-2/+9
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-082-12/+16
| |\ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-072-2/+13
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-051-1/+0
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Liang Qi2011-09-033-39/+7
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-09-039-202/+168
| | |\ \ \ \ \ \
| | | * | | | | | Modified \since command behavior slightly to handle project and version.David Boddie2011-09-029-202/+168
| | | * | | | | | Merge remote-tracking branch 'origin/4.8'Liang Qi2011-09-021-9/+2
| | | |\ \ \ \ \ \
| | * | \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-09-021-1/+7
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-08-3113-93/+299
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Silently ignore a wrong parameter count instead of crashingPeter Grasch2011-08-311-4/+5
| | | * | | | | | | | | Introducing --address <bus> parameter to qdbusPeter Grasch2011-08-311-1/+6
| | | | |_|_|_|_|_|/ / | | | |/| | | | | | |
| | * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-09-021-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | / / / / / | | | |_|_|/ / / / / | | |/| | | | | | |
| | | * | | | | | | Added an additional check to workaround an issue on Windows.David Boddie2011-09-021-1/+1
| | | | |/ / / / / | | | |/| | | | |
| * | | | | | | | Merge branch 4.8 into qt-4.8-from-4.7Sergio Ahumada2011-09-0111-47/+329
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-08-311-9/+2
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge remote branch 'mainline/4.8'Casper van Donderen2011-08-314-61/+10
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote branch 'qt-doc-review/master'Casper van Donderen2011-08-3112-188/+185
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch '4.8'Casper van Donderen2011-08-3011-48/+303
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | | | * | | | | | | qdoc3: Updates to qdoc to print error message in ALL CAPSMartin Smith2011-08-291-2/+2
generated by cgit v0.12 at 2024-11-25 20:32:30 (GMT)