diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-12-09 23:00:17 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-12-09 23:00:17 (GMT) |
| commit | a18714105029a54b4a3814d8e2e5ac2d45c233e9 (patch) | |
| tree | ca4955ea1b56c1d9c3cf8ed0805c66405cd384b3 /doc | |
| parent | 3b20e58b9494549713b492e35af6531b4bc179c9 (diff) | |
| parent | 460d52bfa85318610576d1ab75eae4799865e064 (diff) | |
| download | Qt-a18714105029a54b4a3814d8e2e5ac2d45c233e9.zip Qt-a18714105029a54b4a3814d8e2e5ac2d45c233e9.tar.gz Qt-a18714105029a54b4a3814d8e2e5ac2d45c233e9.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/declarative/extending.qdoc | 4 |
1 files changed, 2 insertions, 2 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, |