summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'mainline/4.8'Casper van Donderen2011-08-314-61/+10
|\
| * Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-08-2911-202/+224
| |\
| * \ Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-2633-52/+72
| |\ \
| * | | Disable activeqt on win32-g++ (it doesn't build).Ray Donnelly2011-08-222-2/+2
| * | | fix warningKonstantin Ritt2011-08-221-1/+1
| * | | remove unused functionsOswald Buddenhagen2011-08-222-51/+0
* | | | 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 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 branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-2610-186/+208
| | |\ \ \ \ \
| * | \ \ \ \ \ 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 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-233-6/+13
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...v4.7.4Qt Continuous Integration System2011-08-231-1/+2
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | don't crash when destroying childrenKonstantin Ritt2011-08-221-1/+2
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-08-221-1/+1
| | | |\ \ \ \
| | | | * | | | Added an additional check to workaround an issue on Windows.David Boddie2011-08-221-1/+1
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-08-189-207/+185
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | / / / | | | | |/ / / | | | |/| | |
| | | | * | | Modified \since command behavior slightly to handle project and version.David Boddie2011-06-309-202/+174
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-06-092-5/+11
| | | | |\ \ \
| | | | | * \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-05-167-10/+15
| | | | | |\ \ \
| | | | | * | | | qdoc: Fixed QTBUG-19338Martin Smith2011-05-162-5/+11
| | | * | | | | | QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5Simo Fält2011-06-291-2/+4
| | | |/ / / / /
* | | | | | | | 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 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
| * | | | | | | | | Improved comment finding code.David Boddie2011-08-112-24/+41
| * | | | | | | | | Added language information to the pure documentation parser.David Boddie2011-08-112-0/+6
| * | | | | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-08-0829-1542/+4687
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | qdoc: Fixed a crash caused by accessing a null pointer.David Boddie2011-07-221-2/+3
| * | | | | | | | | Doc: Added a copy of the online style images for the qdoc manual.David Boddie2011-07-2019-0/+0
| * | | | | | | | | Doc: Removed the Google Analytics script.David Boddie2011-07-191-13/+1
* | | | | | | | | | Merge remote-tracking branch 'review/master'Sergio Ahumada2011-08-184-5/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-08-123-4/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix files that don't end with a newline characterSergio Ahumada2011-08-123-4/+4
generated by cgit v0.12 at 2024-12-29 10:54:16 (GMT)