Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w... | axis | 2010-02-19 | 86 | -167/+9926 |
|\ | |||||
| * | AIX has a #define for hz, so undef it | Thiago Macieira | 2010-02-17 | 1 | -0/+4 |
| * | Fix compilation with IBM xlC 7: | Thiago Macieira | 2010-02-17 | 1 | -1/+8 |
| * | Fix compilation of Qt Assistant when WebKit isn't built. | Thiago Macieira | 2010-02-17 | 4 | -4/+10 |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-16 | 81 | -162/+9904 |
| |\ | |||||
| | * | Fix copyright year. | Jason McDonald | 2010-02-16 | 34 | -34/+34 |
| | * | Fix broken license headers. | Jason McDonald | 2010-02-16 | 2 | -0/+15 |
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-13 | 45 | -128/+9855 |
| | |\ | |||||
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-13 | 45 | -128/+9855 |
| | | |\ | |||||
| | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-12 | 45 | -128/+9855 |
| | | | |\ | |||||
| | | | | * | Add license header to this file | Thiago Macieira | 2010-02-12 | 1 | -0/+41 |
| | | | | * | qdoc3: Completed handling of the new \pagekeywords command. | Martin Smith | 2010-02-11 | 2 | -2/+11 |
| | | | | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 | Martin Smith | 2010-02-11 | 40 | -379/+9994 |
| | | | | |\ | |||||
| | | | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-11 | 44 | -127/+9789 |
| | | | | | |\ | |||||
| | | | | | | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 | David Boddie | 2010-02-10 | 86 | -6302/+2592 |
| | | | | | | |\ | |||||
| | | | | | | * | | qdoc: Added a build rule for the documentation - disabled by default. | David Boddie | 2010-02-10 | 1 | -0/+21 |
| | | | | | | * | | Doc: Added the qdoc manual to the repository for future maintenance. | David Boddie | 2010-02-10 | 14 | -0/+9262 |
| | | | | | | * | | qdoc: Made a temporary fix for comment highlighting. | David Boddie | 2010-02-09 | 1 | -8/+6 |
| | | | | | | * | | Merge branch 'qdoc-i18n' | David Boddie | 2010-02-09 | 18 | -96/+298 |
| | | | | | | |\ \ | |||||
| | | | | | | | * | | Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars. | David Boddie | 2010-02-08 | 2 | -4/+4 |
| | | | | | | | * | | Doc/qdoc: Converted encoding of ISO-8859-1 docs to UTF-8. Output UTF-8. | David Boddie | 2010-02-08 | 2 | -4/+14 |
| | | | | | | | * | | qdoc: Removed debugging code. | David Boddie | 2010-02-08 | 1 | -2/+0 |
| | | | | | | | * | | Doc: Updated the configuration file for the Simplified Chinese docs. | David Boddie | 2010-02-08 | 1 | -11/+9 |
| | | | | | | | * | | qdoc: Standardized encoding names and updated the Chinese config files. | David Boddie | 2010-02-05 | 4 | -2/+152 |
| | | | | | | | * | | Doc: Added Simplified Chinese documents and build rules for them. | David Boddie | 2010-02-04 | 1 | -1/+3 |
| | | | | | | | * | | Merge branch 'master' into qdoc-i18n | David Boddie | 2010-02-03 | 15 | -27/+91 |
| | | | | | | | |\ \ | |||||
| | | | | | | | * | | | qdoc: Added support for different source and output character encodings. | David Boddie | 2010-02-02 | 10 | -84/+125 |
| | | | | | | | * | | | Doc: Synchronize configuration files for easier maintenance. | David Boddie | 2010-02-02 | 2 | -4/+5 |
| | | | | | | | * | | | Merge commit 'origin/4.6' into oslo1-master | Rohan McGovern | 2010-02-01 | 57 | -396/+395 |
| | | | | | | | |\ \ \ | |||||
| | | | | * | | | | | | | qdoc3: Added curly braces in switch statement for braindead compiler. | Martin Smith | 2010-02-11 | 4 | -11/+26 |
| | | | | | |_|_|_|_|/ | | | | | |/| | | | | | |||||
| | | | | * | | | | | | qdoc3: Fixed bug in creation of qt.pageindex. | Martin Smith | 2010-02-10 | 1 | -1/+1 |
| | | | | * | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 | Martin Smith | 2010-02-10 | 34 | -4987/+32 |
| | | | | |\ \ \ \ \ \ | |||||
| | | | | * | | | | | | | qdoc3: Added capability to create qt.pageindex. | Martin Smith | 2010-02-10 | 15 | -23/+202 |
* | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-w... | axis | 2010-02-18 | 26 | -950/+1528 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Designer: Fix compile for namespaced qt. | ck | 2010-02-16 | 4 | -8/+8 |
| * | | | | | | | | | | | Designer: Implement isDirty()-handling using a QUndoStack. | Friedemann Kleint | 2010-02-16 | 5 | -40/+225 |
| * | | | | | | | | | | | Designer:Fix undo crash caused by special handling of key move. | Friedemann Kleint | 2010-02-16 | 6 | -90/+177 |
| * | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast... | Qt Continuous Integration System | 2010-02-15 | 3 | -3/+34 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Assistant: Rebuild search index at most once at start-up. | ck | 2010-02-15 | 3 | -3/+34 |
| | |/ / / / / / / / / | |||||
| * | | | | | | | | | | Merge remote branch 'origin/master' into qt-master-from-4.6 | Thiago Macieira | 2010-02-13 | 70 | -1218/+9541 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | Refactor font and zoom handling, reduces clutter in central widget. | kh1 | 2010-02-12 | 10 | -167/+212 |
| | * | | | | | | | | | Some more refactoring. | kh1 | 2010-02-12 | 12 | -358/+462 |
| | * | | | | | | | | | Move the QWebView based help viewer into it's own source files. | kh1 | 2010-02-12 | 9 | -434/+560 |
| | |/ / / / / / / / | |||||
| * | | | | | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-12 | 33 | -238/+875 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public | axis | 2010-02-16 | 214 | -11500/+14692 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60 | axis | 2010-02-16 | 33 | -238/+875 |
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| / / / / / / / | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast... | Qt Continuous Integration System | 2010-02-12 | 1 | -118/+112 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Help system: Handle all Clucene exceptions. | ck | 2010-02-12 | 1 | -118/+112 |
| | | |_|_|/ / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Make compile. QmlMetaType::isObject() has changed to isQObject(). | Bea Lam | 2010-02-12 | 1 | -1/+1 |
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-11 | 51 | -7/+7929 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | |