summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * qdoc: Added <publisher> and <permissions> elements.Martin Smith2011-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
|\ \ | |/
| * qdoc: Added <component> element to contain the module name.Martin Smith2011-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 git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-096-11/+18
| |\
| | * Doc: Fixed a doc bug in the Rogue exampleGeir Vattekar2011-03-071-2/+2
| | * Doc: Small change to QByteArray::resize()Geir Vattekar2011-03-071-1/+1
| | * Doc: Small change to ListModel docsGeir Vattekar2011-03-071-1/+1
| | * Doc: QtDemo now gives error message when example doc cannot be loadedGeir Vattekar2011-03-071-2/+4
| * | qdoc: Added <prodinfo> element and its contents to the metadata.Martin Smith2011-03-092-5/+28
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-076-30/+113
|\ \ \ | | |/ | |/|
| * | Doc: Small correction to QMap iterator docsGeir Vattekar2011-03-071-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-03-077-11/+214
| |\ \ | | |/
| | * qdoc: Added Author> and <category> elements to the metadata.Martin Smith2011-03-074-25/+103
| * | Doc: Work on QTranslator::load()Geir Vattekar2011-03-071-4/+9
* | | 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
|\ \ \ | | |/ | |/|
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-045-2/+59
| |\ \
| * | | qdoc: Added enum values and tag names for <prolog> and <metadata>Martin Smith2011-03-042-6/+81
* | | | Added 4 mobile demos. Added links and descriptions for them.Jerome Pasion2011-03-03271-130/+19680
| |/ / |/| |
* | | Added Qt Quick License information.Jerome Pasion2011-03-033-2/+52
| |/ |/|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-03-0223-82/+461
|\ \ | |/
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Martin Smith2011-03-0223-84/+465
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-015-10/+13
| | |\
| | | * Fixed broken link.Jerome Pasion2011-03-012-3/+4
| | | * Fixed pointer to the example image.Jerome Pasion2011-03-011-1/+1
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-03-014-1599/+1744
| | | |\
| | | * | Edited sentences in QML Views documentation.Jerome Pasion2011-03-011-3/+4
| | * | | Doc: Improved the color contrast of text in tables.David Boddie2011-03-011-2/+2
| | * | | Doc: Fixed qdoc warnings.David Boddie2011-03-012-2/+2
| | * | | Doc: Fixed qdoc warnings.David Boddie2011-03-0111-66/+437
| | * | | Doc: Converted the Internationalization with Qt document into a group.David Boddie2011-03-014-4/+11
| * | | | qdoc: Removed debug code.Martin Smith2011-03-021-1/+0
| |/ / /
* | | | Doc: Fixed memory leak in undo framework exampleGeir Vattekar2011-03-022-0/+7
| |_|/ |/| |
* | | Doc: Work on QInputContext::reset() docsGeir Vattekar2011-03-011-3/+4
|/ /
* | Merge branch 'mimir' into 4.7Martin Smith2011-03-013-1596/+1740
|\ \ | |/ |/|
| * qdoc: Added more descriptions for QML commands.Martin Smith2011-03-012-139/+157
| * qdoc: Added more descriptions for QML commands.Martin Smith2011-03-011-239/+284
| * qdoc: Added more descriptions for QML commands.Martin Smith2011-02-281-132/+126
| * qdoc: Added more descriptions for QML commands.Martin Smith2011-02-281-8/+69