summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* 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-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
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-2211-106/+341
| |\ \ \ \ \ \
| | * | | | | | Do not treat images in qml examples differently.Yann Bodson2010-04-221-23/+7
| | * | | | | | Fix versioning of Qt Declarative's in-built typesAlan Alpert2010-04-213-7/+7
| | * | | | | | delete the viewer before calling exit(). Ensures correct cleanup.Martin Jones2010-04-211-26/+28
| | * | | | | | Make logger widget thread safe.Martin Jones2010-04-213-4/+6
| | * | | | | | Visual test fix.Michael Brasser2010-04-211-1/+2
| | * | | | | | License headersAaron Kennedy2010-04-203-1/+83
| | * | | | | | Show command line help / qml runtime output in GUIKai Koehne2010-04-205-11/+114
| | * | | | | | Improve error messages, especially on embedded.Warwick Allison2010-04-201-1/+1
| | * | | | | | Modify qdoc to handle qml examples files.Yann Bodson2010-04-201-23/+45
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-04-1918-87/+1478
| | |\ \ \ \ \ \ | | | |/ / / / /
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-174-54/+84
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-163-44/+81
| | | |\ \ \ \ \
| | | | * | | | | ResizeMode support for QGraphicsWidgets created with QDeclarativeViewJoona Petrell2010-04-163-44/+81
| | | | | |/ / / | | | | |/| | |
| | | * | | | | Doc: Put "default" property label on same line as property nameMartin Jones2010-04-161-10/+3
| | | |/ / / /
* | | | | | | qdoc: Updated the extra images variable again, for each manual.qdocconf.Martin Smith2010-04-225-10/+43
|/ / / / / /
* | | | | | qdoc: Updated the extra images variable for each manual.qdocconf.Martin Smith2010-04-214-4/+160
* | | | | | fix typosOswald Buddenhagen2010-04-202-2/+2
* | | | | | Just use the path as the url can have an anchor attached etc...kh12010-04-202-4/+5
* | | | | | Doc: Cleaning HTML generator and updating index.qdocMorten Engvoldsen2010-04-202-73/+68
* | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-04-209-38/+92
|\ \ \ \ \ \
| * | | | | | Backport a few fixes to the Designer filteredit from CreatorJens Bache-Wiig2010-04-201-4/+10
| * | | | | | Doc: Correcting qdocconf files for assistantMorten Engvoldsen2010-04-204-28/+53
| * | | | | | Quick fix to make the documentation work, needs a proper solution though.kh12010-04-193-4/+23
| * | | | | | Fix the code for estimate whether the project is debug/release only in cetest.Liang Qi2010-04-191-2/+6
* | | | | | | qdoc: Avoided putting bad chars in linksMartin Smith2010-04-202-7/+10
|/ / / / / /
* | | | | | qdoc: Added online flag to the qdocconf file.Martin Smith2010-04-194-141/+157