aboutsummaryrefslogtreecommitdiffstats
path: root/sources/shiboken2/ApiExtractor/doc
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-02-28 10:51:06 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-02-28 18:04:22 +0000
commit099f3f46ca9ec1362f211278df4b3e4949b0a339 (patch)
tree6580c38554168eabcaf2defb82d200bf4c841c1d /sources/shiboken2/ApiExtractor/doc
parentda7b579c1f0e40d5a895cc2b3a6cbf4ed88de890 (diff)
shiboken: Add allow-thread attribute to type system and class entries
In the typesystem parser, add the allow-thread attribute to root and complex type entry. Rewrite the handling of allow-thread (cached) in AbstractMetaFunction similar to the exception handling (store the modification in AbstractMetaFunction and go down the class hierarchy if it is unspecified). Change-Id: I00e6e2ab25208fda63ec20522814cbfccbb8c42d Fixes: PYSIDE-931 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/shiboken2/ApiExtractor/doc')
-rw-r--r--sources/shiboken2/ApiExtractor/doc/typesystem_specifying_types.rst19
1 files changed, 12 insertions, 7 deletions
diff --git a/sources/shiboken2/ApiExtractor/doc/typesystem_specifying_types.rst b/sources/shiboken2/ApiExtractor/doc/typesystem_specifying_types.rst
index c3180ae88..ce66f77fe 100644
--- a/sources/shiboken2/ApiExtractor/doc/typesystem_specifying_types.rst
+++ b/sources/shiboken2/ApiExtractor/doc/typesystem_specifying_types.rst
@@ -11,7 +11,7 @@ typesystem
.. code-block:: xml
- <typesystem package="..." default-superclass="..." exception-handling="...">
+ <typesystem package="..." default-superclass="..." allow-thread="..." exception-handling="...">
</typesystem>
The **package** attribute is a string describing the package to be used,
@@ -19,8 +19,9 @@ typesystem
The *optional* **default-superclass** attribute is the canonical C++ base class
name of all objects, e.g., "object".
- The *optional* **exception-handling** attribute specifies the default exception
- handling mode of all objects (see :ref:`modify-function`).
+ The *optional* attributes **allow-thread** and **exception-handling**
+ specify the default handling for the corresponding function modification
+ (see :ref:`modify-function`).
load-typesystem
^^^^^^^^^^^^^^^
@@ -219,6 +220,7 @@ value-type
<typesystem>
<value-type name="..." since="..."
copyable="yes | no"
+ allow-thread="..."
exception-handling="..."
hash-function="..."
stream="yes | no"
@@ -247,8 +249,9 @@ value-type
The **revision** attribute can be used to specify a revision for each type, easing the
production of ABI compatible bindings.
- The *optional* **exception-handling** attribute specifies the default exception
- handling mode of all functions (see :ref:`modify-function`).
+ The *optional* attributes **allow-thread** and **exception-handling**
+ specify the default handling for the corresponding function modification
+ (see :ref:`modify-function`).
.. _object-type:
@@ -265,6 +268,7 @@ object-type
<object-type name="..."
since="..."
copyable="yes | no"
+ allow-thread="..."
exception-handling="..."
hash-function="..."
stream="yes | no"
@@ -286,8 +290,9 @@ object-type
The **revision** attribute can be used to specify a revision for each type, easing the
production of ABI compatible bindings.
- The *optional* **exception-handling** attribute specifies the default exception
- handling mode of all functions (see :ref:`modify-function`).
+ The *optional* attributes **allow-thread** and **exception-handling**
+ specify the default handling for the corresponding function modification
+ (see :ref:`modify-function`).
interface-type
^^^^^^^^^^^^^^