jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix CMakeLists and typesystem of qtmultimedia to use the right typesystem file from QtGui.

Browse source
This commit is contained in:
Hugo Lima 2010-03-23 14:36:48 -03:00 • committed by Hugo Parente Lima
commit bbb1b7ef98
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PySide/QtMultimedia/CMakeLists.txt
View file

@ -13,7 +13,7 @@ set(QtMultimedia_SRC
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/qtmultimedia_module_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/qtmultimedia_module_wrapper.cpp
) )
execute_generator(multimedia QtMultimedia_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}") execute_generator(multimedia QtMultimedia_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtGui_SOURCE_DIR}:${QtGui_BINARY_DIR}")
include_directories(${CMAKE_CURRENT_SOURCE_DIR} include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/

7
PySide/QtMultimedia/typesystem_multimedia.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<typesystem package="PySide.QtMultimedia"> <typesystem package="PySide.QtMultimedia">
<load-typesystem name="typesystem_gui.xml.in" generate="no" /> <load-typesystem name="typesystem_gui.xml" generate="no" />
<rejection class="" function-name="qobject_cast&lt;QAudioEngineFactoryInterface*&gt;"/> <rejection class="" function-name="qobject_cast&lt;QAudioEngineFactoryInterface*&gt;"/>
<rejection class="" function-name="qobject_interface_iid&lt;QAudioEngineFactoryInterface*&gt;"/> <rejection class="" function-name="qobject_interface_iid&lt;QAudioEngineFactoryInterface*&gt;"/>
@ -48,18 +48,15 @@
<modify-function signature="preferredFormat()const" remove="all"/> <modify-function signature="preferredFormat()const" remove="all"/>
<modify-function signature="availableDevices(QAudio::Mode)" remove="all"/> <modify-function signature="availableDevices(QAudio::Mode)" remove="all"/>
</object-type> </object-type>
<object-type name="QAudioFormat"/> <value-type name="QAudioFormat"/>
<!-- DONE TODO TESTCASE check ctor setParent() -->
<!-- TODO TESTCASE start() check reference-count --> <!-- TODO TESTCASE start() check reference-count -->
<object-type name="QAudioInput"> <object-type name="QAudioInput">
<modify-function signature="format()const" remove="all"/> <modify-function signature="format()const" remove="all"/>
</object-type> </object-type>
<!-- DONE TODO TESTCASE check ctor setParent() -->
<!-- TODO TESTCASE start() check reference-count --> <!-- TODO TESTCASE start() check reference-count -->
<object-type name="QAudioOutput"> <object-type name="QAudioOutput">
<modify-function signature="format()const" remove="all"/> <modify-function signature="format()const" remove="all"/>
</object-type> </object-type>
<!-- TODO TESTCASE don't increment the reference count of the video buffer --> <!-- TODO TESTCASE don't increment the reference count of the video buffer -->
<object-type name="QVideoFrame"/> <object-type name="QVideoFrame"/>
</typesystem> </typesystem>