summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-04-071-0/+206
|\ | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm tests/auto/qdiriterator/tst_qdiriterator.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-041-0/+206
| |\ | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix failing autotest XmlListModel should allow types other than application/xml Document using Behaviors with States.
| | * Document using Behaviors with States.Michael Brasser2011-04-041-0/+206
| | | | | | | | | | | | | | | | | | Change-Id: I74f163cef8caa16cccb158061ec30ffb4e471fd1 Task-number: QTBUG-16856 Reviewed-by: Bea Lam
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-3137-2212/+1935
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-229-42/+294
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-082-2/+12
| |\ \ \
| | * | | Added Qt Quick License information.Jerome Pasion2011-03-032-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17879 Reviewed-by: David Boddie
| * | | | Doc: Fixed QML snippet highlighting by creating a complete code snippet.David Boddie2011-03-031-4/+1
| |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-013-6/+8
| |\ \ \
| | * | | Fixed broken link.Jerome Pasion2011-03-012-3/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | * | | Edited sentences in QML Views documentation.Jerome Pasion2011-03-011-3/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| * | | | Doc: Fixed qdoc warnings.David Boddie2011-03-012-57/+45
| |/ / /
| * | | Merge commit 'refs/merge-requests/1113' of git://gitorious.org/qt/qt into ↵David Boddie2011-02-281-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-requests/1113 Conflicts: doc/src/development/qmake-manual.qdoc
| * \ \ \ Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into ↵David Boddie2011-02-232-164/+208
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge-requests/1108 Conflicts: doc/src/declarative/basictypes.qdoc
| * \ \ \ \ Merge branch 'mimir' into 4.7David Boddie2011-02-233-9/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Removed some uses of \raw an d \endraw.Martin Smith2011-01-201-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 8 instances of raw-html remain.
| | * | | | | qdoc: Fixed some validation errors in the DITA filesMartin Smith2011-01-192-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 11 instances of raw-html remain.
| | * | | | | Merge branch '4.7' into mimirDavid Boddie2010-12-155-23/+112
| | |\ \ \ \ \
| * | | | | | | Removed GestureArea link from the elements page.Jerome Pasion2011-02-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional merge conflicts fix. Reviewed-by: David Boddie
| * | | | | | | Doc: Fixed links and whitespace.David Boddie2011-02-1717-53/+51
| | | | | | | |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/jpasions-qt-doc-team-qtquick ↵David Boddie2011-02-1729-1766/+819
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-36/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| | * | | | | | | Wrote an overview for the WebKit QML module.Jerome Pasion2011-02-171-11/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| | * | | | | | | Removed section names and added a link to Qt Quick page.Jerome Pasion2011-02-1712-105/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| | * | | | | | | Added a qdoc keywordJerome Pasion2011-02-161-1/+1
| | | | | | | | |
| | * | | | | | | Removed links to unfinished documentation.Jerome Pasion2011-02-161-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| | * | | | | | | Re-wrote QML Views overview page. Created new snippets and images.Jerome Pasion2011-02-161-48/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| | * | | | | | | Added new snippet code.Jerome Pasion2011-02-161-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| | * | | | | | | Resized image and took out extra lines.Jerome Pasion2011-02-161-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| | * | | | | | | Re-wrote Qt Quick intro. Deleted unused snippets and images.Jerome Pasion2011-02-153-632/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| | * | | | | | | Edited section titles and added links to relevant sections.Jerome Pasion2011-02-152-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| | * | | | | | | Shuffled navigation and modified next/previous links.Jerome Pasion2011-02-158-41/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| | * | | | | | | Removed unused snippet code. Changed reference to snippet.Jerome Pasion2011-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-151-59/+10
| | |\ \ \ \ \ \ \
| | * | | | | | | | Noted that QML uses JavaScript based regexpJerome Pasion2011-02-101-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| | * | | | | | | | Re-wrote QML Reusable Components documentationJerome Pasion2011-02-102-11/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| | * | | | | | | | Added keyword to the QML property binding documentation.Jerome Pasion2011-02-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| | * | | | | | | | Rewrote "Importing Reusable Components" documentation.Jerome Pasion2011-02-081-17/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added snippet code, and replaced the text. Task-number: QTBUG-16071
| | * | | | | | | | Changed snippet code and edited event overviewJerome Pasion2011-02-081-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| | * | | | | | | | Fixed merge conflict in Copyright date.Jerome Pasion2011-02-071-4/+0
| | | | | | | | | |
| | * | | | | | | | Rewrote Qt Quick documentation.Jerome Pasion2011-02-0714-649/+335
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task number: QTBUG-16071
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2011-02-0710-43/+223
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/propertybinding.qdoc src/declarative/util/qdeclarativeview.cpp
| | * | | | | | | | | Re-wrote QML Animation documentation and cleaned snippet codeJerome Pasion2011-02-041-236/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-62/+86
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-262-3/+3
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing a merge conflict. Conflicts: doc/src/overviews.qdoc
| * | \ \ \ \ \ \ \ \ \ \ Merge branch 'jpasions-qt-doc-team-qtquick-4.7' into 4.7David Boddie2011-02-1728-947/+1673
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-54/+65
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1740-223/+294
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-131-254/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| | * | | | | | | | | | | | Added content and snippet code to Basic Elements overview page.Jerome Pasion2011-01-071-6/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
generated by cgit v0.12 at 2025-02-04 00:42:51 (GMT)