summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-03-249-128/+169
| | |\
| | * | Doc: Work on a11y docsGeir Vattekar2011-03-243-33/+35
| * | | qdoc: Don't wrap <image> in <fig> if in an <xref>Martin Smith2011-03-241-2/+4
| | |/ | |/|
| * | 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
| |\ \ | | |/
| | * 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
| | | | * | | 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
| | | | * | | Changed Creator qthelp URL from 2095 to 210.Jerome Pasion2011-03-141-15/+15
| | | | * | | 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 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
| | | | |\ \ \ \ \ \
| | | | * | | | | | | Adding changes to mobile demos.Jerome Pasion2011-03-07213-2119/+2561
| | | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-072-6/+81
| | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | Added 4 mobile demos. Added links and descriptions for them.Jerome Pasion2011-03-03271-130/+19680
| | * | | | | | | | | | Doc: Small update to QImageReader/Writer::supportedImageFomrmats()Geir Vattekar2011-03-232-0/+6
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | qdoc: Completed metadata handling.Martin Smith2011-03-249-127/+152
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-03-22323-2125/+14874
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-22317-2117/+14864
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-03-225-11/+36
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fixed drawImage() not to attempt drawing null images on openvg.Laszlo Agocs2011-03-221-0/+4
| | | * | | | | | | | | QS60Style: Update placeholder texture to real oneSami Merila2011-03-224-11/+32