6 files changed, 83 insertions, 12 deletions
diff --git a/PySide/QtCore/CMakeLists.txt b/PySide/QtCore/CMakeLists.txt
index 86df1d172..a2337c0a5 100644
--- a/PySide/QtCore/CMakeLists.txt
+++ b/PySide/QtCore/CMakeLists.txt
@@ -37,14 +37,12 @@ else()
 endif()
 
 if(ENABLE_WIN)
-    set(QtCore_typesystem "typesystem_core_win.xml")
-    set(QtCore_extra_SRC
+    set(SPECIFIC_OS_FILES
         ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/msg_wrapper.cpp
         ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/point_wrapper.cpp
     )
 else()
-    set(QtCore_typesystem "typesystem_core.xml")
-    set(QtCore_extra_SRC "")
+    set(SPECIFIC_OS_FILES "")
 endif()
 
 set(QtCore_SRC
@@ -146,10 +144,14 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qxmlstreamreader_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qxmlstreamwriter_wrapper.cpp
 ${QtCore_46_SRC}
 ${QtCore_47_SRC}
-${QtCore_extra_SRC}
+${SPECIFIC_OS_FILES}
 )
 
-set(QtCore_typesystem_path "")
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/typesystem_core.xml.in"
+               "${CMAKE_CURRENT_BINARY_DIR}/typesystem_core.xml" @ONLY)
+
+set(QtCore_typesystem_path "${QtCore_SOURCE_DIR}")
+
 set(QtCore_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
                         ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/
                         ${QT_INCLUDE_DIR}
@@ -168,4 +170,4 @@ create_pyside_module(QtCore
                      QtCore_typesystem_path
                      QtCore_SRC
                      QtCore_gluecode
-                     ${CMAKE_CURRENT_SOURCE_DIR}/${QtCore_typesystem})
+                     ${CMAKE_CURRENT_BINARY_DIR}/typesystem_core.xml)
diff --git a/PySide/QtCore/typesystem_core.xml.in b/PySide/QtCore/typesystem_core.xml.in
new file mode 100644
index 000000000..9de2082f5
--- /dev/null
+++ b/PySide/QtCore/typesystem_core.xml.in
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
+<typesystem package="PySide.QtCore">
+    <load-typesystem name="typesystem_core_@AUTO_OS@.xml" generate="yes"/>
+    <load-typesystem name="typesystem_core_common.xml" generate="yes"/>
+</typesystem>
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core_common.xml
index 23763194c..965433b8d 100644
--- a/PySide/QtCore/typesystem_core.xml
+++ b/PySide/QtCore/typesystem_core_common.xml
@@ -152,10 +152,6 @@
     <!-- FIXME APIExtractor or shiboken do not support multiple includes by primitive type -->
     <include file-name="signalmanager.h" location="global"/>
   </primitive-type>
-  <primitive-type name="Qt::HANDLE" target-lang-api-name="PyLong">
-    <!-- FIXME APIExtractor or shiboken do not support multiple includes by primitive type -->
-    <include file-name="QTextDocument" location="global"/>
-  </primitive-type>
   <primitive-type name="QBool" target-lang-api-name="PyBool">
     <conversion-rule file="qbool_conversions.h">
         <native-to-target>
diff --git a/PySide/QtCore/typesystem_core_mac.xml b/PySide/QtCore/typesystem_core_mac.xml
new file mode 100644
index 000000000..0f9c51196
--- /dev/null
+++ b/PySide/QtCore/typesystem_core_mac.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
+<typesystem package="PySide.QtCore">
+  <primitive-type name="Qt::HANDLE" target-lang-api-name="PyObject" />
+</typesystem>
diff --git a/PySide/QtCore/typesystem_core_win.xml b/PySide/QtCore/typesystem_core_win.xml
index b55f04d5f..a9663c9b8 100644
--- a/PySide/QtCore/typesystem_core_win.xml
+++ b/PySide/QtCore/typesystem_core_win.xml
@@ -19,6 +19,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 -->
 <typesystem package="PySide.QtCore">
+  <primitive-type name="Qt::HANDLE" target-lang-api-name="PyObject" />
   <primitive-type name="HWND">
       <conversion-rule file="glue/hwnd_conversions.h">
         <native-to-target>
@@ -50,5 +51,4 @@
   </value-type>
   <suppress-warning text="class 'MSG' inherits from unknown base class 'tagMSG'"/>
   <suppress-warning text="class not found for setup inheritance 'tagMSG'"/>
-  <load-typesystem name="typesystem_core.xml" generate="yes"/>
 </typesystem>
diff --git a/PySide/QtCore/typesystem_core_x11.xml b/PySide/QtCore/typesystem_core_x11.xml
new file mode 100644
index 000000000..eba223c73
--- /dev/null
+++ b/PySide/QtCore/typesystem_core_x11.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+    This file is part of PySide project.
+    Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+    Contact: PySide team <contact@pyside.org>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+-->
+<typesystem package="PySide.QtCore">
+  <primitive-type name="Qt::HANDLE" target-lang-api-name="PyLong">
+    <!-- FIXME APIExtractor or shiboken do not support multiple includes by primitive type -->
+    <include file-name="QTextDocument" location="global"/>
+  </primitive-type>
+</typesystem>