diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-12-13 09:31:15 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-12-13 09:31:15 (GMT) |
| commit | 0279565c3c5400b3d6edf33d18eb53e38497514f (patch) | |
| tree | e973f1bab7cb4b207567ff0c1454073d35dd72c8 /doc | |
| parent | 97954165ddeb8a57d8b6349c00fa50019450213b (diff) | |
| parent | 01c0eb33506cf319c089b77e709f4af0b68d8430 (diff) | |
| download | Qt-0279565c3c5400b3d6edf33d18eb53e38497514f.zip Qt-0279565c3c5400b3d6edf33d18eb53e38497514f.tar.gz Qt-0279565c3c5400b3d6edf33d18eb53e38497514f.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/declarative/extending.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/examples/diagramscene.qdoc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc index fc5c586..e23ca91 100644 --- a/doc/src/declarative/extending.qdoc +++ b/doc/src/declarative/extending.qdoc @@ -596,10 +596,10 @@ the appropriate property on the extension object is used instead. When an extended type is installed, one of the \code template<typename T, typename ExtendedT> -int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const char *qmlName) +int qmlRegisterExtendedType(const char *uri, int versionMajor, int versionMinor, const char *qmlName) template<typename T, typename ExtendedT> -int qmlRegisterType() +int qmlRegisterExtendedType() \endcode functions should be used instead of the regular \c qmlRegisterType() variations. The arguments are identical to the corresponding non-extension registration functions, diff --git a/doc/src/examples/diagramscene.qdoc b/doc/src/examples/diagramscene.qdoc index 98bc983..d5cc4e3 100644 --- a/doc/src/examples/diagramscene.qdoc +++ b/doc/src/examples/diagramscene.qdoc @@ -195,7 +195,7 @@ This function returns a QWidget containing a QToolButton with an image of one of the \c DiagramItems, i.e., flowchart shapes. The image is created by the \c DiagramItem through the \c image() - function. The QButtonGroup class lets us attach a QVariant with + function. The QButtonGroup class lets us attach an id (int) with each button; we store the diagram's type, i.e., the DiagramItem::DiagramType enum. We use the stored diagram type when we create new diagram items for the scene. The widgets created |