summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-088-48/+495
|\
| * Doc: Fixed whitespace in the other configuration file for zh_CN.David Boddie2010-06-071-22/+22
| * Doc: Fixed whitespace in the Simplified Chinese doc configuration.David Boddie2010-06-071-26/+26
| * * Add Japanese tutorial documentsTakumi ASAKI2010-06-078-0/+447
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-06-082-1/+2
|\ \ | |/ |/|
| * fix translations from some header files being omittedOswald Buddenhagen2010-06-071-0/+1
| * propagate code change back to .g sourceOswald Buddenhagen2010-06-031-1/+1
| * re-add overriding of tool paths to configureOswald Buddenhagen2010-05-171-0/+5
| * define qtPrepareTool() function and use it throughoutOswald Buddenhagen2010-05-141-5/+0
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-041-0/+752
|\ \
| * | Synchronizing to latest treeGarami Gábor2010-06-041-0/+8
| * | Adding correct hungarian translationGarami Gábor2010-06-041-0/+744
* | | remove spurious empty lines in the linguist tools' outputOswald Buddenhagen2010-06-036-18/+18
* | | don't use qWarning() - or even qFatal()! - gratuitously.Oswald Buddenhagen2010-06-039-178/+178
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-0332-101/+5492
|\ \
| * | Doc: updating imagesMorten Engvoldsen2010-06-0214-0/+0
| * | write PO files without duplicated message idsOswald Buddenhagen2010-06-021-7/+60
| * | Doc: adding offline docs to assistant and Qt Creator. Improving small docs an...Morten Engvoldsen2010-06-0211-57/+168
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-06-012-1/+1
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-06-015-37/+133
| | |\ \
| * | | | doc: Added DITA XML generatorMartin Smith2010-06-012-0/+5131
| | |/ / | |/| |
| * | | qdoc: Added DITA XML generatorMartin Smith2010-05-313-3/+116
| * | | update Russian translation for Qt librariesRitt Konstantin2010-05-311-1/+1
| * | | doc: Changed last breadcrumb to not be a link.Martin Smith2010-05-311-33/+16
* | | | QML viewer now supports TopUp, TopDown, RightUp and LeftUp orientationsBea Lam2010-06-025-50/+64
| |/ / |/| |
* | | 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-271-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
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |