Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed merge conflict | Jerome Pasion | 2011-01-05 | 1 | -4/+0 |
| | |||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2011-01-05 | 17 | -659/+1316 |
|\ | | | | | | | Merging qt-doc-team into cloned repository | ||||
| * | Doc: Sync with upstream. | David Boddie | 2010-12-22 | 1 | -1/+1 |
| | | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-12-21 | 6 | -15/+9 |
| |\ | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-12-21 | 2 | -29/+29 |
| | |\ | |||||
| | * | | Doc: Changed a page title. | David Boddie | 2010-12-21 | 5 | -6/+6 |
| | | | | |||||
| | * | | Doc: Updated the HarfBuzz license information. | David Boddie | 2010-12-21 | 1 | -9/+3 |
| | | | | | | | | | | | | | | | | As-requested-by: Legal | ||||
| * | | | Doc: Fixed QML syntax in quoted code snippets. | David Boddie | 2010-12-21 | 2 | -1/+62 |
| | |/ | |/| | |||||
| * | | Merge branch 'qdoc-simplified' into 4.7 | David Boddie | 2010-12-21 | 2 | -29/+29 |
| |\ \ | | |/ | |/| | |||||
| | * | Doc: Fixed whitespace. | David Boddie | 2010-12-21 | 2 | -29/+29 |
| | | | |||||
| * | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-12-20 | 2 | -1/+5 |
| |\ \ | |||||
| | * | | Update docs on importing javascript files | Bea Lam | 2010-12-20 | 2 | -1/+5 |
| | | | | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-12-20 | 2 | -1/+40 |
| |\ \ \ | | |_|/ | |/| | | |||||
| * | | | Updated the offline template to use a new offline style sheet. | David Boddie | 2010-12-17 | 1 | -0/+662 |
| | | | | |||||
| * | | | Doc: Fixed whitespace. | David Boddie | 2010-12-17 | 1 | -61/+14 |
| | | | | |||||
| * | | | Doc: Fixed broken links. | David Boddie | 2010-12-17 | 3 | -12/+10 |
| | | | | |||||
| * | | | Merge branch '4.7' into qdoc-simplified | David Boddie | 2010-12-17 | 1 | -30/+51 |
| |\ \ \ | |||||
| * | | | | Whitespace fixes. | David Boddie | 2010-12-17 | 1 | -553/+533 |
| | | | | | |||||
* | | | | | Re-organized the Qt Quick page. Changed titles and links. | Jerome Pasion | 2010-12-20 | 31 | -689/+1249 |
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071 | ||||
* | | | | | Adding two QML Best Practice guides. | Jerome Pasion | 2010-12-20 | 2 | -0/+143 |
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15757 | ||||
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2010-12-20 | 29 | -277/+712 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Jerome Pasion | 2010-12-20 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-12-17 | 1 | -1/+1 |
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/| | |||||
| | | * | | Doc: typo fixed in doc/src/declarative/extending.qdoc | Joerg Bornemann | 2010-12-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe | ||||
| * | | | | Added BSD license to snippet code. | Jerome Pasion | 2010-12-20 | 1 | -0/+39 |
| |/ / / | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-12-16 | 1 | -30/+51 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-12-15 | 20 | -3133/+1276 |
| | |\ \ | |||||
| | * | | | Doc: Added a note about the Public Suffix List. | David Boddie | 2010-12-10 | 1 | -30/+51 |
| | | | | | | | | | | | | | | | | | | | | Added at the request of Peter Hartmann and Legal. | ||||
| * | | | | Merge branch '4.7' into qdoc-simplified | David Boddie | 2010-12-15 | 12 | -24/+389 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-12-13 | 9 | -21/+385 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | Improvements to anchoring docs | Bea Lam | 2010-12-09 | 1 | -17/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Make it clear that anchor margins only apply to anchors. Also document that anchor and absolute positioning cannot be mixed. | ||||
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-12-09 | 8 | -4/+336 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update QtGui bwins def file for QTBUG-15615 highlightFollowsCurrentItem: false was not always honored ListView: Fix calculation of currentItem position when out of view. Update QtGui def files Fix openDatabaseSync() to not create unused directory Document support for QVariantList and QVariantMap type conversion Some doc clarification for components and javascript integration Cursor shouldn't blink while dragging cursor position Qt.include() docs weren't being picked up by qdoc Doc: make it clear that "z" affects sibling stacking order. | ||||
| | | | * | | Document support for QVariantList and QVariantMap type conversion | Bea Lam | 2010-12-06 | 4 | -1/+156 |
| | | | | | | |||||
| | | | * | | Some doc clarification for components and javascript integration | Bea Lam | 2010-12-06 | 1 | -3/+2 |
| | | | | | | |||||
| | | | * | | Qt.include() docs weren't being picked up by qdoc | Bea Lam | 2010-12-06 | 4 | -0/+178 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the Qt.include() docs to qdeclarativeengine.cpp and also documents it in the "Integrating JavaScript" page. Task-number: QTBUG-15855 | ||||
| * | | | | | Doc: Used div elements for floats, updated the style sheet. | David Boddie | 2010-12-14 | 5 | -10/+35 |
| | | | | | | |||||
| * | | | | | Merge branch 'qdoc-simplified' into mimir-simplified | David Boddie | 2010-12-14 | 68 | -697/+2367 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/atom.h tools/qdoc3/qdoc3.pro | ||||
| | * | | | | | Doc: Changed floating images to use the new float qdoc macros. | David Boddie | 2010-12-13 | 4 | -25/+9 |
| | | | | | | | |||||
| | * | | | | | Doc: Fixed non-well-formed XHTML. | David Boddie | 2010-12-13 | 1 | -14/+14 |
| | | | | | | | |||||
| | * | | | | | Doc: Whitespace fix. | David Boddie | 2010-12-13 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Doc: Temporarily used \qml...\endqml markup for the QML introduction. | David Boddie | 2010-12-09 | 1 | -43/+32 |
| | | | | | | | |||||
| | * | | | | | Updated the build files to use config files not command line options. | David Boddie | 2010-12-08 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Merge branch '4.7' into qdoc-simplified | David Boddie | 2010-12-07 | 6 | -18/+65 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch '4.7' into qdoc-simplified | David Boddie | 2010-12-07 | 58 | -594/+2244 |
| | |\ \ \ \ \ \ | |||||
| * | | | | | | | | qdoc: Changed index.qdoc to use new \div command | Martin Smith | 2010-12-14 | 1 | -79/+87 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessary for the Mimir project, but it is also useful for writing html output in that now you can write the index page (and other such pages) using pure qdoc commands. i.e. you don't need to use raw html for this sort of thing anymore. | ||||
| * | | | | | | | | doc: Replaced some \raw and \endraw uses with \table and \endtable | Martin Smith | 2010-12-13 | 1 | -82/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In DITA XML, there is no straightforward way to translate raw html into DITA XML, because the XML stream writer automagically escapes all the raw html elements. So I am beginning to replace uses of the \raw command with \table, which gets output correctly. The problem is the XML stream writer must see each XML element start and end, because it keeps them on a stack. When you output XML elements with the writeCharacters() function, it escapes the '<' and '>' of any XML elements the character string contains. | ||||
| * | | | | | | | | doc: Replaced some \raw and \endraw uses with \table and \endtable | Martin Smith | 2010-12-13 | 8 | -2692/+768 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In DITA XML, there is no straightforward way to translate raw html into DITA XML, because the XML stream writer automagically escapes all the raw html elements. So I am beginning to replace uses of the \raw command with \table, which gets output correctly. The problem is the XML stream writer must see each XML element start and end, because it keeps them on a stack. When you output XML elements with the writeCharacters() function, it escapes the '<' and '>' of any XML elements the character string contains. | ||||
| * | | | | | | | | doc: Eliminated some "raw-html" cases. | Martin Smith | 2010-12-13 | 1 | -336/+91 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More to come. | ||||
| * | | | | | | | | doc: Removed some empty \row commands from a table. | Martin Smith | 2010-12-09 | 1 | -3/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'qdoc-simplified' into mimir-simplified | David Boddie | 2010-12-07 | 112 | -1132/+3984 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/platforms/compiler-notes.qdoc tools/qdoc3/ditaxmlgenerator.cpp tools/qdoc3/ditaxmlgenerator.h tools/qdoc3/htmlgenerator.cpp tools/qdoc3/htmlgenerator.h tools/qdoc3/node.cpp tools/qdoc3/pagegenerator.h |