summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.pl@gmail.com>2011-02-10 20:16:58 -0200
committerHugo Parente Lima <hugo.pl@gmail.com>2011-02-11 15:09:53 -0200
commit7d80ac8e292df3a24cb8406a46075cea73e79cf2 (patch)
treed042b34d0cf9de9d65b70bad1a25dfa96f3a6213
parent26d6f4a39e9a00ce744f0f24c7f2b73bcf8cec68 (diff)
downloadpyside-7d80ac8e292df3a24cb8406a46075cea73e79cf2.tar.gz
pyside-7d80ac8e292df3a24cb8406a46075cea73e79cf2.tar.xz
pyside-7d80ac8e292df3a24cb8406a46075cea73e79cf2.zip
Fix phonon compilation and detection of VideoCaptureDevice class.
Reviewer: Lauro Moura <lauro.neto@openbossa.org> Renato Ara├║jo <renato.filho@openbossa.org>
-rw-r--r--PySide/phonon/optional/VideoCaptureDevice.xml5
-rw-r--r--PySide/phonon/typesystem_phonon.xml5
-rw-r--r--cmake/Macros/PySideModules.cmake9
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 0000000..9b3e554
--- /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 226560e..a954fcd 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 9739bc4..8b1d20a 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}