summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-1174-970/+12094
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-1166-585/+11497
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-1166-585/+11497
| | |\
| | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1David Boddie2010-02-10227-7816/+5623
| | | |\
| | | * | 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
| | | * | Doc: Tidied up the class layout and removed an unnecessary image.David Boddie2010-02-091-15/+13
| | | * | Merge branch 'qdoc-i18n'David Boddie2010-02-0927-520/+1844
| | | |\ \
| | | | * | Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars.David Boddie2010-02-086-14/+11
| | | | * | Doc/qdoc: Converted encoding of ISO-8859-1 docs to UTF-8. Output UTF-8.David Boddie2010-02-086-427/+437
| | | | * | 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-046-2/+1129
| | | | * | Merge branch 'master' into qdoc-i18nDavid Boddie2010-02-0370-178/+24109
| | | | |\ \
| | | | * | | 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 branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-1119-129/+473
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Added geometry shaders to changes-4.7.0 file + a small doc update about itGunnar Sletta2010-02-102-0/+5
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Gunnar Sletta2010-02-10227-7592/+5821
| | |\ \ \ \ \
| | | * | | | | Crash when deleting the parent of a context menu while it is being displayedGabriel de Dietrich2010-02-109-16/+90
| | | * | | | | Workaround for a certain functionally challenged compileraavit2010-02-101-3/+3
| | | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-106-107/+146
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-096-107/+146
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2010-02-091-5/+5
| | | | | |\ \ \ \ \
| | | | | | * | | | | Fix failing QDoubleValidator testsAlan Alpert2010-02-091-5/+5
| | | | | * | | | | | Use libpng API as recommended. Preparation for upgrade to libpng 1.4.0.aavit2010-02-091-73/+62
| | | | | |/ / / / /
| | | | | * | | | | QMainWindow: update the separator size when the style changeOlivier Goffart2010-02-084-29/+79
| | * | | | | | | | Merge branch 'geometry-shaders-to-integrate'Gunnar Sletta2010-02-084-5/+231
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | | * | | | | | | Another round of Geometry shader review.Gunnar Sletta2010-02-082-21/+13
| | | * | | | | | | Fix Geometry shaders based on reviewGunnar Sletta2010-02-042-10/+16
| | | * | | | | | | Geometry Shader support in QGLShaderProgramGunnar Sletta2010-02-014-1/+228
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-1011-298/+475
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | Assistant: Remove assertion for all files being watched.ck2010-02-101-9/+13
| | * | | | | | | | Fixed regression.Erik Verbruggen2010-02-101-4/+4
| | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-1010-289/+462
| | |\ \ \ \ \ \ \ \ | |/ / / / / / / / /
| | * | | | | | | | Added method to clear the undo/redo stacks.Erik Verbruggen2010-02-094-22/+67
| | * | | | | | | | Fixed setting back spaces when streaming a QPointFThorbjørn Lindeijer2010-02-091-1/+1
| | * | | | | | | | Move find widget in it's own source file. Some further cleanup.kh12010-02-095-266/+394
* | | | | | | | | | 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-10161-5906/+2911
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-1012-19/+149
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Incorrect property setter generated by dumpcpp for Microsoft Word 2007.Prasanth Ullattil2010-02-101-0/+5
| | * | | | | | | | Cocoa: Implement our own NSApplication subclassRichard Moe Gustavsen2010-02-106-48/+89
| | * | | | | | | | Cocoa: Menu in menubar stays highlightedRichard Moe Gustavsen2010-02-108-3/+87
| * | | | | | | | | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-02-10151-5887/+2762
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-09151-5887/+2762
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-085-17/+53
| | | |\ \ \ \ \ \ \ \