From bbb1b7ef98d35f8cb03c827c05814fd942f46840 Mon Sep 17 00:00:00 2001
From: Hugo Lima <hugo.lima@openbossa.org>
Date: Tue, 23 Mar 2010 14:36:48 -0300
Subject: Fix CMakeLists and typesystem of qtmultimedia to use the right
 typesystem file from QtGui.

---
 PySide/QtMultimedia/typesystem_multimedia.xml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'PySide/QtMultimedia/typesystem_multimedia.xml')

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&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="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>
-- 
cgit v1.2.3