summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵Michael Brasser2009-05-053-1/+18
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | 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.
* | | Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-05-051-1/+1
|\ \ \ | | |/ | |/| | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Remove XML custom parser supportAaron Kennedy2009-05-051-1/+1
| | |
* | | 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
| * | 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
| | * | 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.
* | | | Review of chapters 1 and 2 of tutorial.Ian Walters2009-05-016-118/+158
| |_|/ |/| |
* | | 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
| | * | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-04-2920-333/+144
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | docWarwick Allison2009-04-291-1/+5
| | | | |
| * | | | 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
| * | | 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
| | |\ \ \ | | | |/ /
| | | * | Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ↵Simon Hausmann2009-04-247-355/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 242472777d440a540b4bc944c84eb522388e384e ) Changes in WebKit since the last update: ++ b/ChangeLog 2009-04-24 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Ariya Hidayat. Added support for generating API docs in the Qt build using "make docs" * WebKit.pro: Include docs.pri for "make docs" target. ++ b/WebKit/qt/ChangeLog 2009-04-24 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by Ariya Hidayat. Added support for generating API docs in the Qt build using "make docs" Added code snippets and overview from the Qt sources references in the API docs. * Api/qwebpage.cpp: Adjust paths to snippets. * Api/qwebview.cpp: Ditto. * docs/docs.pri: Added. * docs/qtwebkit.qdoc: Added. * docs/qtwebkit.qdocconf: Added. * docs/webkitsnippets/qtwebkit_build_snippet.qdoc: Added. * docs/webkitsnippets/qtwebkit_qwebview_snippet.cpp: Added. * docs/webkitsnippets/simple/main.cpp: Added. * docs/webkitsnippets/simple/simple.pro: Added. * docs/webkitsnippets/webpage/main.cpp: Added. * docs/webkitsnippets/webpage/webpage.pro: Added. Moved QtWebKit documentation into the WebKit project under src/3rdparty/webkit This is needed to have "make docs" inside WebKit and allows contributors to the WebKit project to write API docs. I'm doing the change in 4.5 to simplify merging with Qt 4.6. Reviewed-by: Trust me
| | * | | Remove the Direct3D engine.Gunnar Sletta2009-04-241-11/+4
| | | | |
| | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-233-0/+52
| | |\ \ \ | | | |/ /
| | | * | Add Google Suggest as a new network exampleAriya Hidayat2009-04-233-0/+52
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| | * | | Merge branch '4.5'Thiago Macieira2009-04-234-1/+53
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp
| | | * | Added Google Chat client as a new WebKit exampleAriya Hidayat2009-04-233-0/+52
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| | | * | use qdoc3 debug version only when it is availableJoerg Bornemann2009-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default there is no debug version built of qdoc3. In this case we should call the release build. Reviewed-by: kh
| | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-234-0/+70
| | |\ \ \ | | | |/ /
| | | * | Mention the jQuery MIT license in the 3rdparty license file, used in the ↵Simon Hausmann2009-04-231-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fancybrowser example Reviewed-by: Kavindra