summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Fixed links and whitespace.David Boddie2011-02-173-15/+14
|
* Doc: Added a missing snippet.David Boddie2011-02-171-0/+53
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/jpasions-qt-doc-team-qtquick ↵David Boddie2011-02-1735-1446/+811
|\ | | | | | | | | | | | | | | | | | | into 4.7 Conflicts: doc/src/declarative/extending.qdoc doc/src/external-resources.qdoc doc/src/overviews.qdoc src/declarative/util/qdeclarativeview.cpp
| * Adding snippet code to coding article.Jerome Pasion2011-02-171-0/+75
| | | | | | | | Task-number: QTBUG-16071
| * Re-wrote QML Views overview page. Created new snippets and images.Jerome Pasion2011-02-163-13/+260
| | | | | | | | Task-number: QTBUG-16071
| * Added new snippet code.Jerome Pasion2011-02-161-4/+51
| | | | | | | | Task-number: QTBUG-16071
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-161-1/+1
| |\
| * | Re-wrote Qt Quick intro. Deleted unused snippets and images.Jerome Pasion2011-02-1517-1159/+0
| | | | | | | | | | | | Task-number: QTBUG-16071
| * | Removed unused snippet code. Changed reference to snippet.Jerome Pasion2011-02-154-168/+0
| | | | | | | | | | | | Task-number: QTBUG-16071
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-15154-2955/+4956
| |\ \
| * | | Re-wrote QML Reusable Components documentationJerome Pasion2011-02-105-10/+121
| | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| * | | Rewrote "Importing Reusable Components" documentation.Jerome Pasion2011-02-084-0/+207
| | | | | | | | | | | | | | | | | | | | | | | | Added snippet code, and replaced the text. Task-number: QTBUG-16071
| * | | Changed snippet code and edited event overviewJerome Pasion2011-02-081-0/+141
| | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| * | | Changed states.qml snippet codeJerome Pasion2011-02-081-12/+73
| | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| * | | 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
| * | | | 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
| * \ \ \ \ 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
* | \ \ \ \ \ Merge branch 'jpasions-qt-doc-team-qtquick-4.7' into 4.7David Boddie2011-02-175-2/+388
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/propertybinding.qdoc doc/src/overviews.qdoc src/declarative/util/qdeclarativeanimation.cpp src/declarative/util/qdeclarativeview.cpp
| * \ \ \ \ \ \ Merge branch '4.7' into jpasions-qt-doc-team-qtquick-4.7David Boddie2011-01-2510-265/+557
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/extending.qdoc doc/src/external-resources.qdoc src/declarative/util/qdeclarativeanimation.cpp src/declarative/util/qdeclarativetransition.cpp
| * | | | | | | 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
| * | | | | | | | 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: Fixed broken snippets.David Boddie2011-02-174-0/+322
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Doc: Fixed a example deployment script.David Boddie2011-02-151-1/+1
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6467
* | | | | | | Doc: Snippet quoting and other documentation fixes.David Boddie2011-02-096-82/+217
| | | | | | |
* | | | | | | Doc: Ensured that code snippets have appropriate file names.David Boddie2011-02-08149-2873/+4739
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | This helps them to be marked up correctly in cases where code markers are available.
* | | | | | 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
* | | | | | | 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: fixing bugs and typos based on feedbackMorten Engvoldsen2011-01-251-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
| |/ / / /
| * | | | 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