diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-09 15:05:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-09 15:05:23 (GMT) |
| commit | 460d52bfa85318610576d1ab75eae4799865e064 (patch) | |
| tree | c78dbf227b372e3d4d1d6dfd236f3b9ef9385576 /doc | |
| parent | 91577a693d1bc3a123ee1f4c6e73b8a49be03aef (diff) | |
| parent | 694ef883b3ab40806bfe3356278c639942c8c69d (diff) | |
| download | Qt-460d52bfa85318610576d1ab75eae4799865e064.zip Qt-460d52bfa85318610576d1ab75eae4799865e064.tar.gz Qt-460d52bfa85318610576d1ab75eae4799865e064.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Remove whitespace and leading tab from documentation change
Updating merge request 2512
QGraphicsLayoutItem - fix invalidating sizehint-with-constraints cache
Fix integer overflow in bitfield
Fix documentation for QML extended types
Removes the reseting of the QMenu offset.
Adding warning to QMenu documentation
Fix filtering of columns in QSFPM.
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, |