summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-06-0213-125/+446
|\
| * Backport open pages switcher from Qt Creator.kh12010-06-028-30/+403
| * Remove in-page switcher.kh12010-06-025-75/+9
| * Add missing trace, small cleanup.kh12010-06-023-20/+34
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-06-0123-241/+183
|\ \ | |/ |/|
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-312-1/+1
| |\
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Morten Engvoldsen2010-05-311-1/+1
| | |\
| | | * Fix compilation with stricts compilers.Olivier Goffart2010-05-311-1/+1
| | * | Doc: replacing old imageMorten Engvoldsen2010-05-311-0/+0
| | |/
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-291-8/+11
| |\ \ | | |/ | |/|
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-281-8/+11
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-281-8/+11
| | | |\
| | | | * Merge commit 'origin/4.7' into symbian47Thomas Zander2010-05-2714-135/+107
| | | | |\
| | | | * \ Merge branch '4.7' of scm.dev.troll.no:qt/qt into 4.7Shane Kearns2010-05-263-33/+3
| | | | |\ \
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-241-8/+11
| | | | |\ \ \
| | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-241-8/+11
| | | | | |\ \ \
| | | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-05-201-8/+11
| | | | | | |\ \ \
| | | | | | | * \ \ Merge branch '4.7' of scm.dev.troll.no:qt/qt-s60-public into 4.7Jani Hautakangas2010-05-2031-1171/+921
| | | | | | | |\ \ \
| | | | | | | * | | | QRuntimeGraphicsSystemJani Hautakangas2010-05-201-8/+11
| * | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-283-52/+58
| |\| | | | | | | | |
| | * | | | | | | | | fix & unify path separator escapingOswald Buddenhagen2010-05-272-49/+58
| | |/ / / / / / / /
| | * | | | | | | / Remove superfluous forward declaration.kh12010-05-271-3/+0
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * / | | | | | | qdoc: Fixed the model/view programming page; tried a style change.Martin Smith2010-05-282-12/+3
| |/ / / / / / /
| * | | | | | | Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-05-271-1/+3
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Fix for qml reloaded in qml viewer not being maximized properly on a deviceJoona Petrell2010-05-261-1/+3
| * | | | | | | escape backslashesOswald Buddenhagen2010-05-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-05-2513-134/+106
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Doc: Fixing bugs in HTML generatorMorten Engvoldsen2010-05-251-4/+4
| | * | | | | | qdoc: Improved class index page.Martin Smith2010-05-251-104/+89
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-2413-40/+27
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-2413-40/+27
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-05-211-2/+2
| | | | |\ \ \ \
| | | | | * | | | qdoc: Fixed html error, but the problem is still there.Martin Smith2010-05-211-1/+1
| | | | | * | | | qdoc: Changed number of columns to 1. Oila!Martin Smith2010-05-211-1/+1
| | | | * | | | | Doc: design changesMorten Engvoldsen2010-05-211-7/+0
| | | | |/ / / /
| | | | * | | | Doc: Changes to the HTMLGenerator, style and jsMorten Engvoldsen2010-05-2112-11/+20
| | | | * | | | use qtPrepareTool for qdocOswald Buddenhagen2010-05-201-14/+1
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-05-2036-1047/+72
| | | | |\ \ \ \
| | | | | * | | | Doc: Updating CSS and JSMorten Engvoldsen2010-05-201-8/+6
| | | | | |/ / /
| | | | * | | | qdoc: Propagate the language information into the XML as before.David Boddie2010-05-201-1/+1
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-251-1/+2
| |\| | | | | |
| * | | | | | | Remove old symbian specific IAP initialization.Martin Jones2010-05-253-32/+0
| | |/ / / / / | |/| | | | |
* | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-05-252-1/+44
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Get rid of 'noise' when using GL and the top-level item is an Item.Michael Brasser2010-05-241-1/+2
| |/ / / / /
| * | | | | Fix FolderListModel parentFolder property's file drive handlingJoona Petrell2010-05-211-0/+1
| * | | | | Add license headers for .qml files.Jason McDonald2010-05-211-0/+41
| | |/ / / | |/| | |
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-05-2045-1042/+112
|\| | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-208-576/+29
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-198-576/+29
| | |\ \ \ \
| | | * | | | Rename qml executable to qmlviewerKai Koehne2010-05-192-2/+4