From 2d4e6ff9dd1e0e3410c4dc002c25d80fecfeafd2 Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Thu, 9 Feb 2012 17:31:02 +0100 Subject: Doc: Overhaul of doc/src/declarative and QtQuick2 docs. -Consolidated model/view documentation into one. -Added a new navigation for all overviews (grouped the pages) -New front page that shows the grouping -Separated the Qt C++ from the main QML overviews -Consolidated Qt C++ into the "declarative runtime" section -New articles about JavaScript, the engine, and plugins -Fixed the older examples. New snippet comments -Renamed some of the articles -kept the qtquick2 qmlmodule -"Qt Quick Elements" Moved contents of doc/src/declarative into respective module dirs. -Qt Quick 2, LocalStorage, Particles, and QML are now separate. -Removed unused or duplicate documentation. -edited C++ examples -removed navigation and "\inqmlmodule QtQuick 2" for those pages that are not in Qt Quick 2 -fixed doc/src/ licenses to header.FDL from qtbase Change-Id: Ib36f9c07565d91160fa8d04f9670c438f684b82a Reviewed-by: Sergio Ahumada --- .../referenceexamples/grouped/example.qml | 30 ++++++++++++---------- 1 file changed, 17 insertions(+), 13 deletions(-) (limited to 'examples/declarative/cppextensions/referenceexamples/grouped/example.qml') diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/example.qml b/examples/declarative/cppextensions/referenceexamples/grouped/example.qml index 21e368abc4..9ae80f222e 100644 --- a/examples/declarative/cppextensions/referenceexamples/grouped/example.qml +++ b/examples/declarative/cppextensions/referenceexamples/grouped/example.qml @@ -44,30 +44,34 @@ import People 1.0 BirthdayParty { host: Boy { name: "Bob Jones" - shoe { size: 12; color: "white"; brand: "Nike"; price: 90.0 } + shoe { size: 12; color: "white"; brand: "Bikey"; price: 90.0 } } - Boy { - name: "Leo Hodges" - shoe { size: 10; color: "black"; brand: "Reebok"; price: 59.95 } + Boy { + name: "Leo Hodges" +//![grouped] + shoe { size: 10; color: "black"; brand: "Thebok"; price: 59.95 } +//![grouped] } // ![1] - Boy { - name: "Jack Smith" - shoe { + Boy { + name: "Jack Smith" + shoe { size: 8 color: "blue" - brand: "Puma" - price: 19.95 + brand: "Luma" + price: 19.95 } } // ![1] - Girl { - name: "Anne Brown" + Girl { + name: "Anne Brown" +//![ungrouped] shoe.size: 7 shoe.color: "red" - shoe.brand: "Marc Jacobs" - shoe.price: 699.99 + shoe.brand: "Job Macobs" + shoe.price: 699.99 +//![ungrouped] } } // ![0] -- cgit v1.2.1