summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-3110-208/+186
|\
| * Added an additional check to workaround an issue on Windows.David Boddie2011-08-301-1/+1
| * Modified \since command behavior slightly to handle project and version.David Boddie2011-08-309-202/+174
| * qdoc: Fixed QTBUG-19338Martin Smith2011-08-302-5/+11
* | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-2610-186/+208
|\ \ | |/
* | 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-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
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-07-052-24/+62
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | qmlplugindump: Fix dumping with -path on Mac.Christian Kamm2011-06-291-2/+10
| | | * | | | qmlplugindump: Improve error message for misbehaving plugin components.Christian Kamm2011-06-291-2/+8
| | | * | | | qmldump: Fix export comparison.Christian Kamm2011-06-271-1/+1
| | | * | | | qmlplugindump: For extended types, remove exports of the base object.Christian Kamm2011-06-231-20/+27
| | | * | | | qmlplugindump: Build debug version if possible.Christian Kamm2011-06-231-0/+17
| * | | | | | Modified \since command behavior slightly to handle project and version.David Boddie2011-07-019-202/+174
| * | | | | | Doc: Updated documentation with \since 4.8 declarations.David Boddie2011-06-301-0/+6
* | | | | | | Runonphone with CODA supportStephen Chong2011-07-2824-1534/+4506
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-07-042-9/+15
|\ \ \ \ \ \
| * | | | | | runonphone: Change the upload option to allow uploading any fileMartin Storsjo2011-06-241-7/+7
| * | | | | | runonphone: Include the manufacturer name in the friendly name on OS XMartin Storsjo2011-06-241-1/+2
| * | | | | | runonphone: Fix usb device enumeration on Mac OS XMartin Storsjo2011-06-241-1/+6
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-07-021-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-teamQt Continuous Integration System2011-06-291-1/+1
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
generated by cgit v0.12 at 2025-03-12 04:42:59 (GMT)