summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Updating 3rdparty license docaavit2011-04-041-41/+158
| | | | Corresponding to the updated zlib, libpng, and libjpeg in src/3rdparty.
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-31372-8563/+13496
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/example-slideswitch.qdoc doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.pro doc/src/snippets/code/doc_src_qtscript.qdoc src/corelib/animation/qabstractanimation.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qdir/qdir.pro tests/auto/qsslsocket/tst_qsslsocket.cpp tools/qdoc3/doc/qdoc-manual.qdocconf
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-2220-62/+614
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/declarative/dynamicobjects.qdoc doc/src/declarative/elements.qdoc doc/src/examples/qml-examples.qdoc
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-182-4/+4
| |\ \
| | * | Doc: Fixed reference to absolete API in exceptionsafety.htmlGeir Vattekar2011-03-171-2/+3
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14445 Reviewed-by: Jerome Pasion
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-03-171-1/+1
| | |\ \
| | * | | Doc: Fixed doc bug in undo framework exampleGeir Vattekar2011-03-171-2/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14580
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-141-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Doc: Fixed snippet documenting QMetaObject::classInfoThorbjørn Lindeijer2011-03-141-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | Can't use Q_OBJECT without inheriting from QObject. Reviewed-by: David Boddie
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-084-4/+54
| |\ \ \ | | |/ /
| | * | Doc: Fixed a doc bug in the Rogue exampleGeir Vattekar2011-03-071-2/+2
| | | |
| | * | Added Qt Quick License information.Jerome Pasion2011-03-033-2/+52
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17879 Reviewed-by: David Boddie
| * | | Doc: Fixed QML snippet highlighting by creating a complete code snippet.David Boddie2011-03-032-4/+3
| |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-014-7/+9
| |\ \
| | * | Fixed broken link.Jerome Pasion2011-03-012-3/+4
| | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | * | Fixed pointer to the example image.Jerome Pasion2011-03-011-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | * | Edited sentences in QML Views documentation.Jerome Pasion2011-03-011-3/+4
| | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| * | | Doc: Improved the color contrast of text in tables.David Boddie2011-03-011-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
| |/ /
| * | Doc: correcting error in tableMorten Engvoldsen2011-03-011-1/+0
| | |
| * | Merge commit 'refs/merge-requests/1113' of git://gitorious.org/qt/qt into ↵David Boddie2011-02-283-791/+887
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | merge-requests/1113 Conflicts: doc/src/development/qmake-manual.qdoc
| | * | qmake-manual.qdoc: Fixed qmake linksNikos Giotis2011-02-281-849/+946
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-02-241-1/+1
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-02-247-316/+378
| | |\ \ \
| | * | | | Doc: Fixed snippet bug in QPen class docsGeir Vattekar2011-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17556
| * | | | | Doc: Added a threading tutorial.David Boddie2011-02-248-8/+586
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Squashed commit containing changes to documentation during the development of a threading tutorial, written by Roland Wolf.
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-02-241-0/+6
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-02-2420-290/+411
| | |\ \ \
| | * | | | Doc: Added more info on calling C++ functions from Qt ScriptGeir Vattekar2011-02-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14959 Reviewed-by: Kent Hansen
| * | | | | Doc: Minor tidying up.David Boddie2011-02-241-127/+126
| | | | | |
| * | | | | Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into ↵David Boddie2011-02-237-226/+289
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-requests/1108 Conflicts: doc/src/declarative/basictypes.qdoc
| | * | | | Fixed problematic lupdate & lrelease links in Qt-Linguist documentation.Nikos Giotis2011-02-231-48/+55
| | | | | |
| * | | | | Doc: Fixed classes for div elements. Removed extra characters.David Boddie2011-02-231-7/+7
| | | | | |
| * | | | | Doc: Fixed the notation for div elements.David Boddie2011-02-231-25/+25
| | | | | |
| * | | | | Merge branch 'mimir' into 4.7David Boddie2011-02-2314-255/+370
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qdeclarativemodels.qdoc doc/src/index.qdoc doc/src/template/style/style.css tools/qdoc3/atom.h tools/qdoc3/doc.cpp tools/qdoc3/doc/qdoc-manual.qdoc tools/qdoc3/doc/qdoc-manual.qdocconf
| | * | | | | qdoc: More updating command descriptions.Martin Smith2011-02-221-1/+1
| | | | | | |
| | * | | | | qdoc: Updated the qdoc manual and its config file.Martin Smith2011-02-161-1/+1
| | | | | | |
| | * | | | | qdoc: Updated the qdoc manual.Martin Smith2011-01-281-19/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added \span and \div marked "new" and marked \raw "avoid".
| | * | | | | qdoc: Added the \span command.Martin Smith2011-01-242-42/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | e.g. \span {id="color-red"} {Color this text only}, not this text.
| | * | | | | qdoc: Removed some uses of \raw an d \endraw.Martin Smith2011-01-202-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 8 instances of raw-html remain.
| | * | | | | qdoc: Fixed some validation errors in the DITA filesMartin Smith2011-01-197-45/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 11 instances of raw-html remain.
| | * | | | | qdoc: Added colorizing of individual table cells.Martin Smith2011-01-141-2/+2
| | | | | | |
| | * | | | | qdoc: Added a parameter to \rowMartin Smith2011-01-132-67/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | And removed some \raw cases. Only 11 raw-html uses remaining.
| | * | | | | qdoc: Added the \caption command.Martin Smith2011-01-131-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And removed some \raw cases. Only 13 raw-html uses remaining. Added the figCaption clause to style.css.
| | * | | | | qdoc: Replaced many raw-html cases with \div {something}.Martin Smith2011-01-071-3/+89
| | | | | | |
| | * | | | | qdoc: Replaced many raw-html cases with \div {something}.Martin Smith2011-01-051-53/+29
| | | | | | |
| | * | | | | qdoc: Replaced many raw-html cases with \div {something}.Martin Smith2011-01-042-66/+42
| | | | | | |
| | * | | | | Merge branch '4.7' into mimirDavid Boddie2010-12-1512-24/+389
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-02-2223-104/+327
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |