diff options
author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-02-15 12:58:14 (GMT) |
---|---|---|
committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-02-15 12:58:14 (GMT) |
commit | 448e5c7d787382d47efe786a5a85cce8bdcd61a4 (patch) | |
tree | 094feb2cbe1f949f45ed0f19c2d819c7166ded7d /doc/src/declarative | |
parent | 878a204b24a69f989b6fec96c7c3b232868be8d5 (diff) | |
download | Qt-448e5c7d787382d47efe786a5a85cce8bdcd61a4.zip Qt-448e5c7d787382d47efe786a5a85cce8bdcd61a4.tar.gz Qt-448e5c7d787382d47efe786a5a85cce8bdcd61a4.tar.bz2 |
Edited section titles and added links to relevant sections.
Task-number: QTBUG-16071
Diffstat (limited to 'doc/src/declarative')
-rw-r--r-- | doc/src/declarative/basictypes.qdoc | 7 | ||||
-rw-r--r-- | doc/src/declarative/qmlevents.qdoc | 9 |
2 files changed, 8 insertions, 8 deletions
diff --git a/doc/src/declarative/basictypes.qdoc b/doc/src/declarative/basictypes.qdoc index 1be648e..453af08 100644 --- a/doc/src/declarative/basictypes.qdoc +++ b/doc/src/declarative/basictypes.qdoc @@ -36,11 +36,10 @@ QML has a set of primitive types, as listed below, that are used throughout the \l {QML Elements}. - Some of these types can also be used for defining - \c property values in QML. See \l{Importing Reusable Components} for the - list of types that can be used for \c property values. - \annotatedlist qmlbasictypes + + To create additional types, such as data types created in C++, read the + \l{Extending QML Functionalities using C++} article. */ /*! diff --git a/doc/src/declarative/qmlevents.qdoc b/doc/src/declarative/qmlevents.qdoc index 7d5e962..7dfb1f9 100644 --- a/doc/src/declarative/qmlevents.qdoc +++ b/doc/src/declarative/qmlevents.qdoc @@ -29,13 +29,11 @@ \page qmlevents.html \ingroup qml-features \contentspage QML Features -\previouspage {Integrating QML Code with Existing Qt UI Code} -\nextpage {Dynamic Object Management in QML}{Dynamic Object Management} +\previouspage {Keyboard Focus in QML}{Keyboard Focus} +\nextpage Importing Reusable Components \title QML Signal and Handler Event System -\section1 Overview, structural information - QML utilizes Qt's \l{The Meta-Object System}{meta-object} and \l{Signals & Slots}{signals} systems. Signals and slots created using Qt in C++ are inheritely valid in QML. @@ -124,4 +122,7 @@ runtime automatically creates signal handlers for the C++ signals. For more signal control, the \c connect() method and the \l Connect element may connect a C++ to another signal or method. +For complete information on how to call C++ functions in QML, read the \l {Extending QML - Signal Support Example}. + + */ |