aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@digia.com>2013-03-25 12:37:22 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-26 22:45:31 +0100
commit363385a549f33b2b0a34ac9cc8149376f456655c (patch)
treeff7da1b3cbae0f42666a3cc30d26e32781f6dbbd /src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc
parentaaa8fd67a499b75f8ec3dc4eea2b53bbdeff11d2 (diff)
Doc: Fixed some uses of terminolgies in qdoc files.
-"element" -> "type" or "object" (not in all cases where this change applies) -some instances of QtQuick. It should be "Qt Quick". -only in qdoc files. Examples and source code changes will be done later. Task-number: QTBUG-30180 Change-Id: Ie587461a138e97606f761ad1e90909c91b479303 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc')
-rw-r--r--src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc b/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc
index 04b278106f..15d98ec405 100644
--- a/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc
+++ b/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc
@@ -143,7 +143,7 @@ or QObject::setProperty() and QObject::property():
You should always use QObject::setProperty(), QQmlProperty or
QMetaProperty::write() to change a QML property value, to ensure the QML
engine is made aware of the property change. For example, say you have a
-custom element \c PushButton with a \c buttonText property that internally
+custom type \c PushButton with a \c buttonText property that internally
reflects the value of a \c m_buttonText member variable. Modifying the member
variable directly like this is not a good idea: