summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets
Commit message (Collapse)AuthorAgeFilesLines
* Adding validator snippet.Jerome Pasion2011-02-071-0/+89
| | | | Task-number: QTBUG-16071
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-075-11/+64
|\ | | | | | | | | | | Conflicts: doc/src/declarative/propertybinding.qdoc src/declarative/util/qdeclarativeview.cpp
| * Doc: Fixed warnings and other problems found while fixing markup.David Boddie2011-02-072-2/+2
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-043-9/+62
| |\
| | * Move Qt.application docs into Qt global object pageBea Lam2011-02-021-7/+7
| | | | | | | | | | | | | | | | | | Previously it was documented as a separate 'Application' element Reviewed-by: Martin Jones
| | * Add initial size to ListView in FolderListModel exampleBea Lam2011-02-021-4/+8
| | | | | | | | | | | | Plus other minor doc changes
| | * Update Docs, Examples and Demos for new CreateObject overloadableChristopher Ham2011-01-281-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | Dynamic object in Docs explains QScriptValue argument. SameGame and Dynamic scene now make use of overloadable. Task-number: QTBUG-13087 Reviewed-by: Bea Lam
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-19988-997/+1005
| | |\
| | * | Introduce Qt.application.active propertyJoona Petrell2011-01-071-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces qmlviewer's runtime.activeWindow property. Task-number: QTBUG-13351 Reviewed-by: Martin Jones
* | | | Replaced old Qt logo with the new Qt logo.Jerome Pasion2011-02-041-0/+0
| | | | | | | | | | | | | | | | Reviewed-by: David Boddie
* | | | Re-wrote QML Animation documentation and cleaned snippet codeJerome Pasion2011-02-049-513/+227
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed unneeded snippets and added new snippet code. Task-number: QTBUG-16071 Reviewed-by: David Boddie
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-0413-300/+670
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/extending.qdoc doc/src/external-resources.qdoc src/declarative/util/qdeclarativeanimation.cpp src/declarative/util/qdeclarativetransition.cpp
| * | | Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Sergio Ahumada2011-01-281-1/+1
| | | | | | | | | | | | | | | | Task-number: QTBUG-13799
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-261-3/+11
| |\ \ \ | | | |/ | | |/|
| | * | Consistent DocsAlan Alpert2011-01-131-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | Example contradicted later docs. Fixed example. Task-number: QTBUG-16596
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-01-261-1/+1
| |\ \ \
| * | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-262-32/+102
| | | | |
| * | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-242-0/+142
| | | | |
| * | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2011-01-21993-1195/+1540
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp src/declarative/util/qdeclarativeanimation.cpp
| | * | | | Doc: Fixed qdoc warnings caused by invalid/incomplete QML snippets.David Boddie2011-01-176-194/+346
| | | | | |
| * | | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-212-71/+69
| | | | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-261-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing a merge conflict. Conflicts: doc/src/overviews.qdoc
| * | | | | Doc: fixing bugs and typos based on feedbackMorten Engvoldsen2011-01-251-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-01-17988-1001/+1094
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/elements.qdoc doc/src/declarative/extending.qdoc src/declarative/qml/qdeclarativecomponent.cpp
| * | | | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-13987-1001/+1043
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | Update copyright year to 2011.Jason McDonald2011-01-10988-994/+994
| | | |/ | | |/| | | | | | | | | Reviewed-by: Trust Me
| | * | Improve docs on attached properties on view delegates.Martin Jones2010-12-234-8/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify that the properties are attached to the root of the delegate, and must be accessed as such by child items. Task-number: QTBUG-16193 Reviewed-by: Bea Lam
| | * | Doc: Added a missing license header.David Boddie2010-12-211-0/+39
| | | |
| * | | Doc: Added a missing snippet.David Boddie2011-01-131-0/+51
| | | | | | | | | | | | | | | | Task-number: QTBUG-16619
* | | | Rewrote QML Property Binding document. Added snippet code.Jerome Pasion2011-01-132-0/+382
| | | | | | | | | | | | | | | | Task-number: QTBUG-16071
* | | | Added content and snippet code to Basic Elements overview page.Jerome Pasion2011-01-073-2/+6
|/ / / | | | | | | | | | Task-number: QTBUG-16071
* | | Doc: Sync with upstream.David Boddie2010-12-221-1/+1
| | |
* | | Doc: Fixed QML syntax in quoted code snippets.David Boddie2010-12-211-0/+61
| | |
* | | Added BSD license to snippet code.Jerome Pasion2010-12-201-0/+39
| |/ |/|
* | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-156-0/+276
|\ \ | |/
| * Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-136-0/+276
| |\
| | * Document support for QVariantList and QVariantMap type conversionBea Lam2010-12-063-0/+123
| | |
| | * Qt.include() docs weren't being picked up by qdocBea Lam2010-12-063-0/+153
| | | | | | | | | | | | | | | | | | | | | This moves the Qt.include() docs to qdeclarativeengine.cpp and also documents it in the "Integrating JavaScript" page. Task-number: QTBUG-15855
* | | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-1432-1/+1670
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: tools/qdoc3/atom.h tools/qdoc3/qdoc3.pro
| * | Fixed the QML Focus document. Fixed snippets, images, and formatting.Jerome Pasion2010-12-0611-0/+593
| | | | | | | | | | | | Reviewed-by: David Boddie
| * | Added QML coding convention for "private" properties.Jerome Pasion2010-12-061-0/+49
| | | | | | | | | | | | | | | | | | Private properties start with two underscores. __property Reviewed-by: David Boddie
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-0318-0/+943
| |\ \ | | |/
| | * Add 'Writing New Components' docs, and document the connect() function.Bea Lam2010-12-0318-0/+943
| | | | | | | | | | | | | | | | | | | | | | | | The 'Writing QML Components' is mainly a restructuring of the 'Extending types from QML' page. It also documents the signal connect() function that was previously undocumented. Task-number: QTBUG-15718, QTBUG-15138
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-302-1/+85
| |\ \ | | |/
| | * Document which header to include for qmlRegister functions.Martin Jones2010-11-301-1/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-15630 Reviewed-by: Bea Lam
| | * Add license to example codeBea Lam2010-11-291-0/+39
| | |
| | * Move KeyNavigation example to snippets, plus some doc rewordingBea Lam2010-11-291-0/+45
| | |
* | | Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-0759-221/+1701
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/platforms/compiler-notes.qdoc tools/qdoc3/ditaxmlgenerator.cpp tools/qdoc3/ditaxmlgenerator.h tools/qdoc3/htmlgenerator.cpp tools/qdoc3/htmlgenerator.h tools/qdoc3/node.cpp tools/qdoc3/pagegenerator.h
| * | Doc: Fixed a snippet to show QML comments.David Boddie2010-11-251-1/+0
| |/ | | | | | | Task-number: QTBUG-15584
| * Doc: Q_PROPERTY, implements the setter/getter in the exampleOlivier Goffart2010-11-222-5/+19
| | | | | | | | | | | | | | | | | | Some developer thought the implementation of the getters and setters needed to have some metaobject magic Also add a NOTIFY signal in the example Reviewed-by: Joao