summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ | |_|/ |/| |
| * | runonphone: Add a missing space between a message and the file nameMartin Storsjo2011-09-071-1/+1
| * | Perl check for windows configure.Markku Heikkila2011-09-071-11/+15
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-072-2/+13
|\ \ \ | |/ /
| * | fix build for desktopKonstantin Ritt2011-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
|\ \ \ | |/ /
| * | Removed the unnecessary dependency of the QtHelp module on the QtXml oneConstantin Makshin2011-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
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | Designer: Fix static linking.Jarek Kobus2011-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
| * | | | Merge remote branch 'qt-doc-team/4.8'Casper van Donderen2011-08-2910-44/+333
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | qdoc3: Updates for QTBUG-20776; include fileToOpen path.Martin Smith2011-08-181-2/+6
| | * | | qdoc3: Updates for QTBUG-20776; clear map between runs.Martin Smith2011-08-181-1/+21
| | * | | qdoc3: Updates for QTBUG-20739 (no read-only for QML components)Martin Smith2011-08-114-2/+40
| | * | | qdoc3: Updates for QTBUG-20776 and QTBUG-20777Martin Smith2011-08-103-18/+86
| | * | | qdoc: Check pointer for null before dereferencing.Martin Smith2011-08-031-2/+3
| | * | | qdoc3: Reverting part of the change for QTBUG-17072Martin Smith2011-08-021-4/+4
| | * | | qdoc3: Write "Signal Handlers" instead of "Signals" as headerMartin Smith2011-08-023-12/+12
| | * | | qdoc: Fixed to remove extranious markup tags.Martin Smith2011-07-221-2/+3
| | * | | qdoc: Added HTML.nobreadcrumbs as a config variable.Martin Smith2011-07-212-1/+8
| | * | | Phase 1 of QTBUG-20412, the XML manifest fileMartin Smith2011-07-1510-23/+140
| | * | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-06-172-7/+16
| | |\ \ \
| | * \ \ \ Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-06-0924-2621/+4852
| | |\ \ \ \
* | | \ \ \ \ Merge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7Sergio Ahumada2011-08-3136-115/+77
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-08-2911-202/+224
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-08-281-16/+16
| | |\ \ \ \ \
| | | * \ \ \ \ Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-08-2333-60/+83
| | | |\ \ \ \ \ | | | | |/ / / /
| | | * | | | | Reimplement MR1271 over coda patchShane Kearns2011-08-051-16/+16
| | * | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-2710-186/+208
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-2633-52/+72
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-253-6/+13
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-08-1927-41/+54
| | |\ \ \ \ \ \ \
| | | * | | | | | | Doc: Fixed qdoc warnings.David Boddie2011-08-152-2/+3