diff options
author | Jerome Pasion <jerome.pasion@nokia.com> | 2012-02-09 17:31:02 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-14 12:53:21 +0100 |
commit | 2d4e6ff9dd1e0e3410c4dc002c25d80fecfeafd2 (patch) | |
tree | b12aec803acf837024b4426526f1ce69cb3080ae /examples/declarative/cppextensions/referenceexamples/coercion | |
parent | d95178153a0f15991b2e6e91216dbcf5c0be2af3 (diff) | |
download | qtdeclarative-2d4e6ff9dd1e0e3410c4dc002c25d80fecfeafd2.tar.gz |
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 <sergio.ahumada@nokia.com>
Diffstat (limited to 'examples/declarative/cppextensions/referenceexamples/coercion')
-rw-r--r-- | examples/declarative/cppextensions/referenceexamples/coercion/main.cpp | 7 | ||||
-rw-r--r-- | examples/declarative/cppextensions/referenceexamples/coercion/person.h | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/main.cpp b/examples/declarative/cppextensions/referenceexamples/coercion/main.cpp index e0eabae4b4..95b309de4c 100644 --- a/examples/declarative/cppextensions/referenceexamples/coercion/main.cpp +++ b/examples/declarative/cppextensions/referenceexamples/coercion/main.cpp @@ -49,11 +49,14 @@ int main(int argc, char ** argv) QCoreApplication app(argc, argv); qmlRegisterType<BirthdayParty>("People", 1,0, "BirthdayParty"); -// ![0] + //![0] qmlRegisterType<Person>(); -// ![0] + //![0] + + //![register boy girl] qmlRegisterType<Boy>("People", 1,0, "Boy"); qmlRegisterType<Girl>("People", 1,0, "Girl"); + //![register boy girl] QDeclarativeEngine engine; QDeclarativeComponent component(&engine, QUrl("qrc:example.qml")); diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/person.h b/examples/declarative/cppextensions/referenceexamples/coercion/person.h index 65faaf1521..dc4ae43dd6 100644 --- a/examples/declarative/cppextensions/referenceexamples/coercion/person.h +++ b/examples/declarative/cppextensions/referenceexamples/coercion/person.h @@ -69,13 +69,14 @@ public: Boy(QObject * parent = 0); }; - +//! [girl class] class Girl : public Person { Q_OBJECT public: Girl(QObject * parent = 0); }; +//! [girl class] // ![0] |