jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed typestyste to windows.

Browse source 
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
          Hugo Parente Lima <hugo.pl@gmail.com>
This commit is contained in:
Renato Filho 2010-08-20 14:43:18 -03:00
commit 35a5bad950
3 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
PySide/QtCore/typesystem_core.xml
View file

@ -128,13 +128,10 @@
<primitive-type name="signed long" default-constructor="0"/> <primitive-type name="signed long" default-constructor="0"/>
<primitive-type name="long"/> <primitive-type name="long"/>
<primitive-type name="unsigned long" default-constructor="0"/> <primitive-type name="unsigned long" default-constructor="0"/>
<primitive-type name="WId">
<!-- FIXME This is a workaround to include some headers needed by some includes (nothing to do with QBool) -->
<include file-name="signalmanager.h" location="global"/>
</primitive-type>
<primitive-type name="Qt::HANDLE" target-lang-api-name="PyLong"> <primitive-type name="Qt::HANDLE" target-lang-api-name="PyLong">
<!-- FIXME APIExtractor or shiboken do not support multiple includes by primitive type --> <!-- FIXME APIExtractor or shiboken do not support multiple includes by primitive type -->
<include file-name="QTextDocument" location="global"/> <include file-name="signalmanager.h" location="global"/>
<include file-name="QTextDocument" location="global"/>
</primitive-type> </primitive-type>
<primitive-type name="QBool" target-lang-api-name="PyBool"> <primitive-type name="QBool" target-lang-api-name="PyBool">
<conversion-rule file="qbool_conversions.h"/> <conversion-rule file="qbool_conversions.h"/>

2
PySide/QtGui/typesystem_gui_win.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<typesystem package="PySide.QtGui"> <typesystem package="PySide.QtGui">
<primitive-type name="Qt::HANDLE" target-lang-api-name="PyObject"/> <primitive-type name="Qt::HANDLE" target-lang-api-name="PyObject"/>
<enum-type name="QPixmap::HBitmapFormat" />
<load-typesystem name="typesystem_gui_common.xml" generate="yes"/> <load-typesystem name="typesystem_gui_common.xml" generate="yes"/>
</typesystem> </typesystem>

2
PySide/global.h.in
View file

@ -345,7 +345,7 @@ QT_END_HEADER
#define QT_NO_DEBUG #define QT_NO_DEBUG
#include <QtCore/QtCore> #include <QtCore/QtCore>
#if @ENABLE_MAC@ #if @ENABLE_MAC@ || @ENABLE_WIN@
#undef qdoc #undef qdoc
#endif #endif
#include <QtGui/QtGui> #include <QtGui/QtGui>