summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Rename MouseRegion -> MouseAreaMartin Jones2010-02-221-2/+2
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-1942-3080/+125
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMichael Brasser2010-02-1971-175/+9934
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-1871-152/+9911
| | |\
| | * | Compile fix with namepaceshjk2010-02-181-2/+2
| | * | QmlView API review. See QmlChanges.txt for details.Martin Jones2010-02-183-21/+21
| * | | Add support for startDragDistance in qmlviewer.Kaj Grönholm2010-02-191-0/+4
| |/ /
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-1741-3060/+101
| |\ \
| | * | qmlviewer: build on symbianMichael Brasser2010-02-171-0/+1
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-02-171-1/+1
| | |\ \
| | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-1639-3053/+89
| | | |\ \
| | | * | | Fix QTBUG-8090, improve original patch effectiveness.Warwick Allison2010-02-161-1/+1
| | * | | | Conditionally link webkit on winceAaron Kennedy2010-02-171-1/+4
| | | |/ / | | |/| |
| | * | | Remove standalone QmlDebugger. It is now only available through theBea Lam2010-02-1623-3049/+1
| | * | | Mobility 404Wolfgang Beck2010-02-161-0/+4
| | * | | MOBILITY-404 QS Windows.Wolfgang Beck2010-02-1621-23/+103
| | |/ /
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-1548-1056/+1968
| | |\ \
| | * | | Not exported in Qt 4.6.2, push to next release.Warwick Allison2010-02-151-5/+6
* | | | | Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-1882-163/+9916
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | AIX has a #define for hz, so undef itThiago Macieira2010-02-171-0/+4
| * | | | Fix compilation with IBM xlC 7:Thiago Macieira2010-02-171-1/+8
| * | | | Fix compilation of Qt Assistant when WebKit isn't built.Thiago Macieira2010-02-174-4/+10
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-1681-162/+9904
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix copyright year.Jason McDonald2010-02-1634-34/+34
| | * | | Fix broken license headers.Jason McDonald2010-02-162-0/+15
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-1345-128/+9855
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-1345-128/+9855
| | | |\ \
| | | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-1245-128/+9855
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | | * Add license header to this fileThiago Macieira2010-02-121-0/+41
| | | | | * qdoc3: Completed handling of the new \pagekeywords command.Martin Smith2010-02-112-2/+11
| | | | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-1140-379/+9994
| | | | | |\
| | | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-1144-127/+9789
| | | | | | |\
| | | | | | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1David Boddie2010-02-1086-6302/+2592
| | | | | | | |\
| | | | | | | * | qdoc: Added a build rule for the documentation - disabled by default.David Boddie2010-02-101-0/+21
| | | | | | | * | Doc: Added the qdoc manual to the repository for future maintenance.David Boddie2010-02-1014-0/+9262
| | | | | | | * | qdoc: Made a temporary fix for comment highlighting.David Boddie2010-02-091-8/+6
| | | | | | | * | Merge branch 'qdoc-i18n'David Boddie2010-02-0918-96/+298
| | | | | | | |\ \
| | | | | | | | * | Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars.David Boddie2010-02-082-4/+4
| | | | | | | | * | Doc/qdoc: Converted encoding of ISO-8859-1 docs to UTF-8. Output UTF-8.David Boddie2010-02-082-4/+14
| | | | | | | | * | qdoc: Removed debugging code.David Boddie2010-02-081-2/+0
| | | | | | | | * | Doc: Updated the configuration file for the Simplified Chinese docs.David Boddie2010-02-081-11/+9
| | | | | | | | * | qdoc: Standardized encoding names and updated the Chinese config files.David Boddie2010-02-054-2/+152
| | | | | | | | * | Doc: Added Simplified Chinese documents and build rules for them.David Boddie2010-02-041-1/+3
| | | | | | | | * | Merge branch 'master' into qdoc-i18nDavid Boddie2010-02-0315-27/+91
| | | | | | | | |\ \
| | | | | | | | * | | qdoc: Added support for different source and output character encodings.David Boddie2010-02-0210-84/+125
| | | | | | | | * | | Doc: Synchronize configuration files for easier maintenance.David Boddie2010-02-022-4/+5
| | | | | | | | * | | Merge commit 'origin/4.6' into oslo1-masterRohan McGovern2010-02-0157-396/+395
| | | | | | | | |\ \ \
| | | | | * | | | | | | qdoc3: Added curly braces in switch statement for braindead compiler.Martin Smith2010-02-114-11/+26
| | | | | | |_|_|_|_|/ | | | | | |/| | | | |
| | | | | * | | | | | qdoc3: Fixed bug in creation of qt.pageindex.Martin Smith2010-02-101-1/+1
| | | | | * | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-1034-4987/+32
| | | | | |\ \ \ \ \ \