casa-mp-base

--- generator/typesystem_core-common.xml.orig   2015-03-20 18:01:15.000000000 +0100

+++ generator/typesystem_core-common.xml    2015-03-20 18:01:39.000000000 +0100

@@ -1387,7 +1387,6 @@

   <object-type name="QFutureIterator" generate="no">

     <modify-function signature="operator=(const QFuture&amp;)" remove="all" />

   </object-type>

-  <object-type name="QtScriptFutureIterator" generic-class="yes" java-name="QFutureIterator" />

   <object-type name="QRunnable" />

--- generator/typesystem_core-qtscript.xml.orig 2015-03-20 18:01:15.000000000 +0100

+++ generator/typesystem_core-qtscript.xml  2015-03-20 18:01:49.000000000 +0100

@@ -1115,13 +1115,6 @@

       <modify-function signature="futures()const" remove="all" />

   </object-type>

-  <object-type name="QtScriptFutureIterator">

-    <modify-function signature="QFutureIterator(const QFuture &amp;)">

-        <modify-argument index="1">

-            <replace-type modified-type="QtScriptFuture" />

-        </modify-argument>

-    </modify-function>       

-  </object-type>

   <!-- QXMLStream stream stuff. This was moved from QtXml to QtCore in 4.4 -->

--- generator/typesystem_core.xml.orig  2015-03-20 18:01:15.000000000 +0100

+++ generator/typesystem_core.xml   2015-03-20 18:01:56.000000000 +0100

@@ -2452,13 +2452,6 @@

   <object-type name="QFutureIterator" generate="no">

     <modify-function signature="operator=(const QFuture&amp;)" remove="all"/>

   </object-type>

-  <object-type name="QtScriptFutureIterator" generic-class="yes" java-name="QFutureIterator">

-    <modify-function signature="QFutureIterator(const QFuture &amp;)">

-        <modify-argument index="1">

-            <replace-type modified-type="QtScriptFuture"/>

-        </modify-argument>

-    </modify-function>       

-  </object-type>

   <object-type name="QRunnable"/>

--- qtbindings/qtscript_core/qtscriptconcurrent.h.orig  2012-01-23 12:30:03.000000000 +0100

+++ qtbindings/qtscript_core/qtscriptconcurrent.h   2015-03-20 18:01:59.000000000 +0100

@@ -55,7 +55,6 @@

 typedef QFuture<QScriptValue> QtScriptFuture;

 typedef QFutureWatcher<QScriptValue> QtScriptFutureWatcher;

 typedef QFutureSynchronizer<QScriptValue> QtScriptFutureSynchronizer;

-typedef QFutureIterator<QScriptValue> QtScriptFutureIterator;

 #endif // QT_NO_CONCURRENT