diff options
| -rw-r--r-- | PySide/QtCore/typesystem_core.xml | 1 | ||||
| -rw-r--r-- | PySide/QtGui/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | PySide/QtGui/typesystem_gui_win.xml | 6 | ||||
| -rw-r--r-- | libpyside/qproperty.h | 2 |
4 files changed, 12 insertions, 1 deletions
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml index 571cc913d..c377c7fd2 100644 --- a/PySide/QtCore/typesystem_core.xml +++ b/PySide/QtCore/typesystem_core.xml @@ -36,6 +36,7 @@ <rejection class="QMetaObject" function-name="changeGuard"/> <rejection class="QMetaObject" function-name="removeGuard"/> + <rejection calls="WId" /> <rejection class="QFutureSynchronizer"/> <rejection class="QByteArray" function-name="contains"/> <rejection class="QRunnable"/> diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt index 18ce25601..9d2b89704 100644 --- a/PySide/QtGui/CMakeLists.txt +++ b/PySide/QtGui/CMakeLists.txt @@ -52,6 +52,10 @@ elseif(ENABLE_MAC) set(MODULE_NAME "mac") set(SPECIFIC_OS_FILES ) +elseif(ENABLE_WIN) + set(MODULE_NAME "win") + set(SPECIFIC_OS_FILES + ) endif(ENABLE_X11) diff --git a/PySide/QtGui/typesystem_gui_win.xml b/PySide/QtGui/typesystem_gui_win.xml new file mode 100644 index 000000000..0dfb50487 --- /dev/null +++ b/PySide/QtGui/typesystem_gui_win.xml @@ -0,0 +1,6 @@ +<?xml version="1.0"?> +<typesystem package="PySide.QtGui"> + <primitive-type name="Qt::HANDLE" target-lang-api-name="PyObject"/> + + <load-typesystem name="typesystem_gui_common.xml" generate="yes"/> +</typesystem> diff --git a/libpyside/qproperty.h b/libpyside/qproperty.h index 7e0e1bc93..f561d47b7 100644 --- a/libpyside/qproperty.h +++ b/libpyside/qproperty.h @@ -44,7 +44,7 @@ namespace PySide extern "C" { - PyAPI_DATA(PyTypeObject) QProperty_Type; + extern PYSIDE_API PyTypeObject QProperty_Type; }; //extern "C" PYSIDE_API bool isQPropertyType(PyObject* pyObj); |