summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Filho <renato.filho@openbossa.org>2010-08-27 12:12:19 -0300
committerRenato Filho <renato.filho@openbossa.org>2010-08-27 15:24:55 -0300
commit7b2903ad21aba22798b4ceace38c34d29bf7b8cc (patch)
tree90f2fca308cc909ccf78970b5f522d0df2dde5d9
parent2774fd8af75ad5a1f412d6e72493de438ce2b8ae (diff)
downloadshiboken-7b2903ad21aba22798b4ceace38c34d29bf7b8cc.tar.gz
shiboken-7b2903ad21aba22798b4ceace38c34d29bf7b8cc.tar.xz
shiboken-7b2903ad21aba22798b4ceace38c34d29bf7b8cc.zip
Fix typesystem based on auto OS detection.
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org> Anderson Lizardo <anderson.lizardo@openbossa.org>
-rw-r--r--PySide/CMakeLists.txt11
-rw-r--r--PySide/QtCore/CMakeLists.txt3
-rw-r--r--PySide/QtCore/typesystem_core.xml1
-rw-r--r--PySide/QtDeclarative/CMakeLists.txt5
-rw-r--r--PySide/QtGui/CMakeLists.txt7
-rw-r--r--PySide/QtGui/typesystem_gui.xml.in6
-rw-r--r--PySide/QtGui/typesystem_gui_commom.xml (renamed from PySide/QtGui/typesystem_gui.xml)0
-rw-r--r--PySide/QtGui/typesystem_gui_mac.xml2
-rw-r--r--PySide/QtGui/typesystem_gui_simulator.xml2
-rw-r--r--PySide/QtGui/typesystem_gui_x11.xml2
-rw-r--r--PySide/QtHelp/CMakeLists.txt5
-rw-r--r--PySide/QtMaemo5/CMakeLists.txt3
-rw-r--r--PySide/QtMultimedia/CMakeLists.txt5
-rw-r--r--PySide/QtNetwork/CMakeLists.txt3
-rw-r--r--PySide/QtOpenGL/CMakeLists.txt5
-rw-r--r--PySide/QtScript/CMakeLists.txt3
-rw-r--r--PySide/QtScriptTools/CMakeLists.txt5
-rw-r--r--PySide/QtSql/CMakeLists.txt5
-rw-r--r--PySide/QtSvg/CMakeLists.txt5
-rw-r--r--PySide/QtTest/CMakeLists.txt5
-rw-r--r--PySide/QtTest/typesystem_test.xml1
-rw-r--r--PySide/QtUiTools/CMakeLists.txt5
-rw-r--r--PySide/QtWebKit/CMakeLists.txt5
-rw-r--r--PySide/QtXml/CMakeLists.txt3
-rw-r--r--PySide/QtXmlPatterns/CMakeLists.txt3
-rw-r--r--PySide/phonon/CMakeLists.txt5
26 files changed, 68 insertions, 37 deletions
diff --git a/PySide/CMakeLists.txt b/PySide/CMakeLists.txt
index cce0f4ce..d5368e33 100644
--- a/PySide/CMakeLists.txt
+++ b/PySide/CMakeLists.txt
@@ -6,12 +6,13 @@ macro(execute_generator module sources typesystem_path)
message("Running generator for ${module}...")
endmacro()
-macro(create_pyside_module module_name module_include_dir module_libraries module_deps module_typesystem_path module_sources)
+macro(create_pyside_module module_name module_include_dir module_libraries module_deps module_typesystem_path module_sources typesystem_name)
string(TOLOWER ${module_name} _module)
string(REGEX REPLACE ^qt "" _module ${_module})
- set(typesystem_prefix ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_${_module})
- if(EXISTS ${typesystem_prefix}_${AUTO_OS}.xml)
- set(typesystem_prefix ${typesystem_prefix}_${AUTO_OS})
+ if (NOT EXISTS ${typesystem_name})
+ set(typesystem_path ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_${_module}.xml)
+ else()
+ set(typesystem_path ${typesystem_name})
endif()
add_custom_command(OUTPUT ${${module_sources}}
@@ -21,7 +22,7 @@ macro(create_pyside_module module_name module_include_dir module_libraries modul
--typesystem-paths=${pyside_SOURCE_DIR}:${${module_typesystem_path}}
--output-directory=${CMAKE_CURRENT_BINARY_DIR}
--license-file=${CMAKE_CURRENT_SOURCE_DIR}/../licensecomment.txt
- ${typesystem_prefix}.xml
+ ${typesystem_path}
--api-version=${SUPPORTED_QT_VERSION}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMENT "Running generator for ${module_name}...")
diff --git a/PySide/QtCore/CMakeLists.txt b/PySide/QtCore/CMakeLists.txt
index 5a5951ba..5bd295d1 100644
--- a/PySide/QtCore/CMakeLists.txt
+++ b/PySide/QtCore/CMakeLists.txt
@@ -151,4 +151,5 @@ create_pyside_module(QtCore
QtCore_libraries
""
QtCore_typesystem_path
- QtCore_SRC)
+ QtCore_SRC
+ "")
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
index 26991286..f8633867 100644
--- a/PySide/QtCore/typesystem_core.xml
+++ b/PySide/QtCore/typesystem_core.xml
@@ -2479,4 +2479,5 @@
<suppress-warning text="unmatched enum (sizeof(void*)&lt;&lt;3)"/>
<suppress-warning text="signature 'setCustomType(float)' for function modification in 'QEasingCurve' not found. Possible candidates: setCustomType(double) in QEasingCurve"/>
<suppress-warning text="enum 'enum_4' does not have a type entry or is not an enum" />
+ <suppress-warning text="enum 'enum_5' does not have a type entry or is not an enum" />
</typesystem>
diff --git a/PySide/QtDeclarative/CMakeLists.txt b/PySide/QtDeclarative/CMakeLists.txt
index d2b7e29a..9b444b21 100644
--- a/PySide/QtDeclarative/CMakeLists.txt
+++ b/PySide/QtDeclarative/CMakeLists.txt
@@ -21,7 +21,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qdeclarativeview_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qtdeclarative_module_wrapper.cpp
)
-set(QtDeclarative_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtNetwork_SOURCE_DIR}:${QtDeclarative_SOURCE_DIR}")
+set(QtDeclarative_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtNetwork_SOURCE_DIR}:${QtDeclarative_SOURCE_DIR}:${QtGui_BINARY_DIR}")
set(QtDeclarative_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
${QT_QTCORE_INCLUDE_DIR}
@@ -55,5 +55,6 @@ create_pyside_module(QtDeclarative
QtDeclarative_libraries
QtDeclarative_deps
QtDeclarative_typesystem_path
- QtDeclarative_SRC)
+ QtDeclarative_SRC
+ "")
diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt
index f4ec6d32..b2a5545d 100644
--- a/PySide/QtGui/CMakeLists.txt
+++ b/PySide/QtGui/CMakeLists.txt
@@ -373,6 +373,10 @@ ${SPECIFIC_OS_FILES}
${QtGui_46_SRC}
)
+
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/typesystem_gui.xml.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml" @ONLY)
+
check_qt_class(QtGui QGtkStyle QtGui_SRC)
check_qt_class(QtGui QSessionManager QtGui_SRC)
check_qt_class(QtGui QSizeGrip QtGui_SRC)
@@ -407,5 +411,6 @@ create_pyside_module(QtGui
QtGui_libraries
QtGui_deps
QtGui_typesystem_path
- QtGui_SRC)
+ QtGui_SRC
+ "${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml")
diff --git a/PySide/QtGui/typesystem_gui.xml.in b/PySide/QtGui/typesystem_gui.xml.in
new file mode 100644
index 00000000..878f8374
--- /dev/null
+++ b/PySide/QtGui/typesystem_gui.xml.in
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<typesystem package="PySide.QtGui">
+ <load-typesystem name="typesystem_core.xml" generate="no"/>
+ <load-typesystem name="typesystem_gui_@AUTO_OS@.xml" generate="yes"/>
+ <load-typesystem name="typesystem_gui_commom.xml" generate="yes"/>
+</typesystem>
diff --git a/PySide/QtGui/typesystem_gui.xml b/PySide/QtGui/typesystem_gui_commom.xml
index 66c33d4b..66c33d4b 100644
--- a/PySide/QtGui/typesystem_gui.xml
+++ b/PySide/QtGui/typesystem_gui_commom.xml
diff --git a/PySide/QtGui/typesystem_gui_mac.xml b/PySide/QtGui/typesystem_gui_mac.xml
index 56f1f323..a0c84c0f 100644
--- a/PySide/QtGui/typesystem_gui_mac.xml
+++ b/PySide/QtGui/typesystem_gui_mac.xml
@@ -5,7 +5,7 @@
<primitive-type name="Qt::HANDLE" target-lang-api-name="PyObject"/>
- <load-typesystem name="typesystem_gui.xml" generate="yes"/>
+ <load-typesystem name="typesystem_gui_commom.xml" generate="yes"/>
<suppress-warning text="enum 'QPixmap::ShareMode' does not have a type entry or is not an enum" />
<suppress-warning text="enum 'QSysInfo::Endian' is specified in typesystem, but not declared" />
diff --git a/PySide/QtGui/typesystem_gui_simulator.xml b/PySide/QtGui/typesystem_gui_simulator.xml
index 18873497..5a122f03 100644
--- a/PySide/QtGui/typesystem_gui_simulator.xml
+++ b/PySide/QtGui/typesystem_gui_simulator.xml
@@ -31,5 +31,5 @@
<modify-function signature="handle()const" remove="all"/>
</value-type>
- <load-typesystem name="typesystem_gui.xml" generate="yes"/>
+ <load-typesystem name="typesystem_gui_commom.xml" generate="yes"/>
</typesystem>
diff --git a/PySide/QtGui/typesystem_gui_x11.xml b/PySide/QtGui/typesystem_gui_x11.xml
index 36f25ae2..4275782a 100644
--- a/PySide/QtGui/typesystem_gui_x11.xml
+++ b/PySide/QtGui/typesystem_gui_x11.xml
@@ -10,5 +10,5 @@
<enum-type name="QPixmap::ShareMode"/>
- <load-typesystem name="typesystem_gui.xml" generate="yes"/>
+ <load-typesystem name="typesystem_gui_commom.xml" generate="yes"/>
</typesystem>
diff --git a/PySide/QtHelp/CMakeLists.txt b/PySide/QtHelp/CMakeLists.txt
index 0ffa4003..e906072b 100644
--- a/PySide/QtHelp/CMakeLists.txt
+++ b/PySide/QtHelp/CMakeLists.txt
@@ -15,7 +15,7 @@ set(QtHelp_SRC
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtHelp/qthelp_module_wrapper.cpp
)
-set(QtHelp_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtHelp_SOURCE_DIR}")
+set(QtHelp_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtHelp_SOURCE_DIR}:${QtGui_BINARY_DIR}")
set(QtHelp_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
${QT_QTCORE_INCLUDE_DIR}
${QT_QTGUI_INCLUDE_DIR}
@@ -38,4 +38,5 @@ create_pyside_module(QtHelp
QtHelp_libraries
QtHelp_deps
QtHelp_typesystem_path
- QtHelp_SRC)
+ QtHelp_SRC
+ "")
diff --git a/PySide/QtMaemo5/CMakeLists.txt b/PySide/QtMaemo5/CMakeLists.txt
index 74eaabda..5dae3d3f 100644
--- a/PySide/QtMaemo5/CMakeLists.txt
+++ b/PySide/QtMaemo5/CMakeLists.txt
@@ -45,5 +45,6 @@ create_pyside_module(QtMaemo5
QtMaemo5_libraries
QtMaemo5_deps
QtMaemo5_typesystem_path
- QtMaemo5_SRC)
+ QtMaemo5_SRC
+ "")
diff --git a/PySide/QtMultimedia/CMakeLists.txt b/PySide/QtMultimedia/CMakeLists.txt
index 3dd7abbf..d1e577c3 100644
--- a/PySide/QtMultimedia/CMakeLists.txt
+++ b/PySide/QtMultimedia/CMakeLists.txt
@@ -17,7 +17,7 @@ set(QtMultimedia_SRC
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/qvideoframe_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/qtmultimedia_module_wrapper.cpp
)
-set(QtMultimedia_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}")
+set(QtMultimedia_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
set(QtMultimedia_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/
@@ -44,4 +44,5 @@ create_pyside_module(QtMultimedia
QtMultimedia_libraries
QtMultimedia_deps
QtMultimedia_typesystem_path
- QtMultimedia_SRC)
+ QtMultimedia_SRC
+ "")
diff --git a/PySide/QtNetwork/CMakeLists.txt b/PySide/QtNetwork/CMakeLists.txt
index 691cf76a..768b80ec 100644
--- a/PySide/QtNetwork/CMakeLists.txt
+++ b/PySide/QtNetwork/CMakeLists.txt
@@ -68,4 +68,5 @@ create_pyside_module(QtNetwork
QtNetwork_libraries
QtNetwork_deps
QtNetwork_typesystem_path
- QtNetwork_SRC)
+ QtNetwork_SRC
+ "")
diff --git a/PySide/QtOpenGL/CMakeLists.txt b/PySide/QtOpenGL/CMakeLists.txt
index 6ca37773..013d15ff 100644
--- a/PySide/QtOpenGL/CMakeLists.txt
+++ b/PySide/QtOpenGL/CMakeLists.txt
@@ -32,7 +32,7 @@ set(QtOpenGL_SRC
${QtOpenGL_47_SRC}
)
-set(QtOpenGL_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtOpenGL_SOURCE_DIR}")
+set(QtOpenGL_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtOpenGL_SOURCE_DIR}:${QtGui_BINARY_DIR}")
set(QtOpenGL_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
${QT_QTCORE_INCLUDE_DIR}
${QT_QTGUI_INCLUDE_DIR}
@@ -54,4 +54,5 @@ create_pyside_module(QtOpenGL
QtOpenGL_libraries
QtOpenGL_deps
QtOpenGL_typesystem_path
- QtOpenGL_SRC)
+ QtOpenGL_SRC
+ "")
diff --git a/PySide/QtScript/CMakeLists.txt b/PySide/QtScript/CMakeLists.txt
index 87f7e066..af387684 100644
--- a/PySide/QtScript/CMakeLists.txt
+++ b/PySide/QtScript/CMakeLists.txt
@@ -45,4 +45,5 @@ create_pyside_module(QtScript
QtScript_libraries
QtScript_deps
QtScript_typesystem_path
- QtScript_SRC)
+ QtScript_SRC
+ "")
diff --git a/PySide/QtScriptTools/CMakeLists.txt b/PySide/QtScriptTools/CMakeLists.txt
index c15dd7a9..21d3c7d7 100644
--- a/PySide/QtScriptTools/CMakeLists.txt
+++ b/PySide/QtScriptTools/CMakeLists.txt
@@ -5,7 +5,7 @@ set(QtScriptTools_SRC
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScriptTools/qscriptenginedebugger_wrapper.cpp
)
-set(QtScriptTools_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtScript_SOURCE_DIR}:${QtScriptTools_SOURCE_DIR}")
+set(QtScriptTools_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtScript_SOURCE_DIR}:${QtScriptTools_SOURCE_DIR}:${QtGui_BINARY_DIR}")
set(QtScriptTools_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
${QT_QTCORE_INCLUDE_DIR}
@@ -33,4 +33,5 @@ create_pyside_module(QtScriptTools
QtScriptTools_libraries
QtScriptTools_deps
QtScriptTools_typesystem_path
- QtScriptTools_SRC)
+ QtScriptTools_SRC
+ "")
diff --git a/PySide/QtSql/CMakeLists.txt b/PySide/QtSql/CMakeLists.txt
index e58e0c29..9e5587e0 100644
--- a/PySide/QtSql/CMakeLists.txt
+++ b/PySide/QtSql/CMakeLists.txt
@@ -21,7 +21,7 @@ set(QtSql_SRC
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSql/qtsql_module_wrapper.cpp
)
-set(QtSql_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtSql_SOURCE_DIR}")
+set(QtSql_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtSql_SOURCE_DIR}:${QtGui_BINARY_DIR}")
set(QtSql_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
${QT_QTCORE_INCLUDE_DIR}
${QT_QTGUI_INCLUDE_DIR}
@@ -43,4 +43,5 @@ create_pyside_module(QtSql
QtSql_libraries
QtSql_deps
QtSql_typesystem_path
- QtSql_SRC)
+ QtSql_SRC
+ "")
diff --git a/PySide/QtSvg/CMakeLists.txt b/PySide/QtSvg/CMakeLists.txt
index 4517fc06..e9238c9c 100644
--- a/PySide/QtSvg/CMakeLists.txt
+++ b/PySide/QtSvg/CMakeLists.txt
@@ -8,7 +8,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSvg/qsvgwidget_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSvg/qtsvg_module_wrapper.cpp
)
-set(QtSvg_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}")
+set(QtSvg_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
set(QtSvg_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSvg/
${QT_INCLUDE_DIR}
@@ -31,4 +31,5 @@ create_pyside_module(QtSvg
QtSvg_libraries
QtSvg_deps
QtSvg_typesystem_path
- QtSvg_SRC)
+ QtSvg_SRC
+ "")
diff --git a/PySide/QtTest/CMakeLists.txt b/PySide/QtTest/CMakeLists.txt
index 5fffb8e9..34044da9 100644
--- a/PySide/QtTest/CMakeLists.txt
+++ b/PySide/QtTest/CMakeLists.txt
@@ -5,7 +5,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/qtest_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/qttest_module_wrapper.cpp
)
-set(QtTest_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}")
+set(QtTest_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
set(QtTest_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/
${QT_INCLUDE_DIR}
@@ -29,4 +29,5 @@ create_pyside_module(QtTest
QtTest_libraries
QtTest_deps
QtTest_typesystem_path
- QtTest_SRC)
+ QtTest_SRC
+ "")
diff --git a/PySide/QtTest/typesystem_test.xml b/PySide/QtTest/typesystem_test.xml
index bc447eee..734bbbb5 100644
--- a/PySide/QtTest/typesystem_test.xml
+++ b/PySide/QtTest/typesystem_test.xml
@@ -48,6 +48,7 @@
<enum-type name="QTest::MouseAction"/>
<enum-type name="QTest::SkipMode"/>
<enum-type name="QTest::TestFailMode"/>
+ <enum-type name="QTest::QBenchmarkMetric" since="4.7"/>
<rejection class="QSignalSpy"/>
<rejection class="QTestEventList"/>
diff --git a/PySide/QtUiTools/CMakeLists.txt b/PySide/QtUiTools/CMakeLists.txt
index ed4c66cc..01202077 100644
--- a/PySide/QtUiTools/CMakeLists.txt
+++ b/PySide/QtUiTools/CMakeLists.txt
@@ -5,7 +5,7 @@ set(QtUiTools_SRC
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtUiTools/quiloader_wrapper.cpp
)
-set(QtUiTools_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtXml_SOURCE_DIR}:${QtUiTools_SOURCE_DIR}")
+set(QtUiTools_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtXml_SOURCE_DIR}:${QtUiTools_SOURCE_DIR}:${QtGui_BINARY_DIR}")
set(QtUiTools_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
${QT_QTCORE_INCLUDE_DIR}
${QT_QTGUI_INCLUDE_DIR}
@@ -29,4 +29,5 @@ create_pyside_module(QtUiTools
QtUiTools_libraries
QtUiTools_deps
QtUiTools_typesystem_path
- QtUiTools_SRC)
+ QtUiTools_SRC
+ "")
diff --git a/PySide/QtWebKit/CMakeLists.txt b/PySide/QtWebKit/CMakeLists.txt
index 4a893607..53875193 100644
--- a/PySide/QtWebKit/CMakeLists.txt
+++ b/PySide/QtWebKit/CMakeLists.txt
@@ -31,7 +31,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/webcore_wrapper.cpp
${QtWebKit_46_SRC}
)
-set(QtWebKit_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtNetwork_SOURCE_DIR}")
+set(QtWebKit_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtNetwork_SOURCE_DIR}:${QtGui_BINARY_DIR}")
set(QtWebkit_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebkit/
${QT_INCLUDE_DIR}
@@ -57,5 +57,6 @@ create_pyside_module(QtWebKit
QtWebKit_libraries
QtWebKit_deps
QtWebKit_typesystem_path
- QtWebKit_SRC)
+ QtWebKit_SRC
+ "")
diff --git a/PySide/QtXml/CMakeLists.txt b/PySide/QtXml/CMakeLists.txt
index 628dd009..f461a939 100644
--- a/PySide/QtXml/CMakeLists.txt
+++ b/PySide/QtXml/CMakeLists.txt
@@ -56,4 +56,5 @@ create_pyside_module(QtXml
QtXml_libraries
QtXml_deps
QtXml_typesystem_path
- QtXml_SRC)
+ QtXml_SRC
+ "")
diff --git a/PySide/QtXmlPatterns/CMakeLists.txt b/PySide/QtXmlPatterns/CMakeLists.txt
index 4db6e9de..6c112133 100644
--- a/PySide/QtXmlPatterns/CMakeLists.txt
+++ b/PySide/QtXmlPatterns/CMakeLists.txt
@@ -45,5 +45,6 @@ create_pyside_module(QtXmlPatterns
QtXmlPatterns_libraries
QtXmlPatterns_deps
QtXmlPatterns_typesystem_path
- QtXmlPatterns_SRC)
+ QtXmlPatterns_SRC
+ "")
diff --git a/PySide/phonon/CMakeLists.txt b/PySide/phonon/CMakeLists.txt
index 948166a9..9fd1e35a 100644
--- a/PySide/phonon/CMakeLists.txt
+++ b/PySide/phonon/CMakeLists.txt
@@ -43,7 +43,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon/phonon_volumeslider_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon/phonon_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon/phonon_backendcapabilities_notifierwrapper_wrapper.cpp
)
-set(phonon_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${phonon_SOURCE_DIR}")
+set(phonon_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${phonon_SOURCE_DIR}:${QtGui_BINARY_DIR}")
set(phonon_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
${QT_QTCORE_INCLUDE_DIR}
${QT_QTGUI_INCLUDE_DIR}
@@ -66,4 +66,5 @@ create_pyside_module(phonon
phonon_libraries
phonon_deps
phonon_typesystem_path
- phonon_SRC)
+ phonon_SRC
+ "")