summaryrefslogtreecommitdiffstats
path: root/doc/src
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-01-2624-289/+295
| | |\ \ \ \ \
| | | * | | | | doc: Fixed a missing * in the docs for QML_DECLARE_TYPEThorbjørn Lindeijer2011-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's actually equivalant to Q_DECLARE_METATYPE(TYPE *). This explains why it works on classes that use Q_DISABLE_COPY. Reviewed-by: David Boddie <david.boddie@nokia.com>
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2011-01-2513-286/+286
| | | |\ \ \ \ \
| | | | * | | | | Doc: Fixing typoMorten Engvoldsen2011-01-251-1/+1
| | | | | | | | |
| | | | * | | | | Doc: fixing bugs and typos based on feedbackMorten Engvoldsen2011-01-2511-12/+12
| | | | | | | | |
| | | | * | | | | Doc: fixing bugs and misspelling based on feedbackMorten Engvoldsen2011-01-252-273/+273
| | | | | | | | |
| | | * | | | | | Doc: Fixed missing images in qt demoGeir Vattekar2011-01-2510-2/+8
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-14274
| | * | | | | | Doc: Fixed qdoc warnings about broken links.David Boddie2011-01-263-9/+8
| | | | | | | |
| | * | | | | | Doc: Added preprocessor coloring.David Boddie2011-01-262-2/+18
| | | | | | | |
| | * | | | | | Doc: Added a link from the plugin guide to the plugin deployment guide.David Boddie2011-01-261-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9501
| | * | | | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-263-33/+103
| | | | | | | |
| | * | | | | | Doc: Fixed errors in the address book tutorial.David Boddie2011-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16865
| | * | | | | | Doc: Fixed broken QML code snippets.David Boddie2011-01-251-8/+9
| | | | | | | |
| | * | | | | | Doc: Fixed a broken link.David Boddie2011-01-251-0/+5
| | | |_|/ / / | | |/| | | |
| | * | | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-246-18/+163
| | | | | | |
| | * | | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2011-01-211540-2083/+2575
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp src/declarative/util/qdeclarativeanimation.cpp
| | | * | | | | Doc: Fixed QML syntax.David Boddie2011-01-191-2/+4
| | | | | | | |
| | | * | | | | Doc: Fixed qdoc warnings caused by invalid/incomplete QML snippets.David Boddie2011-01-1711-210/+381
| | | |/ / / /
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-01-141-113/+156
| | | |\ \ \ \
| | | | * | | | Changed the QML Elements page groupings.Jerome Pasion2011-01-141-113/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071 Reviewed-by: David Boddie
| | | * | | | | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-131533-1737/+1854
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qdeclarativeintro.qdoc doc/src/declarative/qdeclarativereference.qdoc doc/src/snippets/declarative/focus/focusColumn.qml tools/qdoc3/apigenerator.cpp tools/qdoc3/apigenerator.h tools/qdoc3/archiveextractor.cpp tools/qdoc3/bookgenerator.cpp tools/qdoc3/bookgenerator.h tools/qdoc3/ccodeparser.cpp tools/qdoc3/command.cpp tools/qdoc3/command.h tools/qdoc3/cpptoqsconverter.cpp tools/qdoc3/dcfsection.cpp tools/qdoc3/dcfsection.h tools/qdoc3/jambiapiparser.cpp tools/qdoc3/jambiapiparser.h tools/qdoc3/javacodemarker.cpp tools/qdoc3/javacodemarker.h tools/qdoc3/javadocgenerator.cpp tools/qdoc3/javadocgenerator.h tools/qdoc3/linguistgenerator.cpp tools/qdoc3/linguistgenerator.h tools/qdoc3/loutgenerator.h tools/qdoc3/mangenerator.cpp tools/qdoc3/mangenerator.h tools/qdoc3/polyarchiveextractor.cpp tools/qdoc3/polyarchiveextractor.h tools/qdoc3/polyuncompressor.cpp tools/qdoc3/polyuncompressor.h tools/qdoc3/qsakernelparser.cpp tools/qdoc3/qscodemarker.cpp tools/qdoc3/qscodemarker.h tools/qdoc3/qscodeparser.cpp tools/qdoc3/qscodeparser.h tools/qdoc3/sgmlgenerator.cpp tools/qdoc3/sgmlgenerator.h tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/uncompressor.cpp tools/qdoc3/webxmlgenerator.cpp tools/qdoc3/webxmlgenerator.h
| | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-01-132-4/+14
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | * | | | | Doc: correcting merge errorMorten Engvoldsen2011-01-121-4/+9
| | | | | | | | |
| | | | * | | | | Adding a link to the coding style wiki page.Jerome Pasion2011-01-071-0/+5
| | | | | | | | |
| | | * | | | | | Doc: Added a missing snippet.David Boddie2011-01-131-0/+51
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16619
| | | * | | | | Doc: Sync with upstream.David Boddie2010-12-221-1/+1
| | | | | | | |
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-216-15/+9
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-212-29/+29
| | | | |\ \ \ \ \
| | | | * | | | | | Doc: Changed a page title.David Boddie2010-12-215-6/+6
| | | | | | | | | |
| | | | * | | | | | Doc: Updated the HarfBuzz license information.David Boddie2010-12-211-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As-requested-by: Legal
| | | * | | | | | | Doc: Fixed QML syntax in quoted code snippets.David Boddie2010-12-212-1/+62
| | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge branch 'qdoc-simplified' into 4.7David Boddie2010-12-212-29/+29
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-202-1/+5
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-202-1/+40
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-12-201-1/+1
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-171-1/+1
| | | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | | Added BSD license to snippet code.Jerome Pasion2010-12-201-0/+39
| | | | |/ / / / / / / /
| | * | | | | | | | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-213-92/+85
| | | | | | | | | | | |
| | * | | | | | | | | | Doc: Ensured that text in tables is not too large.David Boddie2011-01-201-1/+0
| | | | | | | | | | | |
| | * | | | | | | | | | Added a style for types in quoted code.David Boddie2011-01-202-0/+8
| | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | * | | | | | | | | Doc: Fixed whitespace.David Boddie2010-12-212-29/+29
| | |/ / / / / / / /
| | * | | | | | | | Updated the offline template to use a new offline style sheet.David Boddie2010-12-171-0/+662
| | | | | | | | | |
| | * | | | | | | | Doc: Fixed whitespace.David Boddie2010-12-171-61/+14
| | | | | | | | | |
| | * | | | | | | | Doc: Fixed broken links.David Boddie2010-12-173-12/+10
| | | | | | | | | |
| | * | | | | | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-171-30/+51
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-161-30/+51
| | | |\ \ \ \ \ \ \
| | * | | | | | | | | Whitespace fixes.David Boddie2010-12-171-553/+533
| | |/ / / / / / / /
| | * | | | | | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-1512-24/+389
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Doc: Used div elements for floats, updated the style sheet.David Boddie2010-12-145-10/+35
| | | | | | | | | | |
| | * | | | | | | | | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-1467-695/+2365
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/atom.h tools/qdoc3/qdoc3.pro