diff options
author | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2022-03-10 12:19:59 +0100 |
---|---|---|
committer | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2022-03-10 12:19:59 +0100 |
commit | e798058823d6b3b813807151b91ee7d4c9417c3e (patch) | |
tree | a77487803177ea40775343e87b1ede3e521f0194 /src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc | |
parent | 56993597c05545922bbb2ef7aed49e7e34ac06b9 (diff) | |
parent | 473663128eaaf1c92ada255ac6ef1101c8bda790 (diff) |
Merge remote-tracking branch 'origin/dev' into iosstyle
Change-Id: If094d48e544c4ea14c1e4c21d99322b71b580dde
Diffstat (limited to 'src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc')
-rw-r--r-- | src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc b/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc index ad0d2243ec..fd29e733e0 100644 --- a/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc +++ b/src/qml/doc/src/cppintegration/interactqmlfromcpp.qdoc @@ -271,9 +271,9 @@ Notice the parameter and return type specified after the colon. You can use \l {QML Value Types}{value types} and \l {QML Object Types}{object types} as type names. -If the type is omitted in QML, then you must specify QVariant as type with -Q_RETURN_ARG() and Q_ARG() when calling QMetaObject::invokeMethod. - +If the type is omitted or specified as \c var in QML, then you must pass +QVariant as type with Q_RETURN_ARG() and Q_ARG() when calling +QMetaObject::invokeMethod. \section2 Connecting to QML Signals |