diff options
| author | Hugo Lima <hugo.lima@openbossa.org> | 2010-03-23 14:36:48 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.lima@openbossa.org> | 2010-04-12 17:30:01 -0300 |
| commit | bbb1b7ef98d35f8cb03c827c05814fd942f46840 (patch) | |
| tree | be634ea35263380658ad57ccb6da224d53117d7d /PySide/QtMultimedia | |
| parent | 354b8b6cea7b3f8ae1c95d20d48c598da5c6cbdc (diff) | |
Fix CMakeLists and typesystem of qtmultimedia to use the right typesystem file from QtGui.
Diffstat (limited to 'PySide/QtMultimedia')
| -rw-r--r-- | PySide/QtMultimedia/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | PySide/QtMultimedia/typesystem_multimedia.xml | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/PySide/QtMultimedia/CMakeLists.txt b/PySide/QtMultimedia/CMakeLists.txt index ec8c1a64a..d0a8e8af8 100644 --- a/PySide/QtMultimedia/CMakeLists.txt +++ b/PySide/QtMultimedia/CMakeLists.txt @@ -13,7 +13,7 @@ set(QtMultimedia_SRC ${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} ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtMultimedia/ diff --git a/PySide/QtMultimedia/typesystem_multimedia.xml b/PySide/QtMultimedia/typesystem_multimedia.xml index d523dba97..556f4b609 100644 --- a/PySide/QtMultimedia/typesystem_multimedia.xml +++ b/PySide/QtMultimedia/typesystem_multimedia.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <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<QAudioEngineFactoryInterface*>"/> <rejection class="" function-name="qobject_interface_iid<QAudioEngineFactoryInterface*>"/> @@ -48,18 +48,15 @@ <modify-function signature="preferredFormat()const" remove="all"/> <modify-function signature="availableDevices(QAudio::Mode)" remove="all"/> </object-type> - <object-type name="QAudioFormat"/> - <!-- DONE TODO TESTCASE check ctor setParent() --> + <value-type name="QAudioFormat"/> <!-- TODO TESTCASE start() check reference-count --> <object-type name="QAudioInput"> <modify-function signature="format()const" remove="all"/> </object-type> - <!-- DONE TODO TESTCASE check ctor setParent() --> <!-- TODO TESTCASE start() check reference-count --> <object-type name="QAudioOutput"> <modify-function signature="format()const" remove="all"/> </object-type> <!-- TODO TESTCASE don't increment the reference count of the video buffer --> <object-type name="QVideoFrame"/> - </typesystem> |