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

Fix phonon compilation and detection of VideoCaptureDevice class.

Browse source 
Reviewer: Lauro Moura <lauro.neto@openbossa.org>
          Renato Araújo <renato.filho@openbossa.org>
This commit is contained in:
Hugo Parente Lima 2011-02-10 20:16:58 -02:00
commit 7d80ac8e29
3 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
PySide/phonon/optional/VideoCaptureDevice.xml Normal file
View file

@ -0,0 +1,5 @@
<value-type name="VideoCaptureDevice">
<modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/>
<modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/>
<modify-function signature="fromIndex(int)" remove="all"/>
</value-type>

5
PySide/phonon/typesystem_phonon.xml
View file

@ -184,11 +184,6 @@
<modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/> <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/>
<modify-function signature="fromIndex(int)" remove="all"/> <modify-function signature="fromIndex(int)" remove="all"/>
</value-type> </value-type>
<value-type name="VideoCaptureDevice">
<modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/>
<modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/>
<modify-function signature="fromIndex(int)" remove="all"/>
</value-type>
<value-type name="AudioChannelDescription"> <value-type name="AudioChannelDescription">
<modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/> <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/>
<modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/> <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/>

9
cmake/Macros/PySideModules.cmake
View file

@ -63,15 +63,15 @@ endmacro()
#macro(check_qt_class_with_namespace module namespace class global_sources commom_xml class_xml [namespace] [module]) #macro(check_qt_class_with_namespace module namespace class global_sources commom_xml class_xml [namespace] [module])
macro(check_qt_class module class global_sources commom_xml) macro(check_qt_class module class global_sources commom_xml)
if (${ARGC} GREATER 4) if (${ARGC} GREATER 4)
set (namespace ${ARGV3}) set (namespace ${ARGV4})
string(TOLOWER ${namespace} _namespace) string(TOLOWER ${namespace} _namespace)
else () else ()
set (namespace "") set (namespace "")
endif () endif ()
if (${ARGC} GREATER 5) if (${ARGC} GREATER 5)
set (include_file ${ARGV4}) set (include_file ${ARGV5})
else () else ()
set (include_file ${module}) set (include_file ${class})
endif () endif ()
string(TOLOWER ${class} _class) string(TOLOWER ${class} _class)
string(TOUPPER ${module} _module) string(TOUPPER ${module} _module)
@ -93,9 +93,8 @@ macro(check_qt_class module class global_sources commom_xml)
set(SRC_FILE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/test${class}.cxx) set(SRC_FILE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/test${class}.cxx)
file(WRITE ${SRC_FILE} file(WRITE ${SRC_FILE}
"#include <${include_file}>\n" "#include <${include_file}>\n"
"#include <typeinfo>\n"
"${NAMESPACE_USE}\n" "${NAMESPACE_USE}\n"
"int main() { typeid(${class}); }\n" "int main() { sizeof(${class}); }\n"
) )
try_compile(Q_WORKS ${CMAKE_BINARY_DIR} try_compile(Q_WORKS ${CMAKE_BINARY_DIR}
${SRC_FILE} ${SRC_FILE}