summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* 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 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
| * | | | | | | Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-08-0829-1542/+4687
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | / / / / | | | |/ / / / | | |/| | | |
| * | | | | | Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-07-2656-3207/+5475
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Fix QString compares to ""Sergio Ahumada2011-07-261-1/+1
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-08-122-14/+24
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Merge branch 'master' of ../qt-qml-stagingMichael Brasser2011-08-1158-3195/+5571
| |\ \ \ \ \ \
| * | | | | | | Cleanup QMLViewer properly when exiting via File->Quit.Michael Brasser2011-07-261-0/+1
| * | | | | | | qmldump: Fix creation of objects from QDeclarativeTypes.Christian Kamm2011-07-141-14/+23
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-teamHonglei Zhang2011-08-0410-141/+141
|\ \ \ \ \ \ \ \
| * | | | | | | | runonphone: fix failure to terminateShane Kearns2011-08-021-3/+3
| * | | | | | | | Fix license headers in new files from coda patchShane Kearns2011-08-028-137/+137
| * | | | | | | | runonphone: command line args improperly passed to TRK after CODA patchShane Kearns2011-08-021-1/+1
* | | | | | | | | Merge remote-tracking branch 'qt/4.8'Honglei Zhang2011-08-044-39/+212
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | |
| * | | | | | | Make macdeployqt more robust against usage of symbolic links.Eike Ziller2011-07-291-13/+32
| * | | | | | | Document support for Linguist on Mac.Eike Ziller2011-07-272-0/+118
| * | | | | | | Make mac(deploy|change)qt handle dylibs that use Qt inside an app bundle.Eike Ziller2011-07-262-18/+54
| * | | | | | | Guard macdeployqt against @rpath and @loader_path too.Eike Ziller2011-07-261-2/+2
| * | | | | | | Fix typo.Eike Ziller2011-07-261-6/+6
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge remote-tracking branch 'qt/4.8'Honglei Zhang2011-07-2916-268/+269
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | fix buildRitt Konstantin2011-07-141-10/+2
| * | | | | | get rid of unwanted dependencies and unused header includesRitt Konstantin2011-07-143-26/+6
| * | | | | | sync qws_dataDir() with coreapp's internal qws_dataDir()Ritt Konstantin2011-07-141-6/+19
| * | | | | | Merge remote branch 'upstream/4.8'Jerome Pasion2011-07-086-35/+79
| |\ \ \ \ \ \