summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2011-02-24 14:23:42 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2011-02-24 14:23:42 (GMT)
commitfcea2461489fd392975f8393d7dde8dc1bb6542d (patch)
tree0aa1733225e34dea2ade3ea21407f23c0ad8e12e /doc/src
parentba95c04e5f8bbaf2b68b99e58949ac31b1969b13 (diff)
parent4c2460cea7b477a0ebdca7350419650dfdd595b4 (diff)
downloadQt-fcea2461489fd392975f8393d7dde8dc1bb6542d.zip
Qt-fcea2461489fd392975f8393d7dde8dc1bb6542d.tar.gz
Qt-fcea2461489fd392975f8393d7dde8dc1bb6542d.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/scripting/scripting.qdoc6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/src/scripting/scripting.qdoc b/doc/src/scripting/scripting.qdoc
index 112af5c..f882da0 100644
--- a/doc/src/scripting/scripting.qdoc
+++ b/doc/src/scripting/scripting.qdoc
@@ -657,6 +657,12 @@
call to \c{connect()} in script code; \c{connect()} accepts both
native and non-native functions as targets.
+ As discussed in \l{Default Conversion from Qt Script to C++}, Qt
+ Script handles conversion for many C++ types. If your function takes
+ arguments for which Qt Script does not handle conversion, you need
+ to supply conversion functions. This is done using the
+ qScriptRegisterMetaType() function.
+
\section2 Making C++ Class Properties Available in QtScript
In the previous example, if we wanted to get or set a property using