summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | * | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-2521-39/+12915
| | | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | | qdoc: Added default values to config file for DITAMartin Smith2011-03-256-16/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added the handling of these default values: dita.metadata.default.author = Qt Development Frameworks dita.metadata.default.permissions = all dita.metadata.default.publisher = Nokia dita.metadata.default.copyryear = 2011 dita.metadata.default.copyrholder = Nokia dita.metadata.default.audience = programmer
| | | * | | | | | | | | | Doc: Update to QStyledItemDelegate::displayText()Geir Vattekar2011-03-251-0/+5
| | | | |/ / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7567
| | * | | | | | | | | | Edited the Tutorials and Examples pages. Renamed links in index.qdoc.Jerome Pasion2011-03-254-75/+127
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a link to the eLearning materials and Creator manual. Reviewed-by: David Boddie
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-03-2521-37/+12906
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch '4.7' of ../qt-doc-review into 4.7David Boddie2011-03-240-0/+0
| | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7David Boddie2011-03-240-0/+0
| | | | |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/dynamicobjects.qdoc
| | | * | | | | | | | | | Avoided the use of hard-coded file names.David Boddie2011-03-241-34/+70
| | | | | | | | | | | | |
| | | * | | | | | | | | | Copied the declarative parser into qdoc3 to avoid dependency issues.David Boddie2011-03-2419-1/+12832
| | | | | | | | | | | | |
| | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-24623-310/+31934
| | | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | / / / / / / / / | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-243-33/+35
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | qdoc: Don't wrap <image> in <fig> if in an <xref>Martin Smith2011-03-241-2/+4
| | | | | | | | | | | | |
| | * | | | | | | | | | | Doc: Work on QAudioInput::start() functions.Geir Vattekar2011-03-251-4/+13
| | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7892 Reviewed-by: Jason McDonald
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-03-249-128/+169
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | qdoc: Added <copyright>, <copyryear>, and <copyrholder>.Martin Smith2011-03-241-3/+19
| | | | | | | | | | | |
| | | * | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-24932-2272/+46600
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | qdoc: Completed metadata handling.Martin Smith2011-03-249-127/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | But not the default values part in the config file.
| | * | | | | | | | | | | Doc: Work on a11y docsGeir Vattekar2011-03-243-33/+35
| | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8078
| | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-03-23925-2265/+46588
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Edited QtWebKit Guide qdoc and added external links.Jerome Pasion2011-03-235-752/+546
| | | | | | | | | | | | |
| | | * | | | | | | | | | Merge branch 'clone_4.7' into 4.7Jerome Pasion2011-03-23610-147/+31926
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-220-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Fixed external link in QtWebKit Guide.Jerome Pasion2011-03-221-2/+2
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | Added QtWebKit Guide JavaScript files.Jerome Pasion2011-03-2214-0/+897
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | Adding QtWebKit Guide example images and created links to images.Jerome Pasion2011-03-22178-27/+26
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | Fixed style issue and replaced image.Jerome Pasion2011-03-222-1/+1
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | Adding QtWebKit Guide CSS files.Jerome Pasion2011-03-2241-0/+4271
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | Changed QtWebKit Guide chapter names and fixed a link.Jerome Pasion2011-03-224-4/+4
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | Changing qt-webpages.qdoc to contain http links. Online version.Jerome Pasion2011-03-221-20/+20
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | Adopting changes from a merge with qt-doc-team repo, 4.7 branchJerome Pasion2011-03-223-3/+3
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | Changed inline code to snippet code.Jerome Pasion2011-03-222-4/+3
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | Edited QtWebKit Guide.Jerome Pasion2011-03-217-538/+1007
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | Removed compile instruction for the webkit-guide code.Jerome Pasion2011-03-181-1/+0
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | Merge remote branch 'remotes/qt-doc-team/4.7' into 4.7Jerome Pasion2011-03-1816-339/+410
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / | | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | | Edited Canvas and Storage chapters of QtWebKit guide.Jerome Pasion2011-03-186-749/+538
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | Edited QtWebKit Guide CSS chapter. Created example links.Jerome Pasion2011-03-1710-800/+851
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | | | * | | | | | | | | | | Added Qt WebKit module name into license headers.Jerome Pasion2011-03-165-5/+5
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | Fixed style issues with QtWebKit guide and examples.Jerome Pasion2011-03-154-128/+128
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | Adding QtWebKit Guide (BETA).Jerome Pasion2011-03-15105-1/+7647
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added images, new doc build configurations, and example code.
| | | | * | | | | | | | | | | Changed Creator qthelp URL from 2095 to 210.Jerome Pasion2011-03-141-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | | | * | | | | | | | | | | Resized images and changed their color mode to reduce file size.Jerome Pasion2011-03-102-0/+0
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | Whitespace fixes.Jerome Pasion2011-03-105-55/+55
| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-103-9/+45
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Imported demo documentation and their images.Jerome Pasion2011-03-1014-431/+228
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed user files
| | | | * | | | | | | | | | | | Removed generated UI file. Not needed in the demo.Jerome Pasion2011-03-101-181/+0
| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-101-1/+6
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Adding quickhit and guitartuner mobile demos.Jerome Pasion2011-03-09205-0/+12750
| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Removed 2 mobile demos. Their replacement will be added separately.Jerome Pasion2011-03-09209-13700/+0
| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-096-11/+36
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-076-30/+113
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \