diff options
| -rw-r--r-- | PySide/phonon/optional/VideoCaptureDevice.xml | 5 | ||||
| -rw-r--r-- | PySide/phonon/typesystem_phonon.xml | 5 | ||||
| -rw-r--r-- | cmake/Macros/PySideModules.cmake | 9 |
3 files changed, 9 insertions, 10 deletions
diff --git a/PySide/phonon/optional/VideoCaptureDevice.xml b/PySide/phonon/optional/VideoCaptureDevice.xml new file mode 100644 index 000000000..9b3e554b0 --- /dev/null +++ b/PySide/phonon/optional/VideoCaptureDevice.xml @@ -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> diff --git a/PySide/phonon/typesystem_phonon.xml b/PySide/phonon/typesystem_phonon.xml index 226560ecf..a954fcd0d 100644 --- a/PySide/phonon/typesystem_phonon.xml +++ b/PySide/phonon/typesystem_phonon.xml @@ -184,11 +184,6 @@ <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/> <modify-function signature="fromIndex(int)" remove="all"/> </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"> <modify-function signature="operator==(Phonon::ObjectDescription)const" remove="all"/> <modify-function signature="operator!=(Phonon::ObjectDescription)const" remove="all"/> diff --git a/cmake/Macros/PySideModules.cmake b/cmake/Macros/PySideModules.cmake index 516201c0d..07c118c8d 100644 --- a/cmake/Macros/PySideModules.cmake +++ b/cmake/Macros/PySideModules.cmake @@ -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 module class global_sources commom_xml) if (${ARGC} GREATER 4) - set (namespace ${ARGV3}) + set (namespace ${ARGV4}) string(TOLOWER ${namespace} _namespace) else () set (namespace "") endif () if (${ARGC} GREATER 5) - set (include_file ${ARGV4}) + set (include_file ${ARGV5}) else () - set (include_file ${module}) + set (include_file ${class}) endif () string(TOLOWER ${class} _class) 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) file(WRITE ${SRC_FILE} "#include <${include_file}>\n" - "#include <typeinfo>\n" "${NAMESPACE_USE}\n" - "int main() { typeid(${class}); }\n" + "int main() { sizeof(${class}); }\n" ) try_compile(Q_WORKS ${CMAKE_BINARY_DIR} ${SRC_FILE} |