summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-1986-167/+9926
|\
| * 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
| | | | | |\ \ \ \ \ \
| | | | | * | | | | | | qdoc3: Added capability to create qt.pageindex.Martin Smith2010-02-1015-23/+202
* | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w...axis2010-02-1826-950/+1528
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Designer: Fix compile for namespaced qt.ck2010-02-164-8/+8
| * | | | | | | | | | | Designer: Implement isDirty()-handling using a QUndoStack.Friedemann Kleint2010-02-165-40/+225
| * | | | | | | | | | | Designer:Fix undo crash caused by special handling of key move.Friedemann Kleint2010-02-166-90/+177
| * | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-153-3/+34
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Assistant: Rebuild search index at most once at start-up.ck2010-02-153-3/+34
| | |/ / / / / / / / /
| * | | | | | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-1370-1218/+9541
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Refactor font and zoom handling, reduces clutter in central widget.kh12010-02-1210-167/+212
| | * | | | | | | | | Some more refactoring.kh12010-02-1212-358/+462
| | * | | | | | | | | Move the QWebView based help viewer into it's own source files.kh12010-02-129-434/+560
| | |/ / / / / / / /
| * | | | | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-1233-238/+875
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-16214-11500/+14692
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-1633-238/+875
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| / / / / / / / | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-121-118/+112
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Help system: Handle all Clucene exceptions.ck2010-02-121-118/+112
| | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | Make compile. QmlMetaType::isObject() has changed to isQObject().Bea Lam2010-02-121-1/+1
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-1151-7/+7929
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |