summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-05-0210-57/+154
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-308-13/+67
| |\
| | * doc: Fixed some qdoc errors.Martin Smith2010-04-301-0/+1
| | * qdoc: Added breadcrumbs for namespaces.Martin Smith2010-04-302-3/+7
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-302-3/+3
| | |\
| | | * Backport a fix to Designer filterwidgetJens Bache-Wiig2010-04-292-3/+3
| | * | qdoc: Added "All namespaces" to the API Lookup box.Martin Smith2010-04-301-0/+1
| | |/
| | * qdoc: Added breadcrumbs to examples. Coolio.Martin Smith2010-04-293-0/+37
| | * qdoc: Sprinkled more breadcrumbs.Martin Smith2010-04-282-9/+20
| * | Don't disable the symbian media backend.Andrew den Exter2010-04-291-16/+20
| |/
| * Fix compile.Aaron McCarthy2010-04-281-1/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-274-29/+68
| |\
| | * qdoc: Added breadcrumbs for class pages.Martin Smith2010-04-272-27/+19
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-279-49/+50
| | |\
| | * | qdoc: Removed MacRefs for Xcode documentation stuff.Martin Smith2010-04-273-3/+50
* | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-04-2836-438/+960
|\ \ \ \
| * \ \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-04-2736-438/+960
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-274-16/+25
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Fix remaining 4.6 type registrations (to 4.7).Warwick Allison2010-04-271-1/+1
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-264-15/+24
| | | |\ \
| | | | * | Unify naming of settings / UI to be "Qt Qml Runtime"Kai Koehne2010-04-263-6/+7
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-243-9/+17
| | | | |\ \
| | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-243-9/+17
| | | | | |\ \ | | | | | | |/ | | | | | |/|
| | | | | | * Fix hidden menu on embedded.Warwick Allison2010-04-232-7/+17
| | | | | | * Location of binary is not on installed-content import path.Warwick Allison2010-04-231-2/+0
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-264-29/+12
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-04-2618-134/+387
| | | |\ \ \ \ \
| | | | * | | | | Improved workaround for new qt documentation, base on dboddie's work.kh12010-04-263-13/+12
| | | | |/ / / /
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-04-231-13/+30
| | | |\ \ \ \ \
| | | * | | | | | Ensure that all qthelp URLs have paths that start with /qdoc/.David Boddie2010-04-232-6/+5
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-04-221-40/+39
| | | |\ \ \ \ \ \
| | | * | | | | | | Doc: Fixed the Declarative documentation set. Tweaked the others.David Boddie2010-04-225-26/+44
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-261-1/+1
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | | * | | | | | | Assigned a UID3 to qml.exe.Frans Englich2010-04-261-1/+1
| | | | |_|_|_|/ / | | | |/| | | | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-261-1/+1
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | | * | | | | | Doc: correcting a character bug in the footer.Morten Engvoldsen2010-04-261-1/+1
| | | |/ / / / /
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-243-18/+36
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-233-18/+36
| | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-04-233-3/+9
| | | | |\ \ \ \
| | | | | * | | | Add support for MSBuild, which is the project format for MSVC 2010Martin Petersson2010-04-213-3/+9
| | | | * | | | | Merge branch '4.7' of ../../qt/4.7 into 4.7Justin McPherson2010-04-2222-272/+530
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | |/| | / / | | | | | | |/ / | | | | | |/| |
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-191-15/+27
| | | | |\ \ \ \
| | | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-181-15/+27
| | | | | |\ \ \ \
| | | | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-161-15/+27
| | | | | | |\ \ \ \
| | | | | | | * | | | QtMediaservices -> QtMediaServices.Justin McPherson2010-04-161-5/+5
| | | | | | | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-04-156-21/+62
| | | | | | | |\ \ \ \
| | | | | | | * | | | | Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-151-15/+27
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-231-13/+30
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | / | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | | * | | | | | | | qdoc: Removed nested <ul> elements from the TOCMartin Smith2010-04-231-13/+30
| | | | |_|_|_|_|/ / | | | |/| | | | | |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-2211-106/+341
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |