summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-062-88/+138
|\
| * Update docs - calling overloaded functions from QML is now supportedBea Lam2011-01-061-5/+8
| |
| * Doc fixes for introduction page and Item docsBea Lam2011-01-061-83/+130
| | | | | | | | | | | | | | Moved 'Identity' and 'Property Change Signals' sections from Item docs to the intro page, which previously had a section on ids but this has been moved out of the 'Properties' section since an id isn't an ordinary property.
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-234-8/+50
|\ \ | |/
| * Improve docs on attached properties on view delegates.Martin Jones2010-12-234-8/+50
| | | | | | | | | | | | | | | | Clarify that the properties are attached to the root of the delegate, and must be accessed as such by child items. Task-number: QTBUG-16193 Reviewed-by: Bea Lam
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-2346-3531/+2002
|\ \ | |/ | | | | | | | | Conflicts: src/s60main/newallocator_hook.cpp tools/runonphone/serenum_unix.cpp
| * Document the 'variant' basic typeBea Lam2010-12-222-12/+87
| | | | | | | | | | | | | | | | | | This includes documentation on restrictions and considerations when storing a JavaScript object with this type, since such properties only hold a copy of the object's values and not the actual object. Task-number: QTBUG-16196 Reviewed-by: Michael Brasser
| * Add double type to QML Basic Types docsBea Lam2010-12-221-0/+20
| |
| * Remove redundant docsBea Lam2010-12-221-81/+0
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-12-2143-3438/+1895
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: (29 commits) Doc: Added a missing license header. doc: Replaced some \raw and \endraw uses with \table and \endtable doc: Replaced some \raw and \endraw uses with \table and \endtable doc: Replaced some \raw and \endraw uses with \table and \endtable Doc: Added a note about the Public Suffix List. Doc: Fixed doc bug in Diagram Scene example doc: Removed some empty \row commands from a table. Doc: Added link to QML Basic Types in main Qt Quick page. Doc: Added missing What's New information for Qt 4.6 and 4.7. Doc: Fixed incorrect case in a page file name. Doc: Added a link to the QML Basic Types page. Doc: Removed duplicate external page reference. Doc: Fixed a link to the correct searchPaths() function. Doc: Added documentation about the use of null custom title bar widgets. Doc: Added a missing external page reference. Fixed the QML Focus document. Fixed snippets, images, and formatting. Added QML coding convention for "private" properties. Fixed link to qtestlib-tools by adding link to qt-webpages.qdoc. Some whitespace fixes. Fixed a bug by changing the id name to lower case. ...
| | * Doc: Added a missing license header.David Boddie2010-12-211-0/+39
| | |
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-1520-3133/+1276
| | |\
| | | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-139-21/+385
| | | |\
| | | * | doc: Replaced some \raw and \endraw uses with \table and \endtableMartin Smith2010-12-131-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 \endtableMartin Smith2010-12-138-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.
| | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2010-12-132-3/+3
| | | |\ \
| | | | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-091-2/+2
| | | | |\ \
| | | * | | | doc: Replaced some \raw and \endraw uses with \table and \endtableMartin Smith2010-12-131-336/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Added a note about the Public Suffix List.David Boddie2010-12-101-30/+51
| | | |/ / / | | |/| | | | | | | | | | | | | | | Added at the request of Peter Hartmann and Legal.
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-12-0963-619/+2320
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2010-12-0978-663/+3037
| | | |\ \ \
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-12-086-18/+65
| | | | |\ \ \
| | | | | * | | Doc: Added missing What's New information for Qt 4.6 and 4.7.David Boddie2010-12-072-12/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15670
| | | | | * | | Doc: Fixed incorrect case in a page file name.David Boddie2010-12-071-1/+1
| | | | | | | |
| | | | | * | | Doc: Added a link to the QML Basic Types page.David Boddie2010-12-071-0/+1
| | | | | | | |
| | | | | * | | Doc: Removed duplicate external page reference.David Boddie2010-12-071-5/+0
| | | | | | | |
| | | | | * | | Doc: Added a missing external page reference.David Boddie2010-12-071-0/+5
| | | | | | | |
| | | | * | | | Doc: Added link to QML Basic Types in main Qt Quick page.Jerome Pasion2010-12-081-0/+1
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | | | * | | Fixed the QML Focus document. Fixed snippets, images, and formatting.Jerome Pasion2010-12-0617-219/+713
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | | | * | | Added QML coding convention for "private" properties.Jerome Pasion2010-12-062-3/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Private properties start with two underscores. __property Reviewed-by: David Boddie
| | | | * | | Fixed link to qtestlib-tools by adding link to qt-webpages.qdoc.Jerome Pasion2010-12-062-15/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link is now linking to the gitorious project site. Task-number: QTBUG-15714 Reviewed-by: David Boddie
| | | | * | | Some whitespace fixes.Jerome Pasion2010-12-061-32/+32
| | | | | | |
| | | | * | | Fixed a bug by changing the id name to lower case.Jerome Pasion2010-12-061-1/+1
| | | | | | |
| | | | * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-0328-316/+1287
| | | | |\ \ \
| | | | * \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-021-0/+9
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-012-6/+6
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-305-2/+108
| | | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-291-4/+9
| | | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-261-0/+1
| | | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | | doc: Removed some empty \row commands from a table.Martin Smith2010-12-091-3/+0
| | | | | | | | | | | | |
| | * | | | | | | | | | | Doc: Fixed doc bug in Diagram Scene exampleGeir Vattekar2010-12-091-1/+1
| | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15647
| | * | | | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-251-0/+8
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Doc: Fixed a snippet to show QML comments.David Boddie2010-11-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15584
| | * | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-243-6/+20
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-11-232-6/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-222-6/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Doc: Added general statements about reentrancy and thread safety.David Boddie2010-11-231-5/+15
| | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14273
* | | | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-202-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Update docs on importing javascript filesBea Lam2010-12-202-1/+5
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/plugins/phonon/mmf/mmf.pro src/s60installs/s60installs.pro tests/auto/qapplication/test/test.pro tests/auto/qgraphicsview/tst_qgraphicsview.cpp
generated by cgit v0.12 at 2024-10-27 11:28:56 (GMT)