Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Doc: Updating 3rdparty license doc | aavit | 2011-04-04 | 1 | -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.7 | Olivier Goffart | 2011-03-31 | 372 | -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.7 | David Boddie | 2011-03-22 | 20 | -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.7 | David Boddie | 2011-03-18 | 2 | -4/+4 |
| |\ \ | |||||
| | * | | Doc: Fixed reference to absolete API in exceptionsafety.html | Geir Vattekar | 2011-03-17 | 1 | -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.7 | Geir Vattekar | 2011-03-17 | 1 | -1/+1 |
| | |\ \ | |||||
| | * | | | Doc: Fixed doc bug in undo framework example | Geir Vattekar | 2011-03-17 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14580 | ||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-03-14 | 1 | -1/+1 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Doc: Fixed snippet documenting QMetaObject::classInfo | Thorbjørn Lindeijer | 2011-03-14 | 1 | -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.7 | David Boddie | 2011-03-08 | 4 | -4/+54 |
| |\ \ \ | | |/ / | |||||
| | * | | Doc: Fixed a doc bug in the Rogue example | Geir Vattekar | 2011-03-07 | 1 | -2/+2 |
| | | | | |||||
| | * | | Added Qt Quick License information. | Jerome Pasion | 2011-03-03 | 3 | -2/+52 |
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17879 Reviewed-by: David Boddie | ||||
| * | | | Doc: Fixed QML snippet highlighting by creating a complete code snippet. | David Boddie | 2011-03-03 | 2 | -4/+3 |
| |/ / | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-03-01 | 4 | -7/+9 |
| |\ \ | |||||
| | * | | Fixed broken link. | Jerome Pasion | 2011-03-01 | 2 | -3/+4 |
| | | | | | | | | | | | | | | | | Reviewed-by: David Boddie | ||||
| | * | | Fixed pointer to the example image. | Jerome Pasion | 2011-03-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Reviewed-by: David Boddie | ||||
| | * | | Edited sentences in QML Views documentation. | Jerome Pasion | 2011-03-01 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | Reviewed-by: David Boddie | ||||
| * | | | Doc: Improved the color contrast of text in tables. | David Boddie | 2011-03-01 | 1 | -2/+2 |
| | | | | |||||
| * | | | Doc: Fixed qdoc warnings. | David Boddie | 2011-03-01 | 11 | -66/+437 |
| | | | | |||||
| * | | | Doc: Converted the Internationalization with Qt document into a group. | David Boddie | 2011-03-01 | 4 | -4/+11 |
| |/ / | |||||
| * | | Doc: correcting error in table | Morten Engvoldsen | 2011-03-01 | 1 | -1/+0 |
| | | | |||||
| * | | Merge commit 'refs/merge-requests/1113' of git://gitorious.org/qt/qt into ↵ | David Boddie | 2011-02-28 | 3 | -791/+887 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | merge-requests/1113 Conflicts: doc/src/development/qmake-manual.qdoc | ||||
| | * | | qmake-manual.qdoc: Fixed qmake links | Nikos Giotis | 2011-02-28 | 1 | -849/+946 |
| | | | | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-02-24 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Geir Vattekar | 2011-02-24 | 7 | -316/+378 |
| | |\ \ \ | |||||
| | * | | | | Doc: Fixed snippet bug in QPen class docs | Geir Vattekar | 2011-02-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17556 | ||||
| * | | | | | Doc: Added a threading tutorial. | David Boddie | 2011-02-24 | 8 | -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.7 | David Boddie | 2011-02-24 | 1 | -0/+6 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Geir Vattekar | 2011-02-24 | 20 | -290/+411 |
| | |\ \ \ | |||||
| | * | | | | Doc: Added more info on calling C++ functions from Qt Script | Geir Vattekar | 2011-02-24 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14959 Reviewed-by: Kent Hansen | ||||
| * | | | | | Doc: Minor tidying up. | David Boddie | 2011-02-24 | 1 | -127/+126 |
| | | | | | | |||||
| * | | | | | Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into ↵ | David Boddie | 2011-02-23 | 7 | -226/+289 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-requests/1108 Conflicts: doc/src/declarative/basictypes.qdoc | ||||
| | * | | | | Fixed problematic lupdate & lrelease links in Qt-Linguist documentation. | Nikos Giotis | 2011-02-23 | 1 | -48/+55 |
| | | | | | | |||||
| * | | | | | Doc: Fixed classes for div elements. Removed extra characters. | David Boddie | 2011-02-23 | 1 | -7/+7 |
| | | | | | | |||||
| * | | | | | Doc: Fixed the notation for div elements. | David Boddie | 2011-02-23 | 1 | -25/+25 |
| | | | | | | |||||
| * | | | | | Merge branch 'mimir' into 4.7 | David Boddie | 2011-02-23 | 14 | -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 Smith | 2011-02-22 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | qdoc: Updated the qdoc manual and its config file. | Martin Smith | 2011-02-16 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | qdoc: Updated the qdoc manual. | Martin Smith | 2011-01-28 | 1 | -19/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added \span and \div marked "new" and marked \raw "avoid". | ||||
| | * | | | | | qdoc: Added the \span command. | Martin Smith | 2011-01-24 | 2 | -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 Smith | 2011-01-20 | 2 | -9/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8 instances of raw-html remain. | ||||
| | * | | | | | qdoc: Fixed some validation errors in the DITA files | Martin Smith | 2011-01-19 | 7 | -45/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 11 instances of raw-html remain. | ||||
| | * | | | | | qdoc: Added colorizing of individual table cells. | Martin Smith | 2011-01-14 | 1 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | qdoc: Added a parameter to \row | Martin Smith | 2011-01-13 | 2 | -67/+152 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | And removed some \raw cases. Only 11 raw-html uses remaining. | ||||
| | * | | | | | qdoc: Added the \caption command. | Martin Smith | 2011-01-13 | 1 | -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 Smith | 2011-01-07 | 1 | -3/+89 |
| | | | | | | | |||||
| | * | | | | | qdoc: Replaced many raw-html cases with \div {something}. | Martin Smith | 2011-01-05 | 1 | -53/+29 |
| | | | | | | | |||||
| | * | | | | | qdoc: Replaced many raw-html cases with \div {something}. | Martin Smith | 2011-01-04 | 2 | -66/+42 |
| | | | | | | | |||||
| | * | | | | | Merge branch '4.7' into mimir | David Boddie | 2010-12-15 | 12 | -24/+389 |
| | |\ \ \ \ \ | |||||
| * | \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-02-22 | 23 | -104/+327 |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | |