summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Documentation.Martin Jones2009-05-067-126/+136
|
* GridView docs.Martin Jones2009-05-066-21/+85
|
* Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-059-662/+399
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * DocAaron Kennedy2009-05-053-546/+243
| |
| * Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-05-058-108/+170
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-05-051-1/+1
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-05-0541-343/+742
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: doc/src/tutorials/declarative.qdoc
| * | | | Review of chapters 1 and 2 of tutorial.Ian Walters2009-05-016-118/+158
| | | | |
* | | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-059-109/+171
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-053-1/+18
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Remove XML custom parser supportAaron Kennedy2009-05-051-1/+1
| | | |/ | | |/|
| * | | More doc conversion and cleanup.Michael Brasser2009-05-056-102/+164
| | | |
| * | | Improve QML documentation viewing in Assistant.Michael Brasser2009-05-052-6/+6
| | | | | | | | | | | | | | | | | | | | The element pages now load correctly. A separate QML 'book' is also generated, which will be targeted at non-C++ programmers.
* | | | Move the bulk of Content/ContentWrapper documentation to ContentWrapper.Martin Jones2009-05-051-1/+4
| | | |
* | | | Content/ContentWrapper documentation.Martin Jones2009-05-053-11/+14
| |/ / |/| |
* | | Add not-yet-working Content example.Martin Jones2009-05-052-0/+17
|/ /
* | qdoc: Corrected some qdoc warnings.Martin Smith2009-05-041-1/+1
| |
* | qdoc: Corrected some qdoc warnings.Martin Smith2009-05-041-4/+4
| |
* | Rename QFxView::setXml to QFxView::setQml.Michael Brasser2009-05-011-4/+4
| |
* | Doc work.Michael Brasser2009-05-013-25/+39
| |
* | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-014-0/+51
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-012-0/+27
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | More format changesMartin Jones2009-05-012-0/+39
| | | |
| * | | More format conversion.Martin Jones2009-05-012-0/+12
| | | |
* | | | Doc work.Michael Brasser2009-05-019-137/+342
| |/ / |/| |
* | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-015-0/+77
|\ \ \ | |/ / | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | PathView format conversion.Martin Jones2009-05-015-0/+77
| | |
* | | Format conversion for animation, states and transitions, and transformMichael Brasser2009-05-012-0/+27
|/ / | | | | | | elements.
* | Merge branch 'kinetic-declarativeui' of ↵Martin Smith2009-04-305-171/+49
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Documentation work.Michael Brasser2009-04-305-171/+49
| | |
* | | qdoc: Corrected some qdoc warnings.Martin Smith2009-04-301-1/+1
|/ /
* | Rename duiviewer to qmlviewer.Michael Brasser2009-04-305-17/+15
| |
* | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-04-308-158/+461
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-04-3022-492/+478
| |\ \ | | |/ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-04-302-2/+6
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton2.qml examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton3.qml examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton4.qml examples/declarative/tutorials/contacts/1_Drawing_and_Animation/RemoveButton5.qml examples/declarative/tutorials/contacts/2_Reuse/ContactField1.qml examples/declarative/tutorials/contacts/2_Reuse/ContactField2.qml examples/declarative/tutorials/contacts/2_Reuse/ContactField3.qml examples/declarative/tutorials/contacts/2_Reuse/ContactField4.qml examples/declarative/tutorials/contacts/2_Reuse/FieldText3.qml examples/declarative/tutorials/contacts/2_Reuse/FieldText4.qml examples/declarative/tutorials/contacts/2_Reuse/RemoveButton1.qml examples/declarative/tutorials/contacts/2_Reuse/RemoveButton2.qml examples/declarative/tutorials/contacts/2_Reuse/RemoveButton3.qml examples/declarative/tutorials/contacts/2_Reuse/RemoveButton4.qml examples/declarative/tutorials/contacts/3_Collections/Button.qml examples/declarative/tutorials/contacts/3_Collections/ContactField.qml examples/declarative/tutorials/contacts/3_Collections/FieldText.qml examples/declarative/tutorials/contacts/3_Collections/RemoveButton.qml
| | | * Merge branch 'kinetic-declarativeui' of ↵Martin Smith2009-04-2920-334/+149
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | qdoc: Corrected some qdoc warnings.Martin Smith2009-04-291-1/+1
| | | | |
| | * | | documentation snippets, some qmlconv cleanupIan Walters2009-04-291-150/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added snippet comments for qdoc, also qmlconv leaves some errors. ',' where they are not supposed to be, ] and indenting in the wrong places, lack of " around enum values.
| | * | | Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-04-2919-333/+144
| | |\ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | Changing over to new qml format, add snippetsIan Walters2009-04-291-154/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Structure hasn't changed, just used qmlconv and started adding snippet tags
| | * | | | Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-04-2814-9/+18
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | Minor changesIan Walters2009-04-281-1/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A reformat, a couple of extra examples of loading types, and a start on the contents of chapter 3.
| | * | | | Further tutorial work. Draft of second chapter.Ian Walters2009-04-241-2/+254
| | | | | |
| * | | | | Documentation for ListViewMartin Jones2009-04-306-0/+132
| | |/ / / | |/| | | | | | | | | | | | | Convert to new format, use \snippet.
* | | | | More work on transform elements.Michael Brasser2009-04-301-0/+0
| |_|_|/ |/| | | | | | | | | | | | | | | AxisRotation/AxisTranslation have been renamed Rotation3D/Translation3D. Squish has gained a raster implementation and basic docs.
* | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-04-2920-333/+144
|\ \ \ \ | | |_|/ | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-04-2819-333/+144
| |\ \ \ | | |/ / | |/| | | | | | kinetic-declarativeui
| | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-271-5/+4
| | |\ \
| | | * | Increment Qt version number in qdoc namespaces.Jason McDonald2009-04-271-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we saw with the 4.5.1 release, failing to increment the namespaces when incrementing the Qt version causes some featuresof Assistant to break. Reviewed-by: Trust Me
| | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-247-355/+0
| | |\ \ \ | | | |/ /