From 322fb5291f91ab389300ec5e28155bf881bcd518 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Mon, 8 Feb 2010 14:01:07 +0100 Subject: Document QtObject Task-number:QTBUG-6034 --- doc/src/declarative/elements.qdoc | 1 + doc/src/declarative/qmlviewer.qdoc | 2 +- src/declarative/qml/qmlengine.cpp | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index 81a6c96..cfbabf2 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -99,6 +99,7 @@ The following table lists the QML elements provided by the Qt Declarative module \o \l Connection \o \l Component \o \l Timer +\o \l QtObject \endlist \endtable diff --git a/doc/src/declarative/qmlviewer.qdoc b/doc/src/declarative/qmlviewer.qdoc index 6a107ce..a5cb671 100644 --- a/doc/src/declarative/qmlviewer.qdoc +++ b/doc/src/declarative/qmlviewer.qdoc @@ -84,7 +84,7 @@ To use this from within your QML file, import QmlViewer 1.0 and create a Screen object. This object has a property, orientation, which can be either - Screen.Lanscape or Screen.Portrait and which can be bound to in your + Screen.Landscape or Screen.Portrait and which can be bound to in your application. An example is below: \code diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index 5624da1..bb26d30 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -110,6 +110,25 @@ QT_BEGIN_NAMESPACE DEFINE_BOOL_CONFIG_OPTION(qmlImportTrace, QML_IMPORT_TRACE) QML_DEFINE_TYPE(Qt,4,6,QtObject,QObject) +/*! + \qmlclass QtObject QObject + \brief The QtObject element is the most basic element in QML + + The QtObject element is a non-visual element which contains only + the objectName property. It is useful for when you need an extremely + lightweight element to place your own custom properties in. + + It can also be useful for C++ integration, as it is just a plain QObject. See + the QObject documentation for further details. +*/ +/*! + \qmlproperty string QtObject::objectName + This property allows you to give a name to this specific object instance. + + See \l{scripting.html#accessing-child-qobjects}{Accessing Child QObjects} + in the scripting documentation for details how objectName can be used from + scripts. +*/ struct StaticQtMetaObject : public QObject { -- cgit v0.12