summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Filho <renato.filho@openbossa.org>2010-08-25 17:07:53 -0300
committerRenato Filho <renato.filho@openbossa.org>2010-08-25 17:32:05 -0300
commitdf834e5bb1bc29f8b7b82b828a5824be7266965c (patch)
tree4fe9e2b176e666a1f2e6bfdc934092e663c54884
parent42d98f91c49774227b89373e44f0f6de20605c52 (diff)
downloadshiboken-df834e5bb1bc29f8b7b82b828a5824be7266965c.tar.gz
shiboken-df834e5bb1bc29f8b7b82b828a5824be7266965c.tar.xz
shiboken-df834e5bb1bc29f8b7b82b828a5824be7266965c.zip
Updated Declarative typesystem.
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org> Hugo Parente Lima <hugo.pl@gmail.com>
-rw-r--r--PySide/QtDeclarative/CMakeLists.txt1
-rw-r--r--PySide/QtDeclarative/typesystem_declarative.xml11
2 files changed, 11 insertions, 1 deletions
diff --git a/PySide/QtDeclarative/CMakeLists.txt b/PySide/QtDeclarative/CMakeLists.txt
index fc381038..940f4d1d 100644
--- a/PySide/QtDeclarative/CMakeLists.txt
+++ b/PySide/QtDeclarative/CMakeLists.txt
@@ -6,6 +6,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qdeclarativecontext_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qdeclarativeengine_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qdeclarativeerror_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qdeclarativeexpression_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qdeclarativeextensioninterface_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qdeclarativeextensionplugin_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qdeclarativeimageprovider_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qdeclarativeitem_wrapper.cpp
diff --git a/PySide/QtDeclarative/typesystem_declarative.xml b/PySide/QtDeclarative/typesystem_declarative.xml
index 30786e27..7a80e486 100644
--- a/PySide/QtDeclarative/typesystem_declarative.xml
+++ b/PySide/QtDeclarative/typesystem_declarative.xml
@@ -4,6 +4,8 @@
<load-typesystem name="typesystem_network.xml" generate="no"/>
<load-typesystem name="typesystem_gui.xml" generate="no"/>
+
+ <object-type name="QDeclarativeExtensionInterface"/>
<object-type name="QDeclarativeComponent" />
<enum-type name="QDeclarativeComponent::Status" />
<object-type name="QDeclarativeContext" />
@@ -18,12 +20,19 @@
<value-type name="QDeclarativeError" />
<object-type name="QDeclarativeExpression" />
<object-type name="QDeclarativeExtensionPlugin" />
+ <enum-type name="QDeclarativeImageProvider::ImageType" />
<object-type name="QDeclarativeImageProvider" />
<object-type name="QDeclarativeItem" />
<enum-type name="QDeclarativeItem::TransformOrigin" />
<value-type name="QDeclarativeListReference" />
- <object-type name="QDeclarativeNetworkAccessManagerFactory" />
+ <object-type name="QDeclarativeNetworkAccessManagerFactory" >
+ <modify-function signature="create(QObject *)">
+ <modify-argument index="return">
+ <define-ownership class="target" owner="c++"/>
+ </modify-argument>
+ </modify-function>
+ </object-type>
<object-type name="QDeclarativeParserStatus" />
<value-type name="QDeclarativeProperty" />