diff options
| author | Renato Filho <renato.filho@openbossa.org> | 2010-07-15 18:33:41 -0300 |
|---|---|---|
| committer | Renato Filho <renato.filho@openbossa.org> | 2010-07-23 11:09:48 -0300 |
| commit | f7afa613cf4b4a7a587d29855465e1db577fcd06 (patch) | |
| tree | c0919bb603253e2e4123dd940b8230208d369650 | |
| parent | e5042dc193bbcb4b1566594d832076adfef5fd94 (diff) | |
Update modules to work without protect hack.
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
Luciano Wolf <luciano.wolf@openbossa.org>
| -rw-r--r-- | PySide/QtCore/typesystem_core.xml | 3 | ||||
| -rw-r--r-- | PySide/QtOpenGL/typesystem_opengl.xml | 1 | ||||
| -rw-r--r-- | PySide/typesystem_templates.xml | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml index 133ece38c..8f3014366 100644 --- a/PySide/QtCore/typesystem_core.xml +++ b/PySide/QtCore/typesystem_core.xml @@ -1222,6 +1222,9 @@ </extra-includes> </object-type> <value-type name="QUrl" hash-function="PySide::hash"> + <modify-documentation xpath='description/para[3]'> + <para>URLs can be represented in two forms: encoded or unencoded. The unencoded representation is suitable for showing to users, but the encoded representation is typically what you would send to a web server. For example, the unencoded URL "http://bühler.example.com" would be sent to the server as "http://xn--bhler-kva.example.com/List%20of%20applicants.xml".</para> + </modify-documentation> <extra-includes> <include file-name="QStringList" location="global"/> </extra-includes> diff --git a/PySide/QtOpenGL/typesystem_opengl.xml b/PySide/QtOpenGL/typesystem_opengl.xml index 202b11595..e1402f70b 100644 --- a/PySide/QtOpenGL/typesystem_opengl.xml +++ b/PySide/QtOpenGL/typesystem_opengl.xml @@ -4,6 +4,7 @@ <rejection class="QGLColormap::QGLColormapData"/> <rejection class="QGLWidget" function-name="setMouseTracking"/> + <rejection class="QGLContext" field-name="currentCtx"/> <enum-type name="QGL::FormatOption" flags="QGL::FormatOptions" force-integer="yes"/> <enum-type name="QGLContext::BindOption" flags="QGLContext::BindOptions"/> diff --git a/PySide/typesystem_templates.xml b/PySide/typesystem_templates.xml index 40e23458a..1de06a1d6 100644 --- a/PySide/typesystem_templates.xml +++ b/PySide/typesystem_templates.xml @@ -154,7 +154,7 @@ </template> <template name="return_tuple_QValidator_QString_int"> - %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2); + %RETURN_TYPE retval_ = %RETURN_TYPE(%CPPSELF.%FUNCTION_NAME(%1, %2)); %PYARG_0 = Shiboken::makeTuple(retval_, %1, %2); </template> |