diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-03-03 17:28:30 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-03 17:39:17 +0100 |
| commit | e525b727f29adad1df3a6a81d6bba7c4617f78ba (patch) | |
| tree | b9bb46acffaaeae06e72de9dd7a5737c986a4190 /src/qml/doc/src/cppintegration | |
| parent | 5a06bc73822576cb9ffceb243f43f6b28fd6b4dc (diff) | |
Fix some typos
Change-Id: Iea540b768232ea423ea7f04e41655198931cf36d
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/qml/doc/src/cppintegration')
| -rw-r--r-- | src/qml/doc/src/cppintegration/definetypes.qdoc | 2 | ||||
| -rw-r--r-- | src/qml/doc/src/cppintegration/exposecppattributes.qdoc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/doc/src/cppintegration/definetypes.qdoc b/src/qml/doc/src/cppintegration/definetypes.qdoc index 187e4fc7b4..ac1a303ab0 100644 --- a/src/qml/doc/src/cppintegration/definetypes.qdoc +++ b/src/qml/doc/src/cppintegration/definetypes.qdoc @@ -167,7 +167,7 @@ shared across all contexts in an engine. QObject singleton type instances are constructed and owned by the QQmlEngine, and will be destroyed when the engine is destroyed. -A QObject singleton type can be interacted with in a manner simlar to any +A QObject singleton type can be interacted with in a manner similar to any other QObject or instantiated type, except that only one (engine constructed and owned) instance will exist, and it must be referenced by type name rather than id. Q_PROPERTYs of QObject singleton types may be bound to, and Q_INVOKABLE diff --git a/src/qml/doc/src/cppintegration/exposecppattributes.qdoc b/src/qml/doc/src/cppintegration/exposecppattributes.qdoc index 5d70cb5174..86715e93f1 100644 --- a/src/qml/doc/src/cppintegration/exposecppattributes.qdoc +++ b/src/qml/doc/src/cppintegration/exposecppattributes.qdoc @@ -65,7 +65,7 @@ demonstrated in the \l{Writing QML Extensions with C++} tutorial. \section1 Data Type Handling and Ownership Any data that is transferred from C++ to QML, whether as a property value, a -method paramter or return value, or a signal parameter value, must be of a +method parameter or return value, or a signal parameter value, must be of a type that is supported by the QML engine. By default, the engine supports a number of Qt C++ types and can automatically |