Fix typesystem based on auto OS detection.
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
Anderson Lizardo <anderson.lizardo@openbossa.org>
This commit is contained in:
parent
2774fd8af7
commit
7b2903ad21
26 changed files with 68 additions and 37 deletions
|
|
@ -6,12 +6,13 @@ macro(execute_generator module sources typesystem_path)
|
||||||
message("Running generator for ${module}...")
|
message("Running generator for ${module}...")
|
||||||
endmacro()
|
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(TOLOWER ${module_name} _module)
|
||||||
string(REGEX REPLACE ^qt "" _module ${_module})
|
string(REGEX REPLACE ^qt "" _module ${_module})
|
||||||
set(typesystem_prefix ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_${_module})
|
if (NOT EXISTS ${typesystem_name})
|
||||||
if(EXISTS ${typesystem_prefix}_${AUTO_OS}.xml)
|
set(typesystem_path ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_${_module}.xml)
|
||||||
set(typesystem_prefix ${typesystem_prefix}_${AUTO_OS})
|
else()
|
||||||
|
set(typesystem_path ${typesystem_name})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_custom_command(OUTPUT ${${module_sources}}
|
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}}
|
--typesystem-paths=${pyside_SOURCE_DIR}:${${module_typesystem_path}}
|
||||||
--output-directory=${CMAKE_CURRENT_BINARY_DIR}
|
--output-directory=${CMAKE_CURRENT_BINARY_DIR}
|
||||||
--license-file=${CMAKE_CURRENT_SOURCE_DIR}/../licensecomment.txt
|
--license-file=${CMAKE_CURRENT_SOURCE_DIR}/../licensecomment.txt
|
||||||
${typesystem_prefix}.xml
|
${typesystem_path}
|
||||||
--api-version=${SUPPORTED_QT_VERSION}
|
--api-version=${SUPPORTED_QT_VERSION}
|
||||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
COMMENT "Running generator for ${module_name}...")
|
COMMENT "Running generator for ${module_name}...")
|
||||||
|
|
|
||||||
|
|
@ -151,4 +151,5 @@ create_pyside_module(QtCore
|
||||||
QtCore_libraries
|
QtCore_libraries
|
||||||
""
|
""
|
||||||
QtCore_typesystem_path
|
QtCore_typesystem_path
|
||||||
QtCore_SRC)
|
QtCore_SRC
|
||||||
|
"")
|
||||||
|
|
|
||||||
|
|
@ -2479,4 +2479,5 @@
|
||||||
<suppress-warning text="unmatched enum (sizeof(void*)<<3)"/>
|
<suppress-warning text="unmatched enum (sizeof(void*)<<3)"/>
|
||||||
<suppress-warning text="signature 'setCustomType(float)' for function modification in 'QEasingCurve' not found. Possible candidates: setCustomType(double) in QEasingCurve"/>
|
<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_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>
|
</typesystem>
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qdeclarativeview_wrapper.cpp
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qtdeclarative_module_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}
|
set(QtDeclarative_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
${QT_QTCORE_INCLUDE_DIR}
|
${QT_QTCORE_INCLUDE_DIR}
|
||||||
|
|
@ -55,5 +55,6 @@ create_pyside_module(QtDeclarative
|
||||||
QtDeclarative_libraries
|
QtDeclarative_libraries
|
||||||
QtDeclarative_deps
|
QtDeclarative_deps
|
||||||
QtDeclarative_typesystem_path
|
QtDeclarative_typesystem_path
|
||||||
QtDeclarative_SRC)
|
QtDeclarative_SRC
|
||||||
|
"")
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -373,6 +373,10 @@ ${SPECIFIC_OS_FILES}
|
||||||
${QtGui_46_SRC}
|
${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 QGtkStyle QtGui_SRC)
|
||||||
check_qt_class(QtGui QSessionManager QtGui_SRC)
|
check_qt_class(QtGui QSessionManager QtGui_SRC)
|
||||||
check_qt_class(QtGui QSizeGrip QtGui_SRC)
|
check_qt_class(QtGui QSizeGrip QtGui_SRC)
|
||||||
|
|
@ -407,5 +411,6 @@ create_pyside_module(QtGui
|
||||||
QtGui_libraries
|
QtGui_libraries
|
||||||
QtGui_deps
|
QtGui_deps
|
||||||
QtGui_typesystem_path
|
QtGui_typesystem_path
|
||||||
QtGui_SRC)
|
QtGui_SRC
|
||||||
|
"${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml")
|
||||||
|
|
||||||
|
|
|
||||||
6
PySide/QtGui/typesystem_gui.xml.in
Normal file
6
PySide/QtGui/typesystem_gui.xml.in
Normal file
|
|
@ -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>
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
<primitive-type name="Qt::HANDLE" target-lang-api-name="PyObject"/>
|
<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 '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" />
|
<suppress-warning text="enum 'QSysInfo::Endian' is specified in typesystem, but not declared" />
|
||||||
|
|
|
||||||
|
|
@ -31,5 +31,5 @@
|
||||||
<modify-function signature="handle()const" remove="all"/>
|
<modify-function signature="handle()const" remove="all"/>
|
||||||
</value-type>
|
</value-type>
|
||||||
|
|
||||||
<load-typesystem name="typesystem_gui.xml" generate="yes"/>
|
<load-typesystem name="typesystem_gui_commom.xml" generate="yes"/>
|
||||||
</typesystem>
|
</typesystem>
|
||||||
|
|
|
||||||
|
|
@ -10,5 +10,5 @@
|
||||||
|
|
||||||
<enum-type name="QPixmap::ShareMode"/>
|
<enum-type name="QPixmap::ShareMode"/>
|
||||||
|
|
||||||
<load-typesystem name="typesystem_gui.xml" generate="yes"/>
|
<load-typesystem name="typesystem_gui_commom.xml" generate="yes"/>
|
||||||
</typesystem>
|
</typesystem>
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ set(QtHelp_SRC
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtHelp/qthelp_module_wrapper.cpp
|
${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}
|
set(QtHelp_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
${QT_QTCORE_INCLUDE_DIR}
|
${QT_QTCORE_INCLUDE_DIR}
|
||||||
${QT_QTGUI_INCLUDE_DIR}
|
${QT_QTGUI_INCLUDE_DIR}
|
||||||
|
|
@ -38,4 +38,5 @@ create_pyside_module(QtHelp
|
||||||
QtHelp_libraries
|
QtHelp_libraries
|
||||||
QtHelp_deps
|
QtHelp_deps
|
||||||
QtHelp_typesystem_path
|
QtHelp_typesystem_path
|
||||||
QtHelp_SRC)
|
QtHelp_SRC
|
||||||
|
"")
|
||||||
|
|
|
||||||
|
|
@ -45,5 +45,6 @@ create_pyside_module(QtMaemo5
|
||||||
QtMaemo5_libraries
|
QtMaemo5_libraries
|
||||||
QtMaemo5_deps
|
QtMaemo5_deps
|
||||||
QtMaemo5_typesystem_path
|
QtMaemo5_typesystem_path
|
||||||
QtMaemo5_SRC)
|
QtMaemo5_SRC
|
||||||
|
"")
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ set(QtMultimedia_SRC
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/qvideoframe_wrapper.cpp
|
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/qvideoframe_wrapper.cpp
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/qtmultimedia_module_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}
|
set(QtMultimedia_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/
|
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/
|
||||||
|
|
@ -44,4 +44,5 @@ create_pyside_module(QtMultimedia
|
||||||
QtMultimedia_libraries
|
QtMultimedia_libraries
|
||||||
QtMultimedia_deps
|
QtMultimedia_deps
|
||||||
QtMultimedia_typesystem_path
|
QtMultimedia_typesystem_path
|
||||||
QtMultimedia_SRC)
|
QtMultimedia_SRC
|
||||||
|
"")
|
||||||
|
|
|
||||||
|
|
@ -68,4 +68,5 @@ create_pyside_module(QtNetwork
|
||||||
QtNetwork_libraries
|
QtNetwork_libraries
|
||||||
QtNetwork_deps
|
QtNetwork_deps
|
||||||
QtNetwork_typesystem_path
|
QtNetwork_typesystem_path
|
||||||
QtNetwork_SRC)
|
QtNetwork_SRC
|
||||||
|
"")
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ set(QtOpenGL_SRC
|
||||||
${QtOpenGL_47_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}
|
set(QtOpenGL_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
${QT_QTCORE_INCLUDE_DIR}
|
${QT_QTCORE_INCLUDE_DIR}
|
||||||
${QT_QTGUI_INCLUDE_DIR}
|
${QT_QTGUI_INCLUDE_DIR}
|
||||||
|
|
@ -54,4 +54,5 @@ create_pyside_module(QtOpenGL
|
||||||
QtOpenGL_libraries
|
QtOpenGL_libraries
|
||||||
QtOpenGL_deps
|
QtOpenGL_deps
|
||||||
QtOpenGL_typesystem_path
|
QtOpenGL_typesystem_path
|
||||||
QtOpenGL_SRC)
|
QtOpenGL_SRC
|
||||||
|
"")
|
||||||
|
|
|
||||||
|
|
@ -45,4 +45,5 @@ create_pyside_module(QtScript
|
||||||
QtScript_libraries
|
QtScript_libraries
|
||||||
QtScript_deps
|
QtScript_deps
|
||||||
QtScript_typesystem_path
|
QtScript_typesystem_path
|
||||||
QtScript_SRC)
|
QtScript_SRC
|
||||||
|
"")
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ set(QtScriptTools_SRC
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtScriptTools/qscriptenginedebugger_wrapper.cpp
|
${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}
|
set(QtScriptTools_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
${QT_QTCORE_INCLUDE_DIR}
|
${QT_QTCORE_INCLUDE_DIR}
|
||||||
|
|
@ -33,4 +33,5 @@ create_pyside_module(QtScriptTools
|
||||||
QtScriptTools_libraries
|
QtScriptTools_libraries
|
||||||
QtScriptTools_deps
|
QtScriptTools_deps
|
||||||
QtScriptTools_typesystem_path
|
QtScriptTools_typesystem_path
|
||||||
QtScriptTools_SRC)
|
QtScriptTools_SRC
|
||||||
|
"")
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ set(QtSql_SRC
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSql/qtsql_module_wrapper.cpp
|
${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}
|
set(QtSql_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
${QT_QTCORE_INCLUDE_DIR}
|
${QT_QTCORE_INCLUDE_DIR}
|
||||||
${QT_QTGUI_INCLUDE_DIR}
|
${QT_QTGUI_INCLUDE_DIR}
|
||||||
|
|
@ -43,4 +43,5 @@ create_pyside_module(QtSql
|
||||||
QtSql_libraries
|
QtSql_libraries
|
||||||
QtSql_deps
|
QtSql_deps
|
||||||
QtSql_typesystem_path
|
QtSql_typesystem_path
|
||||||
QtSql_SRC)
|
QtSql_SRC
|
||||||
|
"")
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSvg/qsvgwidget_wrapper.cpp
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSvg/qtsvg_module_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}
|
set(QtSvg_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSvg/
|
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtSvg/
|
||||||
${QT_INCLUDE_DIR}
|
${QT_INCLUDE_DIR}
|
||||||
|
|
@ -31,4 +31,5 @@ create_pyside_module(QtSvg
|
||||||
QtSvg_libraries
|
QtSvg_libraries
|
||||||
QtSvg_deps
|
QtSvg_deps
|
||||||
QtSvg_typesystem_path
|
QtSvg_typesystem_path
|
||||||
QtSvg_SRC)
|
QtSvg_SRC
|
||||||
|
"")
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/qtest_wrapper.cpp
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/qttest_module_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}
|
set(QtTest_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/
|
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtTest/
|
||||||
${QT_INCLUDE_DIR}
|
${QT_INCLUDE_DIR}
|
||||||
|
|
@ -29,4 +29,5 @@ create_pyside_module(QtTest
|
||||||
QtTest_libraries
|
QtTest_libraries
|
||||||
QtTest_deps
|
QtTest_deps
|
||||||
QtTest_typesystem_path
|
QtTest_typesystem_path
|
||||||
QtTest_SRC)
|
QtTest_SRC
|
||||||
|
"")
|
||||||
|
|
|
||||||
|
|
@ -48,6 +48,7 @@
|
||||||
<enum-type name="QTest::MouseAction"/>
|
<enum-type name="QTest::MouseAction"/>
|
||||||
<enum-type name="QTest::SkipMode"/>
|
<enum-type name="QTest::SkipMode"/>
|
||||||
<enum-type name="QTest::TestFailMode"/>
|
<enum-type name="QTest::TestFailMode"/>
|
||||||
|
<enum-type name="QTest::QBenchmarkMetric" since="4.7"/>
|
||||||
|
|
||||||
<rejection class="QSignalSpy"/>
|
<rejection class="QSignalSpy"/>
|
||||||
<rejection class="QTestEventList"/>
|
<rejection class="QTestEventList"/>
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ set(QtUiTools_SRC
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtUiTools/quiloader_wrapper.cpp
|
${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}
|
set(QtUiTools_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
${QT_QTCORE_INCLUDE_DIR}
|
${QT_QTCORE_INCLUDE_DIR}
|
||||||
${QT_QTGUI_INCLUDE_DIR}
|
${QT_QTGUI_INCLUDE_DIR}
|
||||||
|
|
@ -29,4 +29,5 @@ create_pyside_module(QtUiTools
|
||||||
QtUiTools_libraries
|
QtUiTools_libraries
|
||||||
QtUiTools_deps
|
QtUiTools_deps
|
||||||
QtUiTools_typesystem_path
|
QtUiTools_typesystem_path
|
||||||
QtUiTools_SRC)
|
QtUiTools_SRC
|
||||||
|
"")
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebKit/webcore_wrapper.cpp
|
||||||
${QtWebKit_46_SRC}
|
${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}
|
set(QtWebkit_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebkit/
|
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtWebkit/
|
||||||
${QT_INCLUDE_DIR}
|
${QT_INCLUDE_DIR}
|
||||||
|
|
@ -57,5 +57,6 @@ create_pyside_module(QtWebKit
|
||||||
QtWebKit_libraries
|
QtWebKit_libraries
|
||||||
QtWebKit_deps
|
QtWebKit_deps
|
||||||
QtWebKit_typesystem_path
|
QtWebKit_typesystem_path
|
||||||
QtWebKit_SRC)
|
QtWebKit_SRC
|
||||||
|
"")
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -56,4 +56,5 @@ create_pyside_module(QtXml
|
||||||
QtXml_libraries
|
QtXml_libraries
|
||||||
QtXml_deps
|
QtXml_deps
|
||||||
QtXml_typesystem_path
|
QtXml_typesystem_path
|
||||||
QtXml_SRC)
|
QtXml_SRC
|
||||||
|
"")
|
||||||
|
|
|
||||||
|
|
@ -45,5 +45,6 @@ create_pyside_module(QtXmlPatterns
|
||||||
QtXmlPatterns_libraries
|
QtXmlPatterns_libraries
|
||||||
QtXmlPatterns_deps
|
QtXmlPatterns_deps
|
||||||
QtXmlPatterns_typesystem_path
|
QtXmlPatterns_typesystem_path
|
||||||
QtXmlPatterns_SRC)
|
QtXmlPatterns_SRC
|
||||||
|
"")
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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_wrapper.cpp
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/PySide/phonon/phonon_backendcapabilities_notifierwrapper_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}
|
set(phonon_include_dirs ${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
${QT_QTCORE_INCLUDE_DIR}
|
${QT_QTCORE_INCLUDE_DIR}
|
||||||
${QT_QTGUI_INCLUDE_DIR}
|
${QT_QTGUI_INCLUDE_DIR}
|
||||||
|
|
@ -66,4 +66,5 @@ create_pyside_module(phonon
|
||||||
phonon_libraries
|
phonon_libraries
|
||||||
phonon_deps
|
phonon_deps
|
||||||
phonon_typesystem_path
|
phonon_typesystem_path
|
||||||
phonon_SRC)
|
phonon_SRC
|
||||||
|
"")
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue