summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Kosmale <fabian.kosmale@qt.io>2021-10-20 11:18:51 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-10-20 10:07:09 +0000
commit076f44e6e7ed3182a0c4083add6f7282e2862144 (patch)
tree28764c053f74de799f9bbfa38f90a7d620f9182c
parenta869fb560658dc42596841550dd3ead9ddb45d66 (diff)
downloadqtdoc-076f44e6e7ed3182a0c4083add6f7282e2862144.tar.gz
Mention QML type hints in signal/slot documentation
There is a short section about connecting to/from QML. It was a bit outdated, given that its now possible to use type hints to get a different type in the meta-object system for QML signals. This change updates the documentation, and adds a link to the more detailed QML documentation. Change-Id: I4ccf2fa67d458b77257f1b31598defb13ab1b362 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io> (cherry picked from commit 472bb66bc8646f6914eff1a10b413603ab4a1303) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--doc/src/signalslotsyntaxes.qdoc3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/src/signalslotsyntaxes.qdoc b/doc/src/signalslotsyntaxes.qdoc
index 1b88afae..f9927e53 100644
--- a/doc/src/signalslotsyntaxes.qdoc
+++ b/doc/src/signalslotsyntaxes.qdoc
@@ -144,7 +144,8 @@ Here is the code that makes the signal-slot connections:
\snippet snippets/signalsandslots/signalslotsyntaxes.cpp crosslanguage
\note All JavaScript functions in QML take parameters of \c var type, which maps
-to the QVariant type in C++.
+to the QVariant type in C++, unless they use type annotations. See
+\l{Invoking QML Methods} for further details.
When the QPushButton is clicked, the console prints,
\e{'QML received: "Hello from C++!"'}. Likewise, when the Rectangle is clicked,