aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/doc/src/cppintegration
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2012-08-02 13:06:09 +1000
committerQt by Nokia <qt-info@nokia.com>2012-08-03 09:47:47 +0200
commit21f6b4d381c31bb9cdca5c28c15add250abdd5ab (patch)
tree253ef4d9d8ffae1615000e044d3f27da82147d5c /src/qml/doc/src/cppintegration
parent877e6c8093db2e479d9c6317479b72ae38eabdde (diff)
Fix various broken links in documentation
Change-Id: I9e2dac37d18e3ca62e4a92be25e5c2e60ffeba00 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Diffstat (limited to 'src/qml/doc/src/cppintegration')
-rw-r--r--src/qml/doc/src/cppintegration/data.qdoc4
-rw-r--r--src/qml/doc/src/cppintegration/definetypes.qdoc4
-rw-r--r--src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc12
3 files changed, 10 insertions, 10 deletions
diff --git a/src/qml/doc/src/cppintegration/data.qdoc b/src/qml/doc/src/cppintegration/data.qdoc
index bdfb6fa235..39168bfa49 100644
--- a/src/qml/doc/src/cppintegration/data.qdoc
+++ b/src/qml/doc/src/cppintegration/data.qdoc
@@ -346,8 +346,8 @@ within the same class, or that the enumeration value is one of those declared
in the \l {Qt}{Qt Namespace}.
Additionally, if a C++ signal with an enum parameter should be connectable to a
-QML function using the \l{QML Signal and Handler Event System#Connecting Signals
-to Methods and Signals}{connect()} function, the enum type must be registered
+QML function using the \l{qtqml-syntax-signals.html#connecting-signals-to-methods-and-signals}
+{connect()} function, the enum type must be registered
using qRegisterMetaType().
For QML signals, enum values may be passed as signal parameters using the \c int
diff --git a/src/qml/doc/src/cppintegration/definetypes.qdoc b/src/qml/doc/src/cppintegration/definetypes.qdoc
index 140ab6a197..969261a972 100644
--- a/src/qml/doc/src/cppintegration/definetypes.qdoc
+++ b/src/qml/doc/src/cppintegration/definetypes.qdoc
@@ -395,7 +395,7 @@ board context, they could be implemented as \e attached attributes on a
terms of the concepts described earlier, the parties involved here are:
\list
-\li An instance of an anonymous \l{attached object type}, which provides a
+\li An instance of an anonymous \e{attached object type}, which provides a
\c published signal and an expired property. This type is implemented by
\c MessageBoardAttachedType below
\li A \c Message object, which will be the \e attachee
@@ -614,7 +614,7 @@ MessageBoard {
\endqml
(Incidentally, the \l Item::children property is its default property, which
-enables visual children to be conveniently declared for any \l Item-based
+enables visual children to be conveniently declared for any \l {Item}-based
type without explicitly assigning them to this property.)
A default property is optional. A derived class inherits its base class's
diff --git a/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc b/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc
index 51e92b2857..a7cc977cbd 100644
--- a/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc
+++ b/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc
@@ -87,8 +87,8 @@ compile-time safety. In this case the base object of \c MyItem.qml is an
\snippet qml/qtbinding/loading/main.cpp cast
You can also connect to any signals or call methods defined in the component
-using QMetaObject::invokeMethod() and QObject::connect(). See \l {Exchanging
-data between QML and C++} below for further details.
+using QMetaObject::invokeMethod() and QObject::connect(). See \l {Invoking QML Methods}
+and \l {Connecting to QML Signals} below for further details.
\section1 Accessing Loaded QML Objects by Object Name
@@ -159,7 +159,7 @@ System}{meta-object system} and the QML engine is not made aware of the
property change. This means property bindings to \c buttonText would not be
updated, and any \c onButtonTextChanged handlers would not be called.
-\section2 Methods
+\section2 Invoking QML Methods
All QML methods are exposed to the meta-object system and can be called from C++
using QMetaObject::invokeMethod(). Method parameters and return values passed
@@ -179,12 +179,12 @@ must be specified as QVariant types, as this is the generic data type used for
QML method parameters and return values.
-\section2 Signals And Slots
+\section2 Connecting to QML Signals
All QML signals are automatically available to C++, and can be connected to
using QObject::connect() like any ordinary Qt C++ signal. In return, any C++
signal can be received by a QML object using
-\l {Signal Handlers}{signal handlers}.
+\l {qtqml-syntax-signals.html}{signal handlers}.
Here is a QML component with a signal named \c qmlSignal that is emitted with
a string-type parameter. This signal is connected to a C++ object's slot using
@@ -256,4 +256,4 @@ QVariant type:
\endcode
\endtable
-*/ \ No newline at end of file
+*/