aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/doc/src/cppintegration/topic.qdoc
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2012-07-18 14:39:20 +1000
committerQt by Nokia <qt-info@nokia.com>2012-07-20 03:46:56 +0200
commit6742d20581a7b05461b2c1662b39fcc68e84b4e2 (patch)
treed5f6a65d3cc8f2fd29ac14497430fcee17f02bcf /src/qml/doc/src/cppintegration/topic.qdoc
parentb8c80243abc4f96e31243bf04dc29318fae61864 (diff)
Make title capitalization more consistent in QML documentation.
Change-Id: Iec8168135676e0e9e130bd2245ef33fd780829d5 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src/qml/doc/src/cppintegration/topic.qdoc')
-rw-r--r--src/qml/doc/src/cppintegration/topic.qdoc18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/qml/doc/src/cppintegration/topic.qdoc b/src/qml/doc/src/cppintegration/topic.qdoc
index 1fd0cd7df4..3b88c50099 100644
--- a/src/qml/doc/src/cppintegration/topic.qdoc
+++ b/src/qml/doc/src/cppintegration/topic.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
\page qtqml-cppintegration-topic.html
-\title Integrating QML And C++
+\title Integrating QML and C++
\brief Description of how to integrate QML and C++ code
QML was designed to allow tight integration with C++ code. This allows hybrid
@@ -62,13 +62,13 @@ QML code
\endlist
-\section1 Exposing C++ Types To QML
+\section1 Exposing C++ Types to QML
QML types may be implemented in C++ and then exposed to the QML type system via
plugins or type registration. This is covered in more detail elsewhere in the
documentation; see the documentation regarding
\l{qtqml-cppintegration-registercpptypes.html}
-{Registering C++ Types With The QML Type System} for more information on that
+{Registering C++ Types with the QML Type System} for more information on that
topic.
For more information on the specifics of how to define C++ types for use in QML
@@ -76,23 +76,23 @@ For more information on the specifics of how to define C++ types for use in QML
about defining \l{qtqml-modules-cppplugins.html#creating-a-plugin}
{C++ types for use in QML}.
-\section1 Exposing C++ Data To QML
+\section1 Exposing C++ Data to QML
Data from C++ may be exposed to QML via context properties, instance
properties, or by returning data from Q_INVOKABLE methods. For more
information about each of these approaches, and the ownership semantics
applicable to each, see the documentation on \l{qtqml-cppintegration-data.html}
-{Exposing C++ Data To QML}.
+{Exposing C++ Data to QML}.
-\section1 Exposing C++ Functions To QML
+\section1 Exposing C++ Functions to QML
Functions from C++ may be exposed to QML via signals and slots, by tagging a
function declaration with the Q_INVOKABLE macro, or by registering the C++ type
as a module API and installing that module API into a particular namespace.
For more information about these approaches, see the documentation on
-\l{qtqml-cppintegration-functions.html}{Exposing C++ Functionality To QML}.
+\l{qtqml-cppintegration-functions.html}{Exposing C++ Functionality to QML}.
-\section1 Interacting With Objects Defined In QML From C++
+\section1 Interacting with Objects Defined in QML from C++
Most properties of an object defined in QML may be accessed via
QQmlProperty::read() or QObject::property(). If the property is a list
@@ -104,6 +104,6 @@ handlers.
For more information about accessing QML objects from C++, see the
documentation on \l{qtqml-cppintegration-reverse.html}
-{Interacting With Objects Defined In QML From C++}.
+{Interacting with Objects Defined in QML from C++}.
*/