summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-066-6/+6
|\ | | | | | | 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-05-061-1/+1
| |\ | | | | | | | | | kinetic-declarativeui
| | * Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-061-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac_p.h src/gui/widgets/qmainwindow.cpp
| | | * Fixed typo in README fileNils Christian Roscher-Nielsen2009-05-061-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: David Boddie <dboddie@trolltech.com>
| * | | Quote align center enum appropriatelyIan Walters2009-05-065-5/+5
| | | |
* | | | white background no good in web page, go grayWarwick Allison2009-05-063-3/+3
|/ / /
* | | Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-05-068-332/+30
|\ \ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-064-326/+0
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Remove contacts example. We have much nicer examples of the same thing.Martin Jones2009-05-064-326/+0
| | | | |
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-054-6/+30
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / kinetic-declarativeui
| | * | Merge commit 'origin/4.5'Bjoern Erik Nilsen2009-04-294-6/+30
| | |\ \ | | | |/
| | | * Corrected bugs in the flow layout exampleMorten Engvoldsen2009-04-294-6/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected bugs in the example and added markers for snippets in the documentation. Task-number: 250616 Rev-by: Geir Vattekar
| | | * fixed minor issue with the piechart demoPierre Rossi2009-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rubberband was not set on the viewport, leading to an offset when adding margins. Task-number: 251892 Reviewed-by: Alexis
* | | | Images for third chapter of the tutorialIan Walters2009-05-061-3/+3
| | | |
* | | | Put more items in the contact table.Ian Walters2009-05-066-0/+1365
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Need a few names for scrolling to be demonstrated. Also still only a few hundred K, so 1000 items not that big a deal.
* | | | Use new syntax for properties and signals.Ian Walters2009-05-069-77/+37
| | | |
* | | | Use new syntax for properties and signals.Ian Walters2009-05-0611-117/+44
|/ / /
* | | Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-05-0512-8/+8
|\ \ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Remove XML custom parser supportAaron Kennedy2009-05-055-5/+5
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-05-054-177/+68
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Minehunt switched to KDE smiley facesAlan Alpert2009-05-057-3/+3
| | | | | | | | | | | | | | | | | | | | Minehunt example now meets minimum aesthetic requirements.
* | | | | Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-05-0558-1224/+1517
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: doc/src/tutorials/declarative.qdoc
| * | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-0522-154/+86
| |\ \ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | qdoc: Corrected some qdoc warnings.Martin Smith2009-05-041-0/+2
| | |/ / /
| | * | | Use QML signal syntaxAaron Kennedy2009-05-011-3/+1
| | | | |
| | * | | Use QML properties syntaxAaron Kennedy2009-05-0115-75/+41
| | | | |
| | * | | Rename QFxView::setXml to QFxView::setQml.Michael Brasser2009-05-012-5/+5
| | | | |
| | * | | Doc work.Michael Brasser2009-05-017-71/+37
| | | | |
| * | | | Join some lines in examples.Martin Jones2009-05-053-177/+66
| |/ / /
| * | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-016-0/+118
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-012-132/+36
| | |\ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | More examples.Warwick Allison2009-05-012-0/+50
| | | | | |
| | * | | | Show how to achieve aspect-ratio-maintaining effects.Warwick Allison2009-05-014-0/+68
| | | | | |
| * | | | | Remove unnecessary escaping from dataAaron Kennedy2009-05-011-62/+63
| | |/ / / | |/| | |
| * | | | Join some lines in example code.Martin Jones2009-04-302-132/+36
| |/ / /
| * | | port syntaxWarwick Allison2009-04-301-21/+40
| | | |
| * | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-04-3023-225/+261
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: examples/declarative/follow/pong.qml examples/declarative/listview/dummydata/MyPetsModel.qml
| | * \ \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-04-302-19/+97
| | |\ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * \ \ Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-04-30101-1432/+4172
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | | | Documentation for ListViewMartin Jones2009-04-302-19/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert to new format, use \snippet.
| | * | | | | Namespaces not needed in new syntax.Warwick Allison2009-04-3013-87/+0
| | | | | | |
| | * | | | | Port syntaxWarwick Allison2009-04-301-12/+29
| | | | | | |
| | * | | | | Port syntaxWarwick Allison2009-04-301-52/+128
| | | | | | |
| | * | | | | Change syntaxWarwick Allison2009-04-305-95/+112
| | | | | | |
| | * | | | | fixWarwick Allison2009-04-301-1/+1
| | | |/ / / | | |/| | |
| * | | | | Convert all examples and demos from XML formatAaron Kennedy2009-04-3011-668/+1062
| |/ / / /
* | | | | Review of chapters 1 and 2 of tutorial.Ian Walters2009-05-014-29/+154
|/ / / /
* | | | Merge branch 'kinetic-declarativeui' of ↵Ian Walters2009-04-3042-88/+88
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'source' into kinetic-declarativeuiYann Bodson2009-04-2936-72/+72
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/mediabrowser/content/PhonesPathView.qml demos/declarative/mediabrowser/mediabrowser.qml
| | * | | | Rename the 'src' attribute 'source'. Don't need to be HTML-like anymore.Yann Bodson2009-04-2936-72/+72
| | | | | |