diff options
Diffstat (limited to 'PySide')
23 files changed, 33 insertions, 57 deletions
diff --git a/PySide/CMakeLists.txt b/PySide/CMakeLists.txt index d823019f6..01cd0ce36 100644 --- a/PySide/CMakeLists.txt +++ b/PySide/CMakeLists.txt @@ -6,7 +6,14 @@ macro(execute_generator module sources typesystem_path) message("Running generator for ${module}...") endmacro() -macro(create_pyside_module module_name typesystem_file 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) + 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}) + endif() + add_custom_command(OUTPUT ${${module_sources}} COMMAND ${GENERATOR} ${GENERATOR_EXTRA_FLAGS} ${CMAKE_BINARY_DIR}/PySide/global.h @@ -14,7 +21,7 @@ macro(create_pyside_module module_name typesystem_file module_include_dir module --typesystem-paths=${pyside_SOURCE_DIR}:${${module_typesystem_path}} --output-directory=${CMAKE_CURRENT_BINARY_DIR} --license-file=${CMAKE_CURRENT_SOURCE_DIR}/../licensecomment.txt - ${typesystem_file} + ${typesystem_prefix}.xml --api-version=${SUPPORTED_QT_VERSION} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMENT "Running generator for ${module_name}...") @@ -40,8 +47,8 @@ macro(create_pyside_module module_name typesystem_file module_include_dir module string(TOLOWER ${module_name} lower_module_name) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/${module_name}/pyside_${lower_module_name}_python.h DESTINATION include/PySide/${module_name}/) - install(FILES ${typesystem_file} - DESTINATION share/PySide/typesystems) + file(GLOB typesystem_files ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_*.xml) + install(FILES ${typesystem_files} DESTINATION share/PySide/typesystems) endmacro() diff --git a/PySide/QtCore/CMakeLists.txt b/PySide/QtCore/CMakeLists.txt index b6c753416..5a5951ba9 100644 --- a/PySide/QtCore/CMakeLists.txt +++ b/PySide/QtCore/CMakeLists.txt @@ -134,7 +134,7 @@ ${QtCore_46_SRC} ${QtCore_47_SRC} ) -set(QtCore_typesystem_path ${CMAKE_CURRENT_BINARY_DIR}) +set(QtCore_typesystem_path "") set(QtCore_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/ ${QT_INCLUDE_DIR} @@ -147,7 +147,6 @@ set(QtCore_libraries pyside ${QT_QTCORE_LIBRARY}) create_pyside_module(QtCore - ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_core.xml QtCore_include_dirs QtCore_libraries "" diff --git a/PySide/QtDeclarative/CMakeLists.txt b/PySide/QtDeclarative/CMakeLists.txt index 940f4d1d3..d2b7e29af 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 "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtDeclarative_SOURCE_DIR}:${QtNetwork_SOURCE_DIR}:${QtNetwork_BINARY_DIR}") +set(QtDeclarative_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtNetwork_SOURCE_DIR}:${QtDeclarative_SOURCE_DIR}") set(QtDeclarative_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QT_QTCORE_INCLUDE_DIR} @@ -51,7 +51,6 @@ set(QtDeclarative_libraries pyside set(QtDeclarative_deps QtGui QtNetwork) create_pyside_module(QtDeclarative - ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_declarative.xml QtDeclarative_include_dirs QtDeclarative_libraries QtDeclarative_deps diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt index a848b65e0..88ec19164 100644 --- a/PySide/QtGui/CMakeLists.txt +++ b/PySide/QtGui/CMakeLists.txt @@ -459,10 +459,7 @@ set(QT_SESSIONMANAGER_SRCS ) CHECK_QT_GUI_MACRO("SessionManager Support" QT_NO_SESSIONMANAGER QT_SESSIONMANAGER_SRCS QtGui_SRC) -configure_file(typesystem_gui.xml.in - "${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml" @ONLY) - -set(QtGui_typesystem_path "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtCore_BINARY_DIR}") +set(QtGui_typesystem_path "${QtCore_SOURCE_DIR}") set(QtGui_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/ ${QT_INCLUDE_DIR} @@ -476,15 +473,7 @@ set(QtGui_libraries pyside ${QT_QTGUI_LIBRARY}) set(QtGui_deps "QtCore") -# extra install -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_gui_common.xml - ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_gui_mac.xml - ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_gui_maemo.xml - ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_gui_x11.xml - DESTINATION share/PySide/typesystems) - create_pyside_module(QtGui - ${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml QtGui_include_dirs QtGui_libraries QtGui_deps diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui.xml index b11ec9f62..a5dcfd928 100644 --- a/PySide/QtGui/typesystem_gui_common.xml +++ b/PySide/QtGui/typesystem_gui.xml @@ -1,5 +1,7 @@ <?xml version="1.0"?> <typesystem package="PySide.QtGui"> + <load-typesystem name="typesystem_core.xml" generate="no"/> + <template name="QFontCharFix"> int size = PyString_GET_SIZE(%PYARG_1); if (size == 1) { diff --git a/PySide/QtGui/typesystem_gui.xml.in b/PySide/QtGui/typesystem_gui.xml.in deleted file mode 100644 index 3ef63d9c9..000000000 --- a/PySide/QtGui/typesystem_gui.xml.in +++ /dev/null @@ -1,5 +0,0 @@ -<?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"/> -</typesystem> diff --git a/PySide/QtGui/typesystem_gui_mac.xml b/PySide/QtGui/typesystem_gui_mac.xml index b27df0fce..56f1f3236 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_common.xml" generate="yes"/> + <load-typesystem name="typesystem_gui.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_x11.xml b/PySide/QtGui/typesystem_gui_x11.xml index 742987430..36f25ae24 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_common.xml" generate="yes"/> + <load-typesystem name="typesystem_gui.xml" generate="yes"/> </typesystem> diff --git a/PySide/QtHelp/CMakeLists.txt b/PySide/QtHelp/CMakeLists.txt index d5140c2d9..0ffa40031 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 "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtHelp_SOURCE_DIR}") +set(QtHelp_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtHelp_SOURCE_DIR}") set(QtHelp_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} @@ -34,7 +34,6 @@ set(QtHelp_libraries pyside set(QtHelp_deps QtGui) create_pyside_module(QtHelp - ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_help.xml QtHelp_include_dirs QtHelp_libraries QtHelp_deps diff --git a/PySide/QtMaemo5/CMakeLists.txt b/PySide/QtMaemo5/CMakeLists.txt index 4eb236405..74eaabda7 100644 --- a/PySide/QtMaemo5/CMakeLists.txt +++ b/PySide/QtMaemo5/CMakeLists.txt @@ -11,7 +11,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtMaemo5/qmaemo5valuebutton_wrapper. ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtMaemo5/qtmaemo5_module_wrapper.cpp ) -set(QtMaemo5_typesystem_path "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtMaemo5_SOURCE_DIR}") +set(QtMaemo5_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtMaemo5_SOURCE_DIR}") # QT_QTMAEMO5_* variables are not defined by CMake if(NOT QT_QTMAEMO5_INCLUDE_DIR) @@ -41,7 +41,6 @@ set(QtMaemo5_libraries pyside set(QtMaemo5_deps QtGui) create_pyside_module(QtMaemo5 - ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_maemo5.xml QtMaemo5_include_dirs QtMaemo5_libraries QtMaemo5_deps diff --git a/PySide/QtMultimedia/CMakeLists.txt b/PySide/QtMultimedia/CMakeLists.txt index 1829697ec..3dd7abbf4 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 "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}") +set(QtMultimedia_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}") set(QtMultimedia_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/ @@ -40,7 +40,6 @@ set(QtMultimedia_libraries pyside set(QtMultimedia_deps QtGui) create_pyside_module(QtMultimedia - ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_multimedia.xml QtMultimedia_include_dirs QtMultimedia_libraries QtMultimedia_deps diff --git a/PySide/QtNetwork/CMakeLists.txt b/PySide/QtNetwork/CMakeLists.txt index 0d89e2869..ca0599314 100644 --- a/PySide/QtNetwork/CMakeLists.txt +++ b/PySide/QtNetwork/CMakeLists.txt @@ -84,7 +84,7 @@ set(OPENSSL_SOURCES CHECK_QT_NETWORK_MACRO("Network OPENSSL" QT_NO_OPENSSL OPENSSL_SOURCES QtNetwork_SRC) -set(QtNetwork_typesystem_path "${CMAKE_CURRENT_SOURCE_DIR}:${QtCore_SOURCE_DIR}") +set(QtNetwork_typesystem_path "${QtCore_SOURCE_DIR}") set(QtNetwork_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/ ${QT_INCLUDE_DIR} @@ -101,7 +101,6 @@ set(QtNetwork_libraries pyside set(QtNetwork_deps QtCore) create_pyside_module(QtNetwork - ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_network.xml QtNetwork_include_dirs QtNetwork_libraries QtNetwork_deps diff --git a/PySide/QtOpenGL/CMakeLists.txt b/PySide/QtOpenGL/CMakeLists.txt index 42173a41b..6ca377734 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 "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtOpenGL_SOURCE_DIR}") +set(QtOpenGL_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtOpenGL_SOURCE_DIR}") set(QtOpenGL_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} @@ -50,7 +50,6 @@ set(QtOpenGL_libraries pyside ${QT_QTOPENGL_LIBRARY}) set(QtOpenGL_deps QtGui) create_pyside_module(QtOpenGL - ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_opengl.xml QtOpenGL_include_dirs QtOpenGL_libraries QtOpenGL_deps diff --git a/PySide/QtScript/CMakeLists.txt b/PySide/QtScript/CMakeLists.txt index d9e8264a8..87f7e066d 100644 --- a/PySide/QtScript/CMakeLists.txt +++ b/PySide/QtScript/CMakeLists.txt @@ -25,7 +25,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript/qscriptvalueiterator_wrapper.cpp ${QtScript_46_SRC} ) -set(QtScript_typesystem_path "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}") +set(QtScript_typesystem_path "${QtCore_SOURCE_DIR}") set(QtScript_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScript ${QT_INCLUDE_DIR} @@ -41,7 +41,6 @@ set(QtScript_libraries pyside ${QT_QTSCRIPT_LIBRARY}) set(QtScript_deps QtCore) create_pyside_module(QtScript - ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_script.xml QtScript_include_dirs QtScript_libraries QtScript_deps diff --git a/PySide/QtScriptTools/CMakeLists.txt b/PySide/QtScriptTools/CMakeLists.txt index 39faee45b..c15dd7a91 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 "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtScript_SOURCE_DIR}:${QtScriptTools_SOURCE_DIR}") +set(QtScriptTools_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtScript_SOURCE_DIR}:${QtScriptTools_SOURCE_DIR}") set(QtScriptTools_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QT_QTCORE_INCLUDE_DIR} @@ -29,7 +29,6 @@ set(QtScriptTools_libraries pyside set(QtScriptTools_deps QtCore QtScript QtGui) create_pyside_module(QtScriptTools - ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_scripttools.xml QtScriptTools_include_dirs QtScriptTools_libraries QtScriptTools_deps diff --git a/PySide/QtSql/CMakeLists.txt b/PySide/QtSql/CMakeLists.txt index f8e105d42..e58e0c299 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 "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${QtSql_SOURCE_DIR}") +set(QtSql_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtSql_SOURCE_DIR}") set(QtSql_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} @@ -39,7 +39,6 @@ set(QtSql_libraries pyside ${QT_QTSQL_LIBRARY}) set(QtSql_deps QtGui) create_pyside_module(QtSql - ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_sql.xml QtSql_include_dirs QtSql_libraries QtSql_deps diff --git a/PySide/QtSvg/CMakeLists.txt b/PySide/QtSvg/CMakeLists.txt index bd675366b..4517fc06f 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 "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}") +set(QtSvg_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}") set(QtSvg_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSvg/ ${QT_INCLUDE_DIR} @@ -27,7 +27,6 @@ set(QtSvg_libraries pyside ${QT_QTGUI_LIBRARY}) set(QtSvg_deps QtGui) create_pyside_module(QtSvg - ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_svg.xml QtSvg_include_dirs QtSvg_libraries QtSvg_deps diff --git a/PySide/QtTest/CMakeLists.txt b/PySide/QtTest/CMakeLists.txt index cb9e4d5c1..5fffb8e93 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 "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}") +set(QtTest_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}") set(QtTest_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/ ${QT_INCLUDE_DIR} @@ -25,7 +25,6 @@ set(QtTest_libraries pyside ${QT_QTCORE_LIBRARY}) set(QtTest_deps QtGui) create_pyside_module(QtTest - ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_test.xml QtTest_include_dirs QtTest_libraries QtTest_deps diff --git a/PySide/QtUiTools/CMakeLists.txt b/PySide/QtUiTools/CMakeLists.txt index 9af11fb9a..ed4c66cc1 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 "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_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}") set(QtUiTools_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} @@ -25,7 +25,6 @@ set(QtUiTools_libraries pyside ${QT_QTUITOOLS_LIBRARY}) set(QtUiTools_deps QtGui QtXml) create_pyside_module(QtUiTools - ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_uitools.xml QtUiTools_include_dirs QtUiTools_libraries QtUiTools_deps diff --git a/PySide/QtWebKit/CMakeLists.txt b/PySide/QtWebKit/CMakeLists.txt index f2ca036f3..4a893607d 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 "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtNetwork_SOURCE_DIR}") +set(QtWebKit_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtNetwork_SOURCE_DIR}") set(QtWebkit_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebkit/ ${QT_INCLUDE_DIR} @@ -53,7 +53,6 @@ set(QtWebKit_libraries pyside ${QT_QTGUI_LIBRARY}) set(QtWebKit_deps QtGui QtNetwork) create_pyside_module(QtWebKit - ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_webkit.xml QtWebkit_include_dirs QtWebKit_libraries QtWebKit_deps diff --git a/PySide/QtXml/CMakeLists.txt b/PySide/QtXml/CMakeLists.txt index c76cabd68..628dd009c 100644 --- a/PySide/QtXml/CMakeLists.txt +++ b/PySide/QtXml/CMakeLists.txt @@ -35,7 +35,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXml/qxmlreader_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXml/qxmlsimplereader_wrapper.cpp ) -set(QtXml_typesystem_path "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}") +set(QtXml_typesystem_path "${QtCore_SOURCE_DIR}") set(QtXml_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXml ${CMAKE_SOURCE_DIR} @@ -52,7 +52,6 @@ set(QtXml_libraries pyside ${QT_QTXML_LIBRARY}) set(QtXml_deps QtCore) create_pyside_module(QtXml - ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_xml.xml QtXml_include_dirs QtXml_libraries QtXml_deps diff --git a/PySide/QtXmlPatterns/CMakeLists.txt b/PySide/QtXmlPatterns/CMakeLists.txt index 3456e9edc..4db6e9de7 100644 --- a/PySide/QtXmlPatterns/CMakeLists.txt +++ b/PySide/QtXmlPatterns/CMakeLists.txt @@ -26,7 +26,7 @@ set(QtXmlPatterns_SRC ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtXmlPatterns/qxmlserializer_wrapper.cpp ${QtXmlPatterns_46_SRC} ) -set(QtXmlPatterns_typesystem_path "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}") +set(QtXmlPatterns_typesystem_path "${QtCore_SOURCE_DIR}") set(QtXmlPatterns_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTXMLPATTERNS_INCLUDE_DIR} @@ -41,7 +41,6 @@ set(QtXmlPatterns_libraries pyside ${QT_QTXMLPATTERNS_LIBRARY}) set(QtXmlPatterns_deps QtCore) create_pyside_module(QtXmlPatterns - ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_xmlpatterns.xml QtXmlPatterns_include_dirs QtXmlPatterns_libraries QtXmlPatterns_deps diff --git a/PySide/phonon/CMakeLists.txt b/PySide/phonon/CMakeLists.txt index a7a870fee..948166a9f 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 "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_BINARY_DIR}:${QtGui_SOURCE_DIR}:${phonon_SOURCE_DIR}") +set(phonon_typesystem_path "${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${phonon_SOURCE_DIR}") set(phonon_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} @@ -62,7 +62,6 @@ set(phonon_libraries pyside set(phonon_deps QtGui) create_pyside_module(phonon - "typesystem_phonon.xml" phonon_include_dirs phonon_libraries phonon_deps |