Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | qdoc: modified \include to take a 2nd arg, snippet id. | Martin Smith | 2011-04-01 | 1 | -1/+2 |
| | |||||
* | Merge branch '4.7' into qdoc-simplified | David Boddie | 2011-01-21 | 1 | -1/+1 |
|\ | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp src/declarative/util/qdeclarativeanimation.cpp | ||||
| * | Merge branch '4.7' of ../qt into 4.7 | David Boddie | 2011-01-13 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qdeclarativeintro.qdoc doc/src/declarative/qdeclarativereference.qdoc doc/src/snippets/declarative/focus/focusColumn.qml tools/qdoc3/apigenerator.cpp tools/qdoc3/apigenerator.h tools/qdoc3/archiveextractor.cpp tools/qdoc3/bookgenerator.cpp tools/qdoc3/bookgenerator.h tools/qdoc3/ccodeparser.cpp tools/qdoc3/command.cpp tools/qdoc3/command.h tools/qdoc3/cpptoqsconverter.cpp tools/qdoc3/dcfsection.cpp tools/qdoc3/dcfsection.h tools/qdoc3/jambiapiparser.cpp tools/qdoc3/jambiapiparser.h tools/qdoc3/javacodemarker.cpp tools/qdoc3/javacodemarker.h tools/qdoc3/javadocgenerator.cpp tools/qdoc3/javadocgenerator.h tools/qdoc3/linguistgenerator.cpp tools/qdoc3/linguistgenerator.h tools/qdoc3/loutgenerator.h tools/qdoc3/mangenerator.cpp tools/qdoc3/mangenerator.h tools/qdoc3/polyarchiveextractor.cpp tools/qdoc3/polyarchiveextractor.h tools/qdoc3/polyuncompressor.cpp tools/qdoc3/polyuncompressor.h tools/qdoc3/qsakernelparser.cpp tools/qdoc3/qscodemarker.cpp tools/qdoc3/qscodemarker.h tools/qdoc3/qscodeparser.cpp tools/qdoc3/qscodeparser.h tools/qdoc3/sgmlgenerator.cpp tools/qdoc3/sgmlgenerator.h tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/uncompressor.cpp tools/qdoc3/webxmlgenerator.cpp tools/qdoc3/webxmlgenerator.h | ||||
| | * | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 1 | -1/+1 |
| | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
* | | | Allowed the indentation of marked up code to be customized. | David Boddie | 2011-01-20 | 1 | -6/+14 |
|/ / | | | | | | | | | Marked up code is indented according to its indentation relative to the snippet markers (//! for example) in the quoted source code. | ||||
* | | Fixed handling of indented snippet markers. | David Boddie | 2010-12-20 | 1 | -30/+26 |
| | | | | | | | | Refactored the code to remove namespace macros and snippet markers. | ||||
* | | Added hack to remove markup for opened comments at the end of snippets. | David Boddie | 2010-12-09 | 1 | -0/+4 |
| | | |||||
* | | Updated code comments. | David Boddie | 2010-11-19 | 1 | -3/+2 |
|/ | |||||
* | Update copyright year to 2010 | Jason McDonald | 2010-01-06 | 1 | -1/+1 |
| | | | | Reviewed-by: Trust Me | ||||
* | Update license headers again. | Jason McDonald | 2009-09-09 | 1 | -4/+4 |
| | | | | Reviewed-by: Trust Me | ||||
* | Update tech preview license header. | Jason McDonald | 2009-08-31 | 1 | -13/+13 |
| | | | | Reviewed-by: Trust Me | ||||
* | Update license headers. | Jason McDonald | 2009-08-11 | 1 | -1/+1 |
| | | | | Reviewed-by: Trust Me | ||||
* | Update license headers as requested by the marketing department. | Jason McDonald | 2009-06-16 | 1 | -2/+2 |
| | | | | Reviewed-by: Trust Me | ||||
* | Long live Qt 4.5! | Lars Knoll | 2009-03-23 | 1 | -0/+369 |