summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |\ \ \ | | | |/ /
| | | * | 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
| | | * | Add fancy browser as the new exampleAriya Hidayat2009-04-233-0/+52
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-232-3/+3
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qfeatures.h src/gui/painting/qtransform.cpp util/scripts/make_qfeatures_dot_h
| | | * | Doc fixesJoão Abecasis2009-04-221-2/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Thiago
| | | * | Fix my previous commit since I missed the q out of qtestlibAndy Shaw2009-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 251848 Reviewed-by: TrustMe
| | | * | Fix the code snippet for executing a test, it should be CONFIG not QTAndy Shaw2009-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 251848 Reviewed-by: TrustMe
| * | | | API and documentation work on the transform elements.Michael Brasser2009-04-281-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Axis has been split into Axis, AxisRotation, and AxisTranslation. Basic docs (in some cases just a stub) have been added for these, Perspective, and Squish. Flipable has moved to its own file.
* | | | | docWarwick Allison2009-04-291-1/+5
|/ / / /
* | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-04-247-7/+9
|\ \ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Documentation fixes.Michael Brasser2009-04-246-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Reduce the number of warnings from qdoc. \todo's have been made into tasks instead.
| * | | | Expose basic BlendedImage docs.Michael Brasser2009-04-231-0/+2
| | | | |
* | | | | Documentation for Path, PathLine, etc.Martin Jones2009-04-246-0/+7
|/ / / /
* | | | qdoc: Edited the documentation to remove numerous qdoc warnings.Martin Smith2009-04-231-2/+2
| |_|/ |/| |
* | | Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-04-232-1/+2
|\ \ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Component and ComponentInstance documentation.Martin Jones2009-04-232-1/+2
| | | |
* | | | First draft chapter 1 of tutorial: complete.Ian Walters2009-04-235-56/+80
| | | |