diff --git a/generator/merge.sh b/generator/merge.sh
new file mode 100755
index 0000000..1c7d8ab
--- /dev/null
+++ b/generator/merge.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+xsltproc -o typesystem_core.xml --stringparam source 'typesystem_core-qtscript.xml'  merge.xsl typesystem_core-common.xml
+xsltproc -o typesystem_gui.xml --stringparam source 'typesystem_gui-qtscript.xml'  merge.xsl typesystem_gui-common.xml
+xsltproc -o typesystem_opengl.xml --stringparam source 'typesystem_opengl-qtscript.xml'  merge.xsl typesystem_opengl-common.xml
+xsltproc -o typesystem_network.xml --stringparam source 'typesystem_network-qtscript.xml'  merge.xsl typesystem_network-common.xml
+xsltproc -o typesystem_xml.xml --stringparam source 'typesystem_xml-qtscript.xml'  merge.xsl typesystem_xml-common.xml
+xsltproc -o typesystem_webkit.xml --stringparam source 'typesystem_webkit-qtscript.xml'  merge.xsl typesystem_webkit-common.xml
+xsltproc -o typesystem_sql.xml --stringparam source 'typesystem_sql-qtscript.xml'  merge.xsl typesystem_sql-common.xml
+xsltproc -o typesystem_svg.xml --stringparam source 'typesystem_svg-qtscript.xml'  merge.xsl typesystem_svg-common.xml
+xsltproc -o typesystem_xmlpatterns.xml --stringparam source 'typesystem_xmlpatterns-qtscript.xml'  merge.xsl typesystem_xmlpatterns-common.xml
\ No newline at end of file
diff --git a/generator/parser/rpp/pp-engine-bits.h b/generator/parser/rpp/pp-engine-bits.h
index a167dfc..4c8cf4b 100644
--- a/generator/parser/rpp/pp-engine-bits.h
+++ b/generator/parser/rpp/pp-engine-bits.h
@@ -383,6 +383,7 @@ template <typename _InputIterator, typename _OutputIterator>
 _InputIterator pp::handle_include (bool __skip_current_path, _InputIterator __first, _InputIterator __last,
       _OutputIterator __result)
 {
+  std::cout << env.current_file << std::endl;
   if (pp_isalpha (*__first) || *__first == '_')
     {
       pp_macro_expander expand_include (env);
@@ -390,7 +391,8 @@ _InputIterator pp::handle_include (bool __skip_current_path, _InputIterator __fi
       name.reserve (255);
       expand_include (__first, __last, std::back_inserter (name));
       std::string::iterator it = skip_blanks (name.begin (), name.end ());
-      assert (it != name.end () && (*it == '<' || *it == '"'));
+      printf("%s", name.c_str());
+      assert((it != name.end () && (*it == '<' || *it == '"')));
       handle_include (__skip_current_path, it, name.end (), __result);
       return __first;
     }
@@ -416,7 +418,7 @@ _InputIterator pp::handle_include (bool __skip_current_path, _InputIterator __fi
 
   std::string filepath;
   FILE *fp = find_include_file (filename, &filepath, quote == '>' ? INCLUDE_GLOBAL : INCLUDE_LOCAL, __skip_current_path);
-
+  
 #if defined (PP_HOOK_ON_FILE_INCLUDED)
       PP_HOOK_ON_FILE_INCLUDED (env.current_file, fp ? filepath : filename, fp);
 #endif
diff --git a/generator/setupgenerator.cpp b/generator/setupgenerator.cpp
index 492f7de..e021dc4 100644
--- a/generator/setupgenerator.cpp
+++ b/generator/setupgenerator.cpp
@@ -123,7 +123,7 @@ void SetupGenerator::generate()
       }
       
       // declare individual class creation functions
-      s << "void PythonQt_init_" << shortPackName << "() {" << endl;
+      s << "void PythonQt_init_" << shortPackName << "(PyObject* module) {" << endl;
 
       if (shortPackName.endsWith("Builtin")) {
         shortPackName = shortPackName.mid(0, shortPackName.length()-strlen("builtin"));
@@ -135,12 +135,14 @@ void SetupGenerator::generate()
         QString shellCreator;
         if (cls->generateShellClass()) {
           shellCreator = ", PythonQtSetInstanceWrapperOnShell<" + ShellGenerator::shellClassName(cls) + ">";
+        } else {
+          shellCreator = ", NULL";
         }
         if (cls->isQObject()) {
-          s << "PythonQt::self()->registerClass(&" << cls->qualifiedCppName() << "::staticMetaObject, \"" << shortPackName <<"\", PythonQtCreateObject<PythonQtWrapper_" << cls->name() << ">" << shellCreator << ");" << endl;
+          s << "PythonQt::priv()->registerClass(&" << cls->qualifiedCppName() << "::staticMetaObject, \"" << shortPackName <<"\", PythonQtCreateObject<PythonQtWrapper_" << cls->name() << ">" << shellCreator << ", module);" << endl;
         } else {
           QString baseName = cls->baseClass()?cls->baseClass()->qualifiedCppName():"";
-          s << "PythonQt::self()->registerCPPClass(\""<< cls->qualifiedCppName() << "\", \"" << baseName << "\", \"" << shortPackName <<"\", PythonQtCreateObject<PythonQtWrapper_" << cls->name() << ">" << shellCreator << ");" << endl;
+          s << "PythonQt::priv()->registerCPPClass(\""<< cls->qualifiedCppName() << "\", \"" << baseName << "\", \"" << shortPackName <<"\", PythonQtCreateObject<PythonQtWrapper_" << cls->name() << ">" << shellCreator << ", module);" << endl;
         }
         foreach(AbstractMetaClass* interface, cls->interfaces()) {
           // the interface might be our own class... (e.g. QPaintDevice)
diff --git a/generator/shellgenerator.cpp b/generator/shellgenerator.cpp
index 61d8a04..7666785 100644
--- a/generator/shellgenerator.cpp
+++ b/generator/shellgenerator.cpp
@@ -52,8 +52,7 @@ bool ShellGenerator::shouldGenerate(const AbstractMetaClass *meta_class) const
     if (meta_class->name().startsWith("Global")) return false;
     if (meta_class->name().startsWith("QStyleOptionComplex")) return false;
     if (meta_class->name().startsWith("QTextLayout")) return false;
-    //if (meta_class->name().startsWith("QTextStream")) return false; // because of >> operators
-    //if (meta_class->name().startsWith("QDataStream")) return false; // "
+    if (meta_class->name().startsWith("QPersistentModelIndex")) return false;
     return ((cg & TypeEntry::GenerateCode) != 0);
 }
 
diff --git a/generator/shellimplgenerator.cpp b/generator/shellimplgenerator.cpp
index d2d9158..ba30a51 100644
--- a/generator/shellimplgenerator.cpp
+++ b/generator/shellimplgenerator.cpp
@@ -42,6 +42,7 @@
 #include "shellimplgenerator.h"
 #include "reporthandler.h"
 #include "fileout.h"
+#include <iostream>
 
 extern void declareFunctionMetaTypes(QTextStream &stream,
                                      const AbstractMetaFunctionList &functions,
@@ -61,12 +62,18 @@ static void writeHelperCode(QTextStream &s, const AbstractMetaClass *)
 {
 }
 
+
+
 void ShellImplGenerator::write(QTextStream &s, const AbstractMetaClass *meta_class)
 {
   QString builtIn = ShellGenerator::isBuiltIn(meta_class->name())?"_builtin":"";
   QString pro_file_name = meta_class->package().replace(".", "_") + builtIn + "/" + meta_class->package().replace(".", "_") + builtIn + ".pri";
   priGenerator->addSource(pro_file_name, fileNameForClass(meta_class));
 
+  foreach (AbstractMetaField* field, meta_class->fields()) {
+    std::cout << "Not yet generated fields: " << meta_class->qualifiedCppName().toLatin1().data() << "::" << field->name().toLatin1().data() << std::endl;
+  }
+  
   s << "#include \"PythonQtWrapper_" << meta_class->name() << ".h\"" << endl << endl;
 
   s << "#include <PythonQtSignalReceiver.h>" << endl;
diff --git a/generator/typesystem_core-common.xml b/generator/typesystem_core-common.xml
index 51bf2dd..153f092 100644
--- a/generator/typesystem_core-common.xml
+++ b/generator/typesystem_core-common.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <typesystem>
 
+  <value-type name="QModelIndex"/>
   <rejection class="*" function-name="d_func"/>
   <rejection class="*" function-name="data_ptr"/>
   <rejection class="*" function-name="detach"/>
@@ -9,7 +10,8 @@
   <rejection class="*" field-name="d_ptr"/>
   <rejection class="*" field-name="d"/>
 
-  <rejection class="" enum-name="QtValidLicenseForTestModule"/>  
+  <rejection class="" enum-name="QtValidLicenseForTestModule"/>
+
 
   <rejection class="" enum-name="QtValidLicenseForDBusModule"/>
   <rejection class="" enum-name="QtValidLicenseForSqlModule"/>
@@ -26,8 +28,17 @@
   <rejection class="" enum-name="QtValidLicenseForGuiModule"/>
   <rejection class="" enum-name="QtValidLicenseForScriptModule"/>
   <rejection class="" enum-name="QtValidLicenseForHelpModule"/>
+  <rejection class="" enum-name="QtValidLicenseForScriptToolsModule" />
+  <rejection class="" enum-name="QtValidLicenseForMultimediaModule" />
+  <rejection class="" enum-name="QtValidLicenseForOpenVGModule" />
+
   <rejection class="QtConcurrent" enum-name="enum_1" />
+  <rejection class="QtConcurrent" function-name="operator|" />
+
+  <rejection class="Qt" enum-name="Modifier" />
 
+  <rejection class="QSharedPointer" />
+  <rejection class="QWeakPointer" />
   <rejection class="QFuture::const_iterator" />
   <rejection class="QFutureInterface" />
   <rejection class="QFutureInterfaceBase" />
@@ -48,6 +59,7 @@
   <rejection class="QtConcurrent::Median"/>
   <rejection class="QtConcurrent::MemberFunctionWrapper"/>
   <rejection class="QtConcurrent::MemberFunctionWrapper1"/>
+  <rejection class="QtConcurrent::qValueType" />
   <rejection class="QtConcurrent::ReduceKernel"/>
   <rejection class="QtConcurrent::ResultItem"/>
   <rejection class="QtConcurrent::ResultIterator"/>
@@ -176,7 +188,7 @@
   <rejection class="QtConcurrent::VoidStoredMemberFunctionPointerCall5"/>
 
   <rejection class="QMdi" />
-  <rejection class="stdext" /> 
+  <rejection class="stdext" />
   <rejection class="QAlgorithmsPrivate"/>
   <rejection class="QAtomic"/>
   <rejection class="QAtomicPointer"/>
@@ -184,11 +196,26 @@
   <rejection class="QBasicAtomicInt" />
   <rejection class="QBasicAtomic"/>
   <rejection class="QBasicAtomicPointer"/>
+  <rejection class="QScopedPointer"/>
+  <rejection class="QScopedArrayPointer" />
+  <rejection class="QScopedPointer" />
+  <rejection class="QScopedPointerArrayDeleter" />
+  <rejection class="QScopedPointerDeleter" />
+  <rejection class="QScopedPointerPodDeleter" />
+  <rejection class="QScopedPointerSharedDeleter" />
+  <rejection class="QScopedSharedPointer" />
+  <rejection class="QCustomScopedPointer" />
+  <rejection class="QStringBuilder" />
+
   <rejection class="QBitRef"/>
   <rejection class="QCache"/>
+  <rejection class="QContiguousCache"/>
+  <rejection class="QContiguousCacheData"/>
+  <rejection class="QContiguousCacheTypedData"/>
   <rejection class="QCharRef"/>
   <rejection class="QDebug"/>
-  <rejection class="QExplicitlySharedDataPointer"/>  
+  <rejection class="QNoDebug" />
+  <rejection class="QExplicitlySharedDataPointer"/>
   <rejection class="QFlag"/>
   <rejection class="QFlags"/>
   <rejection class="QForeachContainer"/>
@@ -209,6 +236,7 @@
   <rejection class="QHashNode"/>
   <rejection class="QHashNode"/>
   <rejection class="QInternal"/>
+  <rejection class="QIncompatibleFlag" />
   <rejection class="QLibrary"/>
   <rejection class="QLinkedList"/>
   <rejection class="QLinkedListData"/>
@@ -217,6 +245,8 @@
   <rejection class="QListData"/>
   <rejection class="QListIterator"/>
   <rejection class="QMap"/>
+  <rejection class="QMapNode" />
+  <rejection class="QMapPayloadNode" />
   <rejection class="QMapData"/>
   <rejection class="QMapIterator"/>
   <rejection class="QMetaType"/>
@@ -248,7 +278,7 @@
   <rejection class="QSharedDataPointer"/>
   <rejection class="QStack"/>
   <rejection class="QSysInfo"/>
-  <rejection class="QTextStreamManipulator"/>    
+  <rejection class="QTextStreamManipulator"/>
   <rejection class="QThreadStorage"/>
   <rejection class="QThreadStorageData"/>
   <rejection class="QTypeInfo"/>
@@ -256,7 +286,7 @@
   <rejection class="QVFbKeyData"/>
   <rejection class="QVariantComparisonHelper"/>
   <rejection class="QVectorData"/>
-  <rejection class="QVectorIterator"/>  
+  <rejection class="QVectorIterator"/>
   <rejection class="QVectorTypedData"/>
   <rejection class="QWriteLocker"/>
   <rejection class="QtPrivate"/>
@@ -275,12 +305,20 @@
   <rejection class="QSubString"/>
   <rejection class="QUintForType"/>
   <rejection class="QtConcurrent::internal" />
+  <rejection class="QByteArrayMatcher::Data" />
+  <rejection class="QStringMatcher::Data" />
+
+  <rejection class="StringBuilder" />
+  <rejection class="QConcatenable" />
+  <rejection class="QLatin1Literal" />
+  <rejection class="QIntegerForSizeof" />
+
 
-  <rejection class="QLocale::Data" />  
+  <rejection class="QLocale::Data" />
   <rejection class="QGlobalStaticDeleter" />
   <rejection class="QSharedMemory" /> <!-- Temporarily until we know how to implement it in Java -->
   <rejection class="QVarLengthArray" />
-  
+
   <!-- DBus -->
   <rejection class="QDBusAbstractAdaptor" />
   <rejection class="QDBusAbstractInterface" />
@@ -297,7 +335,7 @@
   <rejection class="QDBusServer" />
   <rejection class="QDBusSignature" />
   <rejection class="QDBusVariant" />
-   
+
   <rejection class="_Revbidit" />
   <rejection class="_complex" />
   <rejection class="_exception" />
@@ -312,10 +350,11 @@
   <rejection class="stat" />
   <rejection class="tm" />
 
+  <rejection class="Qt" enum-name="Initialization" />
+
   <rejection class="QAbstractEventDispatcher" function-name="filterEvent"/>
   <rejection class="QAbstractEventDispatcher" function-name="setEventFilter"/>
-  <rejection class="QAbstractFileEngine" function-name="beginEntryList"/>
-  <rejection class="QAbstractFileEngine" function-name="endEntryList"/>
+
   <rejection class="QAbstractFileEngine" function-name="extension"/>
   <rejection class="QCoreApplication" function-name="compressEvent"/>
   <rejection class="QCoreApplication" function-name="eventFilter"/>
@@ -340,7 +379,7 @@
   <rejection class="QList" function-name="node_destruct"/>
   <rejection class="QList" function-name="toSet"/>
   <rejection class="QObject" function-name="receivers"/>
-  <rejection class="QObject" function-name="findChild"/>   
+  <rejection class="QObject" function-name="findChild"/>
   <rejection class="QObject" function-name="findChildren"/>
   <rejection class="QObject" function-name="setUserData"/>
   <rejection class="QObject" function-name="userData"/>
@@ -350,6 +389,8 @@
   <rejection class="QObject" function-name="disconnect"/>
   <rejection class="QObject" function-name="disconnectNotify"/>
   <rejection class="QObject" function-name="registerUserData"/>
+  <rejection class="QObject" function-name="sender"/>
+  <rejection class="QTimer" function-name="singleShot"/>
   <rejection class="QProcess" function-name="pid"/>
   <rejection class="QRegion" function-name="cleanUp"/>
   <rejection class="QSettings" function-name="registerFormat"/>
@@ -366,23 +407,45 @@
   <rejection class="QVector" function-name="alloc"/>
   <rejection class="QVector" function-name="operator+="/>
   <rejection class="QAbstractFileEngineIterator" function-name="entryInfo"/>
-  
+  <rejection class="QtConcurrent::ThreadEngineBarrier" />
+
   <rejection class="QAbstractFileEngineIterator" enum-name="EntryInfoType"/>
   <rejection class="QDataStream" enum-name="ByteOrder"/>
-  
+
 
   <namespace-type name="Qt">
   </namespace-type>
 
+  <enum-type name="QDate::MonthNameType" />
+  <enum-type name="QAbstractAnimation::DeletionPolicy" />
+  <enum-type name="QAbstractAnimation::Direction" />
+  <enum-type name="QAbstractAnimation::State" />
+  <enum-type name="QDataStream::FloatingPointPrecision" />
+  <enum-type name="QEasingCurve::Type" />
+  <enum-type name="QHistoryState::HistoryType" />
+  <enum-type name="QState::ChildMode" />
+  <enum-type name="QStateMachine::Error" />
+  <enum-type name="QStateMachine::EventPriority" />
+  <enum-type name="QStateMachine::RestorePolicy" />
+  <enum-type name="Qt::AnchorPoint" />
+  <enum-type name="Qt::CoordinateSystem" />
+  <enum-type name="Qt::GestureState" />
+  <enum-type name="Qt::InputMethodHint" flags="Qt::InputMethodHints" />
+  <enum-type name="Qt::NavigationMode" />
+  <enum-type name="Qt::RenderHint" />
+  <enum-type name="Qt::TileRule" />
+  <enum-type name="Qt::TouchPointState" flags="Qt::TouchPointStates" />
 
   <enum-type name="QtMsgType">
     <reject-enum-value name="QtSystemMsg" />
   </enum-type>
 
+
+  <enum-type name="QReadWriteLock::RecursionMode" />
   <enum-type name="QSystemSemaphore::AccessMode" />
   <enum-type name="QSystemSemaphore::SystemSemaphoreError" />
   <enum-type name="QTextBoundaryFinder::BoundaryReason" flags="QTextBoundaryFinder::BoundaryReasons" />
-  <enum-type name="QTextBoundaryFinder::BoundaryType" />  
+  <enum-type name="QTextBoundaryFinder::BoundaryType" />
   <enum-type name="QAbstractFileEngine::Extension" extensible="yes"/>
   <enum-type name="QAbstractFileEngine::FileFlag" flags="QAbstractFileEngine::FileFlags"/>
   <enum-type name="QAbstractFileEngine::FileName"/>
@@ -458,7 +521,6 @@
   <enum-type name="Qt::KeyboardModifier" flags="Qt::KeyboardModifiers"/>
   <enum-type name="Qt::LayoutDirection"/>
   <enum-type name="Qt::MatchFlag" flags="Qt::MatchFlags"/>
-  <enum-type name="Qt::Modifier"/>
   <enum-type name="Qt::MouseButton" flags="Qt::MouseButtons"/>
   <enum-type name="Qt::Orientation" flags="Qt::Orientations"/>
   <enum-type name="Qt::PenCapStyle"/>
@@ -484,12 +546,13 @@
   <enum-type name="Qt::EventPriority"/>
   <enum-type name="Qt::MaskMode"/>
   <enum-type name="QCryptographicHash::Algorithm"/>
-  
+
   <enum-type name="QtConcurrent::ReduceOption" flags="QtConcurrent::ReduceOptions" />
   <enum-type name="QtConcurrent::ThreadFunctionResult" />
+ 
 
   <enum-type name="QCoreApplication::Encoding">
-    <reject-enum-value name="DefaultCodec"/> 
+    <reject-enum-value name="DefaultCodec"/>
   </enum-type>
 
   <enum-type name="Qt::AlignmentFlag" flags="Qt::Alignment">
@@ -512,9 +575,8 @@
   </enum-type>
 
 
-  <enum-type name="QDataStream::Version"> 
+  <enum-type name="QDataStream::Version">
     <reject-enum-value name="Qt_4_1"/>
-    <reject-enum-value name="Qt_4_5"/>
   </enum-type>
 
   <enum-type name="QDir::SortFlag" flags="QDir::SortFlags">
@@ -550,92 +612,149 @@
   <enum-type name="Qt::ToolBarArea" flags="Qt::ToolBarAreas">
     <reject-enum-value name="AllToolBarAreas"/>
   </enum-type>
-  
+
   <enum-type name="Qt::WidgetAttribute">
     <reject-enum-value name="WA_ForceAcceptDrops"/>
     <reject-enum-value name="WA_NoBackground"/>
     <reject-enum-value name="WA_MacMetalStyle"/>
   </enum-type>
-  
-  <value-type name="QBasicTimer"/>  
+
+  <value-type name="QProcessEnvironment" />
+  <value-type name="QBasicTimer"/>
   <value-type name="QByteArrayMatcher">
     <modify-function signature="operator=(QByteArrayMatcher)" remove="all"/>
   </value-type>
-  
-  <value-type name="QDate">    
+
+  <value-type name="QDate">
     <modify-function signature="julianToGregorian(uint,int&amp;,int&amp;,int&amp;)">
-        <remove/>
-    </modify-function>    
-  
-    <modify-function signature="setYMD(int, int, int)" remove="all"/> <!--### Obsolete in 4.3-->
+      <remove/>
+    </modify-function>
+
+    <modify-function signature="setYMD(int, int, int)" remove="all"/>
+    <!--### Obsolete in 4.3-->
   </value-type>
-  
+
   <value-type name="QDateTime">
     <modify-function signature="operator=(QDateTime)" remove="all"/>
   </value-type>
-  
+
   <value-type name="QDir">
     <modify-function signature="QDir(QString,QString,QFlags&lt;QDir::SortFlag&gt;,QFlags&lt;QDir::Filter&gt;)">
-        <modify-argument index="3">
-            <replace-default-expression with="SortFlag.Name, SortFlag.IgnoreCase"/>
-        </modify-argument>
-    </modify-function>  
+      <modify-argument index="3">
+        <replace-default-expression with="SortFlag.Name, SortFlag.IgnoreCase"/>
+      </modify-argument>
+    </modify-function>
     <modify-function signature="operator=(QDir)" remove="all"/>
     <modify-function signature="operator=(QString)" remove="all"/>
-    <modify-function signature="addResourceSearchPath(QString)" remove="all"/> <!--### Obsolete in 4.3-->
+    <modify-function signature="addResourceSearchPath(QString)" remove="all"/>
+    <!--### Obsolete in 4.3-->
   </value-type>
-  
+
   <value-type name="QPoint"/>
   <value-type name="QPointF"/>
-  
+
   <value-type name="QRect">
-    <modify-function signature="getCoords(int*,int*,int*,int*)const"> <remove/> </modify-function>
-    <modify-function signature="getRect(int*,int*,int*,int*)const"> <remove/> </modify-function>
-    <modify-function signature="operator&amp;=(QRect)"> <remove/> </modify-function>
-    <modify-function signature="operator|=(QRect)"> <remove/> </modify-function>
-    <modify-function signature="operator&amp;(QRect)const"> <remove/> </modify-function>
-    <modify-function signature="operator|(QRect)const"> <remove/> </modify-function>
-
-    <modify-function signature="intersect(const QRect&amp;)const" remove="all"/> <!--### Obsolete in 4.3-->
-    <modify-function signature="unite(const QRect&amp;)const" remove="all"/> <!--### Obsolete in 4.3-->
+    <modify-function signature="getCoords(int*,int*,int*,int*)const">
+      <remove/>
+    </modify-function>
+    <modify-function signature="getRect(int*,int*,int*,int*)const">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&amp;=(QRect)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator|=(QRect)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&amp;(QRect)const">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator|(QRect)const">
+      <remove/>
+    </modify-function>
+
+    <modify-function signature="intersect(const QRect&amp;)const" remove="all"/>
+    <!--### Obsolete in 4.3-->
+    <modify-function signature="unite(const QRect&amp;)const" remove="all"/>
+    <!--### Obsolete in 4.3-->
   </value-type>
 
   <value-type name="QRectF">
-    <modify-function signature="getCoords(qreal*,qreal*,qreal*,qreal*)const"> <remove/> </modify-function>
-    <modify-function signature="getRect(qreal*,qreal*,qreal*,qreal*)const"> <remove/> </modify-function>
-    <modify-function signature="operator&amp;=(QRectF)"> <remove/> </modify-function>
-    <modify-function signature="operator|=(QRectF)"> <remove/> </modify-function>
-    <modify-function signature="operator&amp;(QRectF)const"> <remove/> </modify-function>
-    <modify-function signature="operator|(QRectF)const"> <remove/> </modify-function>
-  
-    <modify-function signature="intersect(const QRectF&amp;)const" remove="all"/> <!--### Obsolete in 4.3-->
-    <modify-function signature="unite(const QRectF&amp;)const" remove="all"/> <!--### Obsolete in 4.3-->
+    <modify-function signature="getCoords(double*,double*,double*,double*)const">
+      <remove/>
+    </modify-function>
+    <modify-function signature="getRect(double*,double*,double*,double*)const">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&amp;=(QRectF)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator|=(QRectF)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&amp;(QRectF)const">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator|(QRectF)const">
+      <remove/>
+    </modify-function>
+
+    <modify-function signature="intersect(const QRectF&amp;)const" remove="all"/>
+    <!--### Obsolete in 4.3-->
+    <modify-function signature="unite(const QRectF&amp;)const" remove="all"/>
+    <!--### Obsolete in 4.3-->
   </value-type>
 
 
   <value-type name="QSize">
-    <modify-function signature="operator*=(qreal)"> <access modifier="private"/> </modify-function>
-    <modify-function signature="operator/=(qreal)"> <access modifier="private"/> </modify-function>
-    <modify-function signature="operator+=(QSize)"> <access modifier="private"/> </modify-function>
-    <modify-function signature="operator-=(QSize)"> <access modifier="private"/> </modify-function>
-    <modify-function signature="rheight()"> <remove/> </modify-function>
-    <modify-function signature="rwidth()"> <remove/> </modify-function>     
+    <modify-function signature="operator*=(double)">
+      <access modifier="private"/>
+    </modify-function>
+    <modify-function signature="operator/=(double)">
+      <access modifier="private"/>
+    </modify-function>
+    <modify-function signature="operator+=(QSize)">
+      <access modifier="private"/>
+    </modify-function>
+    <modify-function signature="operator-=(QSize)">
+      <access modifier="private"/>
+    </modify-function>
+    <modify-function signature="rheight()">
+      <remove/>
+    </modify-function>
+    <modify-function signature="rwidth()">
+      <remove/>
+    </modify-function>
   </value-type>
 
   <value-type name="QSizeF">
-    <modify-function signature="operator*=(qreal)"> <access modifier="private"/> </modify-function>
-    <modify-function signature="operator/=(qreal)"> <access modifier="private"/> </modify-function>
-    <modify-function signature="operator+=(QSizeF)"> <access modifier="private"/> </modify-function>
-    <modify-function signature="operator-=(QSizeF)"> <access modifier="private"/> </modify-function>
-    <modify-function signature="rheight()"> <remove/> </modify-function>
-    <modify-function signature="rwidth()"> <remove/> </modify-function>     
+    <modify-function signature="operator*=(double)">
+      <access modifier="private"/>
+    </modify-function>
+    <modify-function signature="operator/=(double)">
+      <access modifier="private"/>
+    </modify-function>
+    <modify-function signature="operator+=(QSizeF)">
+      <access modifier="private"/>
+    </modify-function>
+    <modify-function signature="operator-=(QSizeF)">
+      <access modifier="private"/>
+    </modify-function>
+    <modify-function signature="rheight()">
+      <remove/>
+    </modify-function>
+    <modify-function signature="rwidth()">
+      <remove/>
+    </modify-function>
   </value-type>
-  
+
   <value-type name="QStringMatcher">
     <modify-function signature="operator=(QStringMatcher)" remove="all"/>
+    <modify-function signature="QStringMatcher(const QChar*,int,Qt::CaseSensitivity)" remove="all" />
+    <modify-function signature="indexIn(const QChar*,int,int)const" remove="all" />
   </value-type>
 
-  <value-type name="QTime"/>  
+  <value-type name="QTime"/>
 
   <value-type name="QPersistentModelIndex">
     <modify-function signature="operator=(QPersistentModelIndex)" remove="all"/>
@@ -645,21 +764,20 @@
 
   <value-type name="QUuid">
     <modify-function signature="QUuid(const char*)">
-        <remove/>
+      <remove/>
     </modify-function>
   </value-type>
 
-  <value-type name="QLocale">  
-    <modify-function signature="toString(qlonglong) const" remove="all"/>
-    <modify-function signature="toString(ushort) const" remove="all"/>
+  <value-type name="QLocale">
+    <modify-function signature="toString(unsigned long long) const" remove="all"/>
+    <modify-function signature="toString(unsigned short) const" remove="all"/>
     <modify-function signature="toString(unsigned int) const" remove="all"/>
     <modify-function signature="toUInt(QString,bool*,int)const" remove="all"/>
     <modify-function signature="toULongLong(QString,bool*,int)const" remove="all"/>
     <modify-function signature="operator=(QLocale)" remove="all"/>
-    
   </value-type>
-  
-  
+
+
   <value-type name="QBitArray">
     <modify-function signature="operator[](int)" remove="all"/>
     <modify-function signature="operator[](int)const" remove="all"/>
@@ -671,67 +789,91 @@
     <modify-function signature="operator^=(QBitArray)" access="private"/>
     <modify-function signature="operator|=(QBitArray)" access="private"/>
     <modify-function signature="operator~()const" access="private"/>
-  </value-type>  
+  </value-type>
 
+  <object-type name="QReadWriteLock"/>
   <object-type name="QDirIterator"/>
   <object-type name="QAbstractFileEngineIterator"/>
-  <object-type name="QAbstractItemModel"/>
-    
+  <object-type name="QAbstractItemModel">
+    <modify-function signature="rowsAboutToBeInserted(QModelIndex,int,int)" private-signal="yes"/>
+    <modify-function signature="rowsInserted(QModelIndex,int,int)" private-signal="yes"/>
+
+    <modify-function signature="rowsAboutToBeRemoved(QModelIndex,int,int)" private-signal="yes"/>
+    <modify-function signature="rowsRemoved(QModelIndex,int,int)" private-signal="yes"/>
+
+    <modify-function signature="columnsAboutToBeInserted(QModelIndex,int,int)" private-signal="yes"/>
+    <modify-function signature="columnsInserted(QModelIndex,int,int)" private-signal="yes"/>
+
+    <modify-function signature="columnsAboutToBeRemoved(QModelIndex,int,int)" private-signal="yes"/>
+    <modify-function signature="columnsRemoved(QModelIndex,int,int)" private-signal="yes"/>
+
+    <modify-function signature="modelAboutToBeReset()" private-signal="yes"/>
+    <modify-function signature="modelReset()" private-signal="yes"/>
+  </object-type>
+
   <object-type name="QAbstractListModel">
     <extra-includes>
-        <include file-name="QStringList" location="global"/>
-        <include file-name="QSize" location="global"/>
+      <include file-name="QStringList" location="global"/>
+      <include file-name="QSize" location="global"/>
     </extra-includes>
   </object-type>
-  
-  <object-type name="QAbstractTableModel">
-    <extra-includes>
-        <include file-name="QStringList" location="global"/>
-        <include file-name="QSize" location="global"/>
-    </extra-includes>  
-  </object-type>
-  
+
   <value-type name="QUrl">
     <extra-includes>
-        <include file-name="QStringList" location="global"/>
+      <include file-name="QStringList" location="global"/>
     </extra-includes>
     <modify-function signature="operator=(QUrl)" remove="all"/>
     <modify-function signature="operator=(QString)" remove="all"/>
-  
-    <modify-function signature="fromPunycode(const QByteArray&amp;)" remove="all"/> <!--### Obsolete in 4.3-->
-    <modify-function signature="toPunycode(const QString&amp;)" remove="all"/> <!--### Obsolete in 4.3-->
+
+    <modify-function signature="fromPunycode(const QByteArray&amp;)" remove="all"/>
+    <!--### Obsolete in 4.3-->
+    <modify-function signature="toPunycode(const QString&amp;)" remove="all"/>
+    <!--### Obsolete in 4.3-->
   </value-type>
-  
+
   <value-type name="QRegExp">
     <extra-includes>
-        <include file-name="QStringList" location="global"/>
+      <include file-name="QStringList" location="global"/>
     </extra-includes>
     <modify-function signature="operator=(QRegExp)" remove="all"/>
+    <modify-function signature="pos(int)const">
+      <remove />
+    </modify-function>
+    <modify-function signature="cap(int)const">
+      <remove />
+    </modify-function>
+    <modify-function signature="capturedTexts()const">
+      <remove />
+    </modify-function>
+    <modify-function signature="errorString()const">
+      <remove />
+    </modify-function>
   </value-type>
 
   <value-type name="QFileInfo">
     <extra-includes>
-        <include file-name="QDateTime" location="global"/>
-        <include file-name="QDir" location="global"/>
+      <include file-name="QDateTime" location="global"/>
+      <include file-name="QDir" location="global"/>
     </extra-includes>
     <modify-function signature="operator!=(const QFileInfo &amp;)const" remove="all"/>
     <modify-function signature="operator==(const QFileInfo &amp;)const" remove="all"/>
     <modify-function signature="operator=(QFileInfo)" remove="all"/>
     <modify-function signature="setFile(QFile)">
-        <modify-argument index="1">
-            <reference-count action="ignore"/>
-        </modify-argument>
+      <modify-argument index="1">
+        <reference-count action="ignore"/>
+      </modify-argument>
     </modify-function>
-  
-    <modify-function signature="readLink()const" remove="all"/> <!--### Obsolete in 4.3-->
+
+    <modify-function signature="readLink()const" remove="all"/>
+    <!--### Obsolete in 4.3-->
   </value-type>
 
-  <!-- <interface-type name="QFactoryInterface" java-name="QAbstractFactory" /> -->
+  <interface-type name="QFactoryInterface" />
 
   <value-type name="QByteArray">
-   
+
     <extra-includes>
-        <include file-name="QNoImplicitBoolCast" location="global"/>
+      <include file-name="QNoImplicitBoolCast" location="global"/>
     </extra-includes>
 
     <!-- removed functions -->
@@ -745,7 +887,7 @@
     <modify-function signature="end()" remove="all"/>
     <modify-function signature="end()const" remove="all"/>
     <modify-function signature="number(uint,int)" remove="all"/>
-    <modify-function signature="number(qulonglong,int)" remove="all"/>
+    <modify-function signature="number(unsigned long long,int)" remove="all"/>
     <modify-function signature="operator const char *()const" remove="all"/>
     <modify-function signature="operator const void *()const" remove="all"/>
     <modify-function signature="operator+=(const char*)" remove="all"/>
@@ -761,8 +903,8 @@
     <modify-function signature="push_front(const QByteArray&amp;)" remove="all"/>
     <modify-function signature="push_front(const char*)" remove="all"/>
     <modify-function signature="setNum(uint,int)" remove="all"/>
-    <modify-function signature="setNum(qulonglong,int)" remove="all"/>
-    <modify-function signature="setNum(ushort,int)" remove="all"/>
+    <modify-function signature="setNum(unsigned long long,int)" remove="all"/>
+    <modify-function signature="setNum(unsigned short,int)" remove="all"/>
     <modify-function signature="toLong(bool*, int) const" remove="all"/>
     <modify-function signature="toLongLong(bool*, int) const" remove="all"/>
     <modify-function signature="toShort(bool*, int) const" remove="all"/>
@@ -776,27 +918,55 @@
     <modify-function signature="operator+=(QString)" remove="all"/>
     <modify-function signature="operator+=(char)" remove="all"/>
   </value-type>
-  
+
   <value-type name="QTextBoundaryFinder">
     <modify-function signature="QTextBoundaryFinder(QTextBoundaryFinder::BoundaryType,const QChar*,int,unsigned char*,int)" remove="all" />
     <modify-function signature="operator=(QTextBoundaryFinder)" remove="all" />
   </value-type>
 
+  <value-type name="QEasingCurve">
+    <modify-function signature="customType()const" remove="all" />
+    <modify-function signature="setCustomType(double)" remove="all" />
+  </value-type>
+
+  <object-type name="QAbstractAnimation" />
+  <object-type name="QVariantAnimation" />
+  <object-type name="QAnimationGroup" />
+  <object-type name="QPauseAnimation" />
+  <object-type name="QParallelAnimationGroup" />
+  <object-type name="QSequentialAnimationGroup" />
+  <object-type name="QPropertyAnimation" />
+
+  <object-type name="QAbstractState" />
+  <object-type name="QAbstractTransition" />
+  <object-type name="QState" />
+  <object-type name="QStateMachine" />
+  <object-type name="QHistoryState" />
+  <object-type name="QSignalTransition" />
+  <object-type name="QEventTransition" />
+  <object-type name="QFinalState" />
+
   <object-type name="QXmlStreamEntityResolver" />
-  <object-type name="QAbstractEventDispatcher"/>  
+  <object-type name="QAbstractEventDispatcher"/>
   <object-type name="QEventLoop"/>
-  <object-type name="QFile">  
-    <modify-function signature="readLink()const" remove="all"/> <!--### Obsolete in 4.3-->
-    <modify-function signature="readLink(QString)" remove="all"/> <!--### Obsolete in 4.3-->
-    <modify-function signature="map(qint64,qint64,QFile::MemoryMapFlags)" remove="all" /> <!-- Can't provide same API and performance -->
-    <modify-function signature="unmap(uchar*)" remove="all" /> <!-- Can't provide same API and performance -->    
+  <object-type name="QFile">
+    <modify-function signature="readLink()const" remove="all"/>
+    <!--### Obsolete in 4.3-->
+    <modify-function signature="readLink(QString)" remove="all"/>
+    <!--### Obsolete in 4.3-->
+    <modify-function signature="map(long long,long long,QFile::MemoryMapFlags)" remove="all" />
+    <!-- Can't provide same API and performance -->
+    <modify-function signature="unmap(unsigned char*)" remove="all" />
+    <!-- Can't provide same API and performance -->
   </object-type>
 
   <object-type name="QIODevice"/>
+  <object-type name="QStateMachine::SignalEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::StateMachineSignal" />
+  <object-type name="QStateMachine::WrappedEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::StateMachineWrapped" />
 
   <object-type name="QCryptographicHash"/>
   <object-type name="QLibraryInfo"/>
-  <object-type name="QMutex"/>  
+  <object-type name="QMutex"/>
   <object-type name="QSemaphore"/>
   <object-type name="QSocketNotifier"/>
   <object-type name="QSystemLocale"/>
@@ -805,74 +975,71 @@
   </object-type>
   <object-type name="QMimeData">
     <extra-includes>
-        <include file-name="QStringList" location="global"/>
-        <include file-name="QUrl" location="global"/>
+      <include file-name="QStringList" location="global"/>
+      <include file-name="QUrl" location="global"/>
     </extra-includes>
-  </object-type>  
-  <object-type name="QTextCodec">          
+  </object-type>
+  <object-type name="QTextCodec">
 
     <modify-function signature="setCodecForTr(QTextCodec*)">
-        <access modifier="private"/>
-        <modify-argument index="1">
-            <reference-count action="set" variable-name="__rcCodecForTr"/>
-        </modify-argument>
+      <access modifier="private"/>
+      <modify-argument index="1">
+        <reference-count action="set" variable-name="__rcCodecForTr"/>
+      </modify-argument>
     </modify-function>
     <modify-function signature="setCodecForCStrings(QTextCodec*)">
-        <modify-argument index="1">
-            <reference-count action="set" variable-name="__rcCodecForCStrings"/>
-        </modify-argument>
+      <modify-argument index="1">
+        <reference-count action="set" variable-name="__rcCodecForCStrings"/>
+      </modify-argument>
     </modify-function>
     <modify-function signature="setCodecForLocale(QTextCodec*)">
-        <modify-argument index="1">
-            <reference-count action="set" variable-name="__rcCodecForLocale"/>
-        </modify-argument>
+      <modify-argument index="1">
+        <reference-count action="set" variable-name="__rcCodecForLocale"/>
+      </modify-argument>
     </modify-function>
-    
+
 
     <modify-function signature="codecForTr()">
-        <remove/>
+      <remove/>
     </modify-function>
 
     <modify-function signature="QTextCodec()">
-        <modify-argument index="-1">
-            <define-ownership class="java" owner="c++"/>
-        </modify-argument>
+      <modify-argument index="-1">
+        <define-ownership class="java" owner="c++"/>
+      </modify-argument>
     </modify-function>
-  
+
     <modify-function signature="fromUnicode(const QChar*,int,QTextCodec::ConverterState*)const">
-        <remove/>
+      <remove/>
     </modify-function>
-    
+
     <modify-function signature="toUnicode(const char*,int,QTextCodec::ConverterState*)const">
-        <remove/>
+      <remove/>
     </modify-function>
-    
+
     <modify-function signature="toUnicode(const char*)const">
-        <remove/>
+      <remove/>
     </modify-function>
   </object-type>
 
-  <interface-type name="QTextCodecFactoryInterface" java-name="QAbstractTextCodecFactory" />
-  <object-type name="QTextCodecPlugin" />
-
   <object-type name="QTextDecoder">
     <modify-function signature="toUnicode(const char*,int)">
-        <remove/>
-    </modify-function>    
+      <remove/>
+    </modify-function>
     <modify-function signature="toUnicode(QString*,const char*,int)" remove="all"/>
   </object-type>
   <object-type name="QTextEncoder">
     <modify-function signature="fromUnicode(const QChar*,int)">
-        <remove/>
-    </modify-function>    
+      <remove/>
+    </modify-function>
   </object-type>
-  <object-type name="QTimeLine"/> 
+  <object-type name="QTimeLine"/>
   <object-type name="QTranslator">
     <modify-function signature="translate(const char*,const char*,const char*,int)const">
-        <remove/>
+      <remove/>
     </modify-function>
   </object-type>
-  
+
   <object-type name="QWaitCondition"/>
 
   <object-type name="QFileSystemWatcher">
@@ -880,170 +1047,184 @@
       <include file-name="QStringList" location="global"/>
     </extra-includes>
   </object-type>
-  
+
   <object-type name="QTextCodec::ConverterState">
     <include file-name="QTextCodec" location="global"/>
   </object-type>
 
-  <object-type name="QBuffer">  
+  <object-type name="QBuffer">
     <modify-function signature="buffer()">
-        <remove/>
+      <remove/>
     </modify-function>
+    <modify-function signature="connectNotify(const char *)" remove="all" />
+    <modify-function signature="disconnectNotify(const char *)" remove="all" />
   </object-type>
-  
+
   <object-type name="QTimer"/>
 
   <object-type name="QAbstractFileEngineHandler">
     <modify-function signature="create(const QString &amp;) const">
-        <modify-argument index="return">
-            <define-ownership owner="c++" class="shell"/>
-        </modify-argument>
+      <modify-argument index="return">
+        <define-ownership owner="c++" class="shell"/>
+      </modify-argument>
     </modify-function>
   </object-type>
-  
-  <!-- <object-type name="QAbstractFileEngine::MapExtensionOption" /> -->
-  <!-- <object-type name="QAbstractFileEngine::MapExtensionReturn" /> -->
-  <!-- <object-type name="QAbstractFileEngine::UnMapExtensionOption" /> -->
+
+  <object-type name="QAbstractFileEngine::MapExtensionOption" />
+  <object-type name="QAbstractFileEngine::MapExtensionReturn" />
+  <object-type name="QAbstractFileEngine::UnMapExtensionOption" />
   <object-type name="QAbstractFileEngine">
     <extra-includes>
-        <include file-name="QDateTime" location="global"/>
+      <include file-name="QDateTime" location="global"/>
     </extra-includes>
-    <modify-function signature="map(qlonglong,qlonglong,QFile::MemoryMapFlags)" remove="all" />
+    <modify-function signature="map(long long,long long,QFile::MemoryMapFlags)" remove="all" />
     <modify-function signature="unmap(unsigned char*)" remove="all" />
   </object-type>
-  
+
   <object-type name="QProcess">
-    <modify-function signature="readChannelMode()const" remove="all"/> <!--### Obsolete in 4.3-->
-    <modify-function signature="setReadChannelMode(QProcess::ProcessChannelMode)" remove="all"/> <!--### Obsolete in 4.3-->
+    <modify-function signature="readChannelMode()const" remove="all"/>
+    <!--### Obsolete in 4.3-->
+    <modify-function signature="setReadChannelMode(QProcess::ProcessChannelMode)" remove="all"/>
+    <!--### Obsolete in 4.3-->
   </object-type>
-  
+
   <object-type name="QSignalMapper">
     <modify-function signature="mapped(const QString &amp;)">
-        <rename to="mappedString"/>
+      <rename to="mappedString"/>
     </modify-function>
     <modify-function signature="mapped(int)">
-        <rename to="mappedInteger"/>
-    </modify-function>    
+      <rename to="mappedInteger"/>
+    </modify-function>
     <modify-function signature="mapped(QObject *)">
-        <rename to="mappedQObject"/>
-    </modify-function>    
+      <rename to="mappedQObject"/>
+    </modify-function>
     <modify-function signature="mapped(QWidget *)" remove="all"/>
-    
+
     <modify-function signature="mapping(QWidget*)const" remove="all"/>
-        
+
     <modify-function signature="setMapping(QObject*,QWidget*)" remove="all"/>
-  </object-type>  
-  
+  </object-type>
+
   <object-type name="QObject">
     <modify-function signature="childEvent(QChildEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes" />
+      <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
     <modify-function signature="customEvent(QEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes" />
+      <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
     <modify-function signature="event(QEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes" />
+      <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
     <modify-function signature="eventFilter(QObject*,QEvent*)">
-        <modify-argument index="2" invalidate-after-use="yes" />
+      <modify-argument index="2" invalidate-after-use="yes" />
     </modify-function>
     <modify-function signature="timerEvent(QTimerEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes" />
+      <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
 
     <modify-function signature="installEventFilter(QObject*)">
-        <modify-argument index="1">
-            <reference-count action="add" variable-name="__rcEventFilters"/>
-        </modify-argument>
+      <modify-argument index="1">
+        <reference-count action="add" variable-name="__rcEventFilters"/>
+      </modify-argument>
     </modify-function>
     <modify-function signature="removeEventFilter(QObject*)">
-        <modify-argument index="1">
-            <reference-count action="remove" variable-name="__rcEventFilters"/>
-        </modify-argument>
+      <modify-argument index="1">
+        <reference-count action="remove" variable-name="__rcEventFilters"/>
+      </modify-argument>
     </modify-function>
     <modify-function signature="setParent(QObject*)">
-        <modify-argument index="1">
-            <reference-count action="ignore"/>
-        </modify-argument>
+      <modify-argument index="1">
+        <reference-count action="ignore"/>
+      </modify-argument>
     </modify-function>
 
     <modify-function signature="deleteLater()">
-        <rename to="disposeLater"/>
+      <rename to="disposeLater"/>
     </modify-function>
-    <!--
+
     <modify-function signature="inherits(const char*)const">
-        <remove/>
+      <remove/>
     </modify-function>
-    -->
+
     <modify-function signature="property(const char*)const">
-        <access modifier="private"/>
+      <access modifier="private"/>
     </modify-function>
-    
+
     <modify-function signature="setProperty(const char*,QVariant)">
-        <access modifier="private"/>        
+      <access modifier="private"/>
     </modify-function>
-    
-    
+
+
     <extra-includes>
-        <include file-name="QVarLengthArray" location="global"/>
+      <include file-name="QVarLengthArray" location="global"/>
     </extra-includes>
-    
+
   </object-type>
 
   <object-type name="QCoreApplication">
     <extra-includes>
-        <include file-name="QStringList" location="global"/>
+      <include file-name="QStringList" location="global"/>
     </extra-includes>
-    
-    <modify-function signature="argv()" remove="all" /> <!-- Obsolete -->
-    <modify-function signature="argc()" remove="all" /> <!-- Obsolete -->
-    
+
+    <modify-function signature="argv()" remove="all" />
+    <!-- Obsolete -->
+    <modify-function signature="argc()" remove="all" />
+    <!-- Obsolete -->
+
     <modify-function signature="notify(QObject*,QEvent*)">
-        <modify-argument index="2" invalidate-after-use="yes" />
+      <modify-argument index="2" invalidate-after-use="yes" />
     </modify-function>
-    
-    
+
+
     <modify-function signature="QCoreApplication(int &amp;, char  **)">
       <access modifier="private"/>
-    </modify-function>     
+    </modify-function>
     <modify-function signature="removePostedEvents(QObject*)">
-        <modify-argument index="1">
-            <reference-count action="ignore"/>
-        </modify-argument>
+      <modify-argument index="1">
+        <reference-count action="ignore"/>
+      </modify-argument>
     </modify-function>
     <modify-function signature="removePostedEvents(QObject*,int)">
-        <modify-argument index="1">
-            <reference-count action="ignore"/>
-        </modify-argument>
+      <modify-argument index="1">
+        <reference-count action="ignore"/>
+      </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="installTranslator(QTranslator *)">
-        <modify-argument index="1">
-            <reference-count action="add" variable-name="__rcTranslators"/>
-        </modify-argument>
+      <modify-argument index="1">
+        <reference-count action="add" variable-name="__rcTranslators"/>
+      </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="removeTranslator(QTranslator *)">
-        <modify-argument index="1">
-            <reference-count action="remove" variable-name="__rcTranslators"/>
-        </modify-argument>
-    </modify-function>    
-    
-    
+      <modify-argument index="1">
+        <reference-count action="remove" variable-name="__rcTranslators"/>
+      </modify-argument>
+    </modify-function>
+
+
     <modify-function signature="postEvent(QObject*,QEvent*)">
-        <modify-argument index="2">
-            <define-ownership class="java" owner="c++"/>  
-        </modify-argument>
-    </modify-function>    
+      <modify-argument index="2">
+        <define-ownership class="java" owner="c++"/>
+      </modify-argument>
+    </modify-function>
   </object-type>
 
   <object-type name="QSettings">
     <extra-includes>
-        <include file-name="QStringList" location="global"/>
+      <include file-name="QStringList" location="global"/>
     </extra-includes>
-  
-    <modify-function signature="setSystemIniPath(const QString&amp;)" remove="all"/> <!--### Obsolete in 4.3-->
-    <modify-function signature="setUserIniPath(const QString&amp;)" remove="all"/> <!--### Obsolete in 4.3-->
+
+    <modify-function signature="setIniCodec(QTextCodec*)">
+      <modify-argument index="1">
+        <reference-count action="set" variable-name="__rcIniCodec" />
+      </modify-argument>
+    </modify-function>
+
+    <modify-function signature="setSystemIniPath(const QString&amp;)" remove="all"/>
+    <!--### Obsolete in 4.3-->
+    <modify-function signature="setUserIniPath(const QString&amp;)" remove="all"/>
+    <!--### Obsolete in 4.3-->
   </object-type>
 
   <object-type name="QEvent" polymorphic-base="yes" polymorphic-id-expression="%1-&gt;type() == QEvent::None"/>
@@ -1051,129 +1232,209 @@
     <modify-field name="c" read="false" write="false"/>
   </object-type>
   <object-type name="QTimerEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Timer"/>
-  <object-type name="QDynamicPropertyChangeEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::DynamicPropertyChange"/>  
-            
-  <object-type name="QDataStream">    
+  <object-type name="QDynamicPropertyChangeEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::DynamicPropertyChange"/>
+
+  <object-type name="QDataStream">
     <modify-function signature="setDevice(QIODevice*)">
-        <modify-argument index="1">
-            <reference-count action="set" variable-name="__rcDevice"/>
-        </modify-argument>
+      <modify-argument index="1">
+        <reference-count action="set" variable-name="__rcDevice"/>
+      </modify-argument>
     </modify-function>
-<!--
     <modify-function signature="unsetDevice()">
-        <inject-code position="end">
-            __rcDevice = null;
-        </inject-code>
+      <inject-code position="end">
+        __rcDevice = null;
+      </inject-code>
     </modify-function>
--->
 
 
-    <modify-function signature="operator&lt;&lt;(const char*)"> <remove/> </modify-function>
-    <modify-function signature="operator&lt;&lt;(unsigned int)"> <remove/> </modify-function>     
-    <modify-function signature="operator&lt;&lt;(unsigned long long)"> <remove/> </modify-function>
-    <modify-function signature="operator&lt;&lt;(unsigned short)"> <remove/> </modify-function>
+    <modify-function signature="operator&lt;&lt;(const char*)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(unsigned char)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(unsigned int)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(unsigned long long)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(unsigned short)">
+      <remove/>
+    </modify-function>
 
-    <modify-function signature="operator&gt;&gt;(char &amp;*)"> <remove/> </modify-function>  
+    <modify-function signature="operator&gt;&gt;(char &amp;*)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&gt;&gt;(uint&amp;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&gt;&gt;(unsigned char&amp;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&gt;&gt;(unsigned long long&amp;)">
+      <remove/>
+    </modify-function>
 
-    <modify-function signature="readRawData(char*,int)"> <remove/> </modify-function>
-    <modify-function signature="readBytes(char&amp;*,uint&amp;)"> <remove/> </modify-function>
-    <modify-function signature="writeRawData(const char*,int)"> <remove/> </modify-function>
-    <modify-function signature="writeBytes(const char*,uint)"> <remove/> </modify-function>
+    <modify-function signature="readRawData(char*,int)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="readBytes(char&amp;*,uint&amp;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="writeRawData(const char*,int)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="writeBytes(const char*,uint)">
+      <remove/>
+    </modify-function>
   </object-type>
 
   <object-type name="QFSFileEngine">
-  <extra-includes>
-           <include file-name="QDateTime" location="global"/>
-        </extra-includes>
+    <extra-includes>
+      <include file-name="QDateTime" location="global"/>
+    </extra-includes>
   </object-type>
 
   <object-type name="QTextStream">
-    <modify-function signature="QTextStream(QByteArray *, QFlags&lt;QIODevice::OpenModeFlag&gt;)"> <remove/> </modify-function>
-    <modify-function signature="QTextStream(QString*,QFlags&lt;QIODevice::OpenModeFlag&gt;)"> <remove/> </modify-function>
-    <modify-function signature="operator&gt;&gt;(QChar&amp;)"> <remove/> </modify-function>
-    <modify-function signature="operator&lt;&lt;(const void*)"> <remove/> </modify-function>
-    <modify-function signature="operator&lt;&lt;(unsigned int)"> <remove/> </modify-function>     
-    <modify-function signature="operator&lt;&lt;(qlonglong)"> <remove/> </modify-function>    
-    <modify-function signature="operator&lt;&lt;(const QChar &amp;)"> <remove/> </modify-function>        
-    <modify-function signature="operator&lt;&lt;(unsigned long)"> <remove/> </modify-function>
-    <modify-function signature="operator&lt;&lt;(signed long)"> <remove/> </modify-function>
-    <modify-function signature="operator&lt;&lt;(const char*)"> <remove/> </modify-function>    
-    <modify-function signature="operator&lt;&lt;(unsigned short)"> <remove/> </modify-function>   
-    <modify-function signature="operator&gt;&gt;(qulonglong&amp;)"> <remove/> </modify-function>
-    <modify-function signature="operator&gt;&gt;(ulong&amp;)"> <remove/> </modify-function>
-    <modify-function signature="setString(QString*,QFlags&lt;QIODevice::OpenModeFlag&gt;)"> <remove/> </modify-function>    
-    <modify-function signature="string()const"> <remove/> </modify-function>
-    <modify-function signature="operator&gt;&gt;(signed long&amp;)"> <remove/> </modify-function>
-    <modify-function signature="operator&gt;&gt;(char*)"> <remove/> </modify-function>
-    <modify-function signature="operator&gt;&gt;(QByteArray&amp;)"> <remove/> </modify-function>
-    <modify-function signature="operator&gt;&gt;(QString&amp;)"> <remove/> </modify-function>
-    
-  
+    <modify-function signature="QTextStream(QByteArray *, QFlags&lt;QIODevice::OpenModeFlag&gt;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="QTextStream(QString*,QFlags&lt;QIODevice::OpenModeFlag&gt;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&gt;&gt;(QChar&amp;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(const void*)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(unsigned int)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(unsigned long long)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(const QChar &amp;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(unsigned long)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(signed long)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(const char*)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(unsigned short)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(const QByteArray&amp;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&gt;&gt;(unsigned long long&amp;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&gt;&gt;(uint&amp;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&gt;&gt;(ulong&amp;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="setString(QString*,QFlags&lt;QIODevice::OpenModeFlag&gt;)">
+      <remove />
+    </modify-function>
+    <modify-function signature="string()const">
+      <remove />
+    </modify-function>
+    <modify-function signature="operator&gt;&gt;(signed long&amp;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&gt;&gt;(char*)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&gt;&gt;(QByteArray&amp;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&gt;&gt;(QString&amp;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&gt;&gt;(unsigned short&amp;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(const QString&amp;)">
+      <remove/>
+    </modify-function>
+
+
     <modify-function signature="setCodec(QTextCodec *)">
-        <modify-argument index="1">
-            <reference-count action="set" variable-name="__rcCodec"/>
-        </modify-argument>
+      <modify-argument index="1">
+        <reference-count action="set" variable-name="__rcCodec"/>
+      </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="QTextStream(QIODevice *)">
-        <modify-argument index="1">
-            <reference-count action="set" variable-name="__rcDevice"/>
-        </modify-argument>
-    </modify-function>    
+      <modify-argument index="1">
+        <reference-count action="set" variable-name="__rcDevice"/>
+      </modify-argument>
+    </modify-function>
     <modify-function signature="setDevice(QIODevice *)">
-        <modify-argument index="1">
-            <reference-count action="set" variable-name="__rcDevice"/>
-        </modify-argument>
-    </modify-function>         
+      <modify-argument index="1">
+        <reference-count action="set" variable-name="__rcDevice"/>
+      </modify-argument>
+    </modify-function>
   </object-type>
-  
+
   <object-type name="QSystemSemaphore" />
-  
+
   <namespace-type name="QtConcurrent" target-type="class" />
-  
+
   <value-type name="QFuture" generate="no">
     <modify-function signature="operator T() const" remove="all" />
     <modify-function signature="operator=(const QFuture &amp;)" remove="all" />
   </value-type>
-  <value-type name="QtScriptVoidFuture" java-name="QFutureVoid">
+  <value-type name="QtJambiVoidFuture" java-name="QFutureVoid">
     <modify-function signature="resultCount()const" remove="all" />
     <modify-function signature="isResultReadyAt(int)const" remove="all" />
   </value-type>
-  <value-type name="QtScriptFuture" java-name="QFuture" generic-class="yes" />
-  
+  <value-type name="QtJambiFuture" java-name="QFuture" generic-class="yes" />
+
   <object-type name="QFutureWatcherBase">
     <modify-function signature="connectNotify(const char *)" remove="all" />
     <modify-function signature="disconnectNotify(const char *)" remove="all" />
-  </object-type>  
-  <object-type name="QtScriptVoidFutureWatcher" java-name="QFutureWatcherVoid" />
-  
+  </object-type>
+  <object-type name="QtJambiVoidFutureWatcher" java-name="QFutureWatcherVoid" />
+
   <object-type name="QFutureWatcher" generate="no">
     <modify-function signature="future()const" remove="all" />
   </object-type>
-  <object-type name="QtScriptFutureWatcher" java-name="QFutureWatcher" generic-class="yes" />
-  
+  <object-type name="QtJambiFutureWatcher" java-name="QFutureWatcher" generic-class="yes" />
+
   <object-type name="QFutureSynchronizer" generate="no" />
-  <object-type name="QtScriptFutureSynchronizer" generic-class="yes" java-name="QFutureSynchronizer" />
-  <object-type name="QtScriptVoidFutureSynchronizer" java-name="QFutureSynchronizerVoid" />
+  <object-type name="QtJambiFutureSynchronizer" generic-class="yes" java-name="QFutureSynchronizer" />
+  <object-type name="QtJambiVoidFutureSynchronizer" java-name="QFutureSynchronizerVoid" />
   <object-type name="QThreadPool" />
-  
+
   <object-type name="QFutureIterator" generate="no">
-      <modify-function signature="operator=(const QFuture&amp;)" remove="all" />
+    <modify-function signature="operator=(const QFuture&amp;)" remove="all" />
   </object-type>
-  <object-type name="QtScriptFutureIterator" generic-class="yes" java-name="QFutureIterator" />
+  <object-type name="QtJambiFutureIterator" generic-class="yes" java-name="QFutureIterator" />
   <object-type name="QRunnable" />
 
-  
-    <value-type name="QXmlStreamAttribute"/>
-    <value-type name="QXmlStreamAttributes"/>
-    <value-type name="QXmlStreamNamespaceDeclaration"/>
-    <value-type name="QXmlStreamNotationDeclaration"/>
-    <value-type name="QXmlStreamEntityDeclaration"/>
-    <object-type name="QXmlStreamReader"/>
-    <object-type name="QXmlStreamWriter"/>
+  <!-- Inefficient hash codes -->
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUuid' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QLocale' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFuture' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QRegExp' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFutureVoid' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUrl' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QProcessEnvironment' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
 
-    <value-type name="QModelIndex"/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::selectIteration', unmatched parameter type 'T'" />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QVariantAnimation::registerInterpolator', unmatched parameter type 'QVariantAnimation::Interpolator'" />
 
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'Qt::Initialization'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'std::*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private\*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private&amp;'"/>
@@ -1190,40 +1451,23 @@
   <suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QPointer&lt;*&gt;'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QVector&lt;*&gt;'"/>
-  <suppress-warning text="* private virtual function '*' in 'QAbstractListModel'"/>  
-  <suppress-warning text="* private virtual function '*' in 'QAbstractTableModel'"/>  
-  <suppress-warning text="* private virtual function '*' in 'QListWidget'"/>  
-  <suppress-warning text="* private virtual function '*' in 'QTreeWidget'"/>  
-  <suppress-warning text="* private virtual function '*' in 'QFontDialog'"/>  
-  <suppress-warning text="* private virtual function '*' in 'QTableWidget'"/>  
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QDateTime' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPersistentModelIndex' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUuid' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QRect' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTime' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QLocale' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QDir' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPointF' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSize' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFileInfo' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSizeF' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QRegExp' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QRectF' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QDate' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPoint' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUrl' has equals operators but no qHash() function"/>
+  <suppress-warning text="* private virtual function '*' in 'QAbstractListModel'"/>
+  <suppress-warning text="* private virtual function '*' in 'QAbstractTableModel'"/>
+  <suppress-warning text="* private virtual function '*' in 'QListWidget'"/>
+  <suppress-warning text="* private virtual function '*' in 'QTreeWidget'"/>
+  <suppress-warning text="* private virtual function '*' in 'QFontDialog'"/>
+  <suppress-warning text="* private virtual function '*' in 'QTableWidget'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcherBase::futureInterface', unmatched return type 'QFutureInterfaceBase&amp;'" />
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcherBase::futureInterface', unmatched return type 'QFutureInterfaceBase const&amp;'" />
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcher::futureInterface', unmatched return type 'QFutureInterfaceBase&amp;'" />
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcher::futureInterface', unmatched return type 'QFutureInterfaceBase const&amp;'" />
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFuture' has equals operators but no qHash() function" />
   <suppress-warning text="WARNING(MetaJavaBuilder) :: unknown operator 'T'" />
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFutureVoid' has equals operators but no qHash() function" />
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::constBegin', unmatched return type 'const_iterator'" />
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::end', unmatched return type 'const_iterator'" />
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::constEnd', unmatched return type 'const_iterator'" />
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::QFuture', unmatched parameter type 'QFutureInterface&lt;T&gt;*'" />
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::begin', unmatched return type 'const_iterator'" />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::advance', unmatched parameter type 'It&amp;'" />
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMapped', unmatched return type 'Sequence'" />
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMapped', unmatched return type 'QList&lt;U&gt;'" />
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMapped', unmatched return type 'QList&lt;MapFunctor::result_type&gt;'" />
@@ -1231,6 +1475,7 @@
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::filtered', unmatched parameter type 'Iterator'" />
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::filtered', unmatched parameter type 'Sequence const&amp;'" />
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::filter', unmatched parameter type 'Sequence&amp;'" />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::startFiltered', unmatched return type 'ThreadEngineStarter&lt;qValueType&lt;Iterator&gt;::value_type&gt;" />
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::startFiltered', unmatched return type 'ThreadEngineStarter&lt;Sequence::value_type&gt;'" />
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::startFiltered', unmatched return type 'ThreadEngineStarter&lt;Iterator::value_type&gt;'" />
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMappedReduced', unmatched return type 'V'" />
@@ -1269,4 +1514,9 @@
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingFilter', unmatched parameter type 'Sequence&amp;'" />
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::createFunctor', unmatched return type 'QtConcurrent::SelectMemberFunctor0&lt;T,Class&gt;::type'" />
 
+  <suppress-warning text="WARNING(Parser) :: ** WARNING scope not found for function definition:QFuture&lt;void&gt;::operator= - definition *ignored*" />
+  <suppress-warning text="WARNING(Parser) :: ** WARNING scope not found for function definition:QFutureInterface&lt;void&gt;::future - definition *ignored*" />
+  <suppress-warning text="WARNING(Parser) :: ** WARNING scope not found for function definition:QFutureWatcher&lt;void&gt;::setFuture - definition *ignored*" />
+
+
 </typesystem>
diff --git a/generator/typesystem_core.xml b/generator/typesystem_core.xml
index 764952a..3402a69 100644
--- a/generator/typesystem_core.xml
+++ b/generator/typesystem_core.xml
@@ -33,6 +33,7 @@
             QString %out% = %in%.toString();
     </template><rejection class="QTextCodec::ConverterState"/><rejection class="QTextCodecFactoryInterface"/><rejection class="QAbstractEventDispatcher"/><rejection class="QAbstractFileEngine"/><rejection class="QAbstractFileEngineHandler"/><rejection class="QAbstractFileEngineIterator"/><rejection class="QFSFileEngine"/><rejection class="QSystemLocale"/><rejection class="QFutureWatcherBase"/><rejection class="QFutureSynchronizer"/><enum-type name="QXmlStreamReader::Error"/><enum-type name="QXmlStreamReader::TokenType"/><primitive-type name="bool"/><primitive-type name="double"/><primitive-type name="qreal"/><primitive-type name="float"/><primitive-type name="qint64"/><primitive-type name="__int64"/><primitive-type name="unsigned __int64"/><primitive-type name="unsigned long long"/><primitive-type name="long long"/><primitive-type name="qlonglong"/><primitive-type name="qulonglong"/><primitive-type name="short"/><primitive-type name="short"/><primitive-type name="signed short"/><primitive-type name="ushort"/><primitive-type name="unsigned short"/><primitive-type name="char"/><primitive-type name="signed char"/><primitive-type name="uchar"/><primitive-type name="unsigned char"/><primitive-type name="int"/><primitive-type name="signed int"/><primitive-type name="uint"/><primitive-type name="ulong"/><primitive-type name="unsigned int"/><primitive-type name="signed long"/><primitive-type name="long"/><primitive-type name="unsigned long"/><primitive-type name="WId"/><primitive-type name="Qt::HANDLE"/><primitive-type name="QVariant::Type"/><primitive-type name="QByteRef"/><primitive-type name="QBitRef"/><primitive-type name="QBool"/><primitive-type name="jobject"/><primitive-type name="quintptr"/><suppress-warning text="WARNING(MetaJavaBuilder) :: signal 'finished' in class 'QProcess' is overloaded."/><suppress-warning text="WARNING(MetaJavaBuilder) :: missing required class for enums: QRegExp"/><suppress-warning text="WARNING(MetaJavaBuilder) :: enum 'QtValidLicenseForScriptToolsModule' does not have a type entry or is not an enum"/><suppress-warning text="WARNING(MetaJavaBuilder) :: Rejected enum has no alternative...: QDataStream::Qt_4_5"/><suppress-warning text="WARNING(MetaJavaBuilder) :: unhandled enum value: Qt::MatchFlags(Qt::MatchStartsWith in Qt::MatchFlag"/><suppress-warning text="WARNING(MetaJavaBuilder) :: unhandled enum value: Qt::MatchWrap) in Qt::MatchFlag"/><suppress-warning text="WARNING(MetaJavaBuilder) :: unmatched enum Qt::MatchFlags(Qt::MatchStartsWith|Qt::MatchWrap) when parsing default value of 'match' in class 'QAbstractItemModel'"/><suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value 'QLatin1String(defaultConnection)' of argument in function '*', class '*'"/><suppress-warning text="WARNING(MetaJavaBuilder) :: Class '*' has equals operators but no qHash() function"/><suppress-warning text="WARNING(MetaJavaBuilder) :: type '*' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/><suppress-warning text="WARNING(MetaJavaBuilder) :: namespace '*' for enum '*' is not declared"/><suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function '*', unmatched parameter type '*'"/><suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function '*', unmatched return type '*'"/><suppress-warning text="WARNING(MetaJavaBuilder) :: signature '*' for function modification in '*' not found. Possible candidates: "/><suppress-warning text="WARNING(MetaJavaBuilder) :: namespace '*' does not have a type entry"/><suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value '*' of argument in function '*', class '*'"/><suppress-warning text="WARNING(MetaJavaBuilder) :: Shadowing: * and *; Java code will not compile"/><suppress-warning text="WARNING(MetaJavaBuilder) :: enum '*' is specified in typesystem, but not declared"/>
 
+  <value-type name="QModelIndex"/>
   <rejection class="*" function-name="d_func"/>
   <rejection class="*" function-name="data_ptr"/>
   <rejection class="*" function-name="detach"/>
@@ -41,7 +42,8 @@
   <rejection class="*" field-name="d_ptr"/>
   <rejection class="*" field-name="d"/>
 
-  <rejection class="" enum-name="QtValidLicenseForTestModule"/>  
+  <rejection class="" enum-name="QtValidLicenseForTestModule"/>
+
 
   <rejection class="" enum-name="QtValidLicenseForDBusModule"/>
   <rejection class="" enum-name="QtValidLicenseForSqlModule"/>
@@ -58,8 +60,17 @@
   <rejection class="" enum-name="QtValidLicenseForGuiModule"/>
   <rejection class="" enum-name="QtValidLicenseForScriptModule"/>
   <rejection class="" enum-name="QtValidLicenseForHelpModule"/>
+  <rejection class="" enum-name="QtValidLicenseForScriptToolsModule"/>
+  <rejection class="" enum-name="QtValidLicenseForMultimediaModule"/>
+  <rejection class="" enum-name="QtValidLicenseForOpenVGModule"/>
+
   <rejection class="QtConcurrent" enum-name="enum_1"/>
+  <rejection class="QtConcurrent" function-name="operator|"/>
 
+  <rejection class="Qt" enum-name="Modifier"/>
+
+  <rejection class="QSharedPointer"/>
+  <rejection class="QWeakPointer"/>
   <rejection class="QFuture::const_iterator"/>
   <rejection class="QFutureInterface"/>
   <rejection class="QFutureInterfaceBase"/>
@@ -80,6 +91,7 @@
   <rejection class="QtConcurrent::Median"/>
   <rejection class="QtConcurrent::MemberFunctionWrapper"/>
   <rejection class="QtConcurrent::MemberFunctionWrapper1"/>
+  <rejection class="QtConcurrent::qValueType"/>
   <rejection class="QtConcurrent::ReduceKernel"/>
   <rejection class="QtConcurrent::ResultItem"/>
   <rejection class="QtConcurrent::ResultIterator"/>
@@ -208,7 +220,7 @@
   <rejection class="QtConcurrent::VoidStoredMemberFunctionPointerCall5"/>
 
   <rejection class="QMdi"/>
-  <rejection class="stdext"/> 
+  <rejection class="stdext"/>
   <rejection class="QAlgorithmsPrivate"/>
   <rejection class="QAtomic"/>
   <rejection class="QAtomicPointer"/>
@@ -216,11 +228,26 @@
   <rejection class="QBasicAtomicInt"/>
   <rejection class="QBasicAtomic"/>
   <rejection class="QBasicAtomicPointer"/>
+  <rejection class="QScopedPointer"/>
+  <rejection class="QScopedArrayPointer"/>
+  <rejection class="QScopedPointer"/>
+  <rejection class="QScopedPointerArrayDeleter"/>
+  <rejection class="QScopedPointerDeleter"/>
+  <rejection class="QScopedPointerPodDeleter"/>
+  <rejection class="QScopedPointerSharedDeleter"/>
+  <rejection class="QScopedSharedPointer"/>
+  <rejection class="QCustomScopedPointer"/>
+  <rejection class="QStringBuilder"/>
+
   <rejection class="QBitRef"/>
   <rejection class="QCache"/>
+  <rejection class="QContiguousCache"/>
+  <rejection class="QContiguousCacheData"/>
+  <rejection class="QContiguousCacheTypedData"/>
   <rejection class="QCharRef"/>
   <rejection class="QDebug"/>
-  <rejection class="QExplicitlySharedDataPointer"/>  
+  <rejection class="QNoDebug"/>
+  <rejection class="QExplicitlySharedDataPointer"/>
   <rejection class="QFlag"/>
   <rejection class="QFlags"/>
   <rejection class="QForeachContainer"/>
@@ -241,6 +268,7 @@
   <rejection class="QHashNode"/>
   <rejection class="QHashNode"/>
   <rejection class="QInternal"/>
+  <rejection class="QIncompatibleFlag"/>
   <rejection class="QLibrary"/>
   <rejection class="QLinkedList"/>
   <rejection class="QLinkedListData"/>
@@ -249,6 +277,8 @@
   <rejection class="QListData"/>
   <rejection class="QListIterator"/>
   <rejection class="QMap"/>
+  <rejection class="QMapNode"/>
+  <rejection class="QMapPayloadNode"/>
   <rejection class="QMapData"/>
   <rejection class="QMapIterator"/>
   <rejection class="QMetaType"/>
@@ -280,7 +310,7 @@
   <rejection class="QSharedDataPointer"/>
   <rejection class="QStack"/>
   <rejection class="QSysInfo"/>
-  <rejection class="QTextStreamManipulator"/>    
+  <rejection class="QTextStreamManipulator"/>
   <rejection class="QThreadStorage"/>
   <rejection class="QThreadStorageData"/>
   <rejection class="QTypeInfo"/>
@@ -288,7 +318,7 @@
   <rejection class="QVFbKeyData"/>
   <rejection class="QVariantComparisonHelper"/>
   <rejection class="QVectorData"/>
-  <rejection class="QVectorIterator"/>  
+  <rejection class="QVectorIterator"/>
   <rejection class="QVectorTypedData"/>
   <rejection class="QWriteLocker"/>
   <rejection class="QtPrivate"/>
@@ -307,12 +337,20 @@
   <rejection class="QSubString"/>
   <rejection class="QUintForType"/>
   <rejection class="QtConcurrent::internal"/>
+  <rejection class="QByteArrayMatcher::Data"/>
+  <rejection class="QStringMatcher::Data"/>
 
-  <rejection class="QLocale::Data"/>  
+  <rejection class="StringBuilder"/>
+  <rejection class="QConcatenable"/>
+  <rejection class="QLatin1Literal"/>
+  <rejection class="QIntegerForSizeof"/>
+
+
+  <rejection class="QLocale::Data"/>
   <rejection class="QGlobalStaticDeleter"/>
   <rejection class="QSharedMemory"/> <!-- Temporarily until we know how to implement it in Java -->
   <rejection class="QVarLengthArray"/>
-  
+
   <!-- DBus -->
   <rejection class="QDBusAbstractAdaptor"/>
   <rejection class="QDBusAbstractInterface"/>
@@ -329,7 +367,7 @@
   <rejection class="QDBusServer"/>
   <rejection class="QDBusSignature"/>
   <rejection class="QDBusVariant"/>
-   
+
   <rejection class="_Revbidit"/>
   <rejection class="_complex"/>
   <rejection class="_exception"/>
@@ -344,10 +382,11 @@
   <rejection class="stat"/>
   <rejection class="tm"/>
 
+  <rejection class="Qt" enum-name="Initialization"/>
+
   <rejection class="QAbstractEventDispatcher" function-name="filterEvent"/>
   <rejection class="QAbstractEventDispatcher" function-name="setEventFilter"/>
-  <rejection class="QAbstractFileEngine" function-name="beginEntryList"/>
-  <rejection class="QAbstractFileEngine" function-name="endEntryList"/>
+
   <rejection class="QAbstractFileEngine" function-name="extension"/>
   <rejection class="QCoreApplication" function-name="compressEvent"/>
   <rejection class="QCoreApplication" function-name="eventFilter"/>
@@ -372,7 +411,7 @@
   <rejection class="QList" function-name="node_destruct"/>
   <rejection class="QList" function-name="toSet"/>
   <rejection class="QObject" function-name="receivers"/>
-  <rejection class="QObject" function-name="findChild"/>   
+  <rejection class="QObject" function-name="findChild"/>
   <rejection class="QObject" function-name="findChildren"/>
   <rejection class="QObject" function-name="setUserData"/>
   <rejection class="QObject" function-name="userData"/>
@@ -382,6 +421,8 @@
   <rejection class="QObject" function-name="disconnect"/>
   <rejection class="QObject" function-name="disconnectNotify"/>
   <rejection class="QObject" function-name="registerUserData"/>
+  <rejection class="QObject" function-name="sender"/>
+  <rejection class="QTimer" function-name="singleShot"/>
   <rejection class="QProcess" function-name="pid"/>
   <rejection class="QRegion" function-name="cleanUp"/>
   <rejection class="QSettings" function-name="registerFormat"/>
@@ -398,10 +439,11 @@
   <rejection class="QVector" function-name="alloc"/>
   <rejection class="QVector" function-name="operator+="/>
   <rejection class="QAbstractFileEngineIterator" function-name="entryInfo"/>
-  
+  <rejection class="QtConcurrent::ThreadEngineBarrier"/>
+
   <rejection class="QAbstractFileEngineIterator" enum-name="EntryInfoType"/>
   <rejection class="QDataStream" enum-name="ByteOrder"/>
-  
+
 
   <namespace-type name="Qt">
   
@@ -410,15 +452,36 @@
     </extra-includes>
   </namespace-type>
 
+  <enum-type name="QDate::MonthNameType"/>
+  <enum-type name="QAbstractAnimation::DeletionPolicy"/>
+  <enum-type name="QAbstractAnimation::Direction"/>
+  <enum-type name="QAbstractAnimation::State"/>
+  <enum-type name="QDataStream::FloatingPointPrecision"/>
+  <enum-type name="QEasingCurve::Type"/>
+  <enum-type name="QHistoryState::HistoryType"/>
+  <enum-type name="QState::ChildMode"/>
+  <enum-type name="QStateMachine::Error"/>
+  <enum-type name="QStateMachine::EventPriority"/>
+  <enum-type name="QStateMachine::RestorePolicy"/>
+  <enum-type name="Qt::AnchorPoint"/>
+  <enum-type name="Qt::CoordinateSystem"/>
+  <enum-type name="Qt::GestureState"/>
+  <enum-type name="Qt::InputMethodHint" flags="Qt::InputMethodHints"/>
+  <enum-type name="Qt::NavigationMode"/>
+  <enum-type name="Qt::RenderHint"/>
+  <enum-type name="Qt::TileRule"/>
+  <enum-type name="Qt::TouchPointState" flags="Qt::TouchPointStates"/>
 
   <enum-type name="QtMsgType">
     <reject-enum-value name="QtSystemMsg"/>
   </enum-type>
 
+
+  <enum-type name="QReadWriteLock::RecursionMode"/>
   <enum-type name="QSystemSemaphore::AccessMode"/>
   <enum-type name="QSystemSemaphore::SystemSemaphoreError"/>
   <enum-type name="QTextBoundaryFinder::BoundaryReason" flags="QTextBoundaryFinder::BoundaryReasons"/>
-  <enum-type name="QTextBoundaryFinder::BoundaryType"/>  
+  <enum-type name="QTextBoundaryFinder::BoundaryType"/>
   <enum-type name="QAbstractFileEngine::Extension" extensible="yes"/>
   <enum-type name="QAbstractFileEngine::FileFlag" flags="QAbstractFileEngine::FileFlags"/>
   <enum-type name="QAbstractFileEngine::FileName"/>
@@ -494,7 +557,6 @@
   <enum-type name="Qt::KeyboardModifier" flags="Qt::KeyboardModifiers"/>
   <enum-type name="Qt::LayoutDirection"/>
   <enum-type name="Qt::MatchFlag" flags="Qt::MatchFlags"/>
-  <enum-type name="Qt::Modifier"/>
   <enum-type name="Qt::MouseButton" flags="Qt::MouseButtons"/>
   <enum-type name="Qt::Orientation" flags="Qt::Orientations"/>
   <enum-type name="Qt::PenCapStyle"/>
@@ -520,12 +582,13 @@
   <enum-type name="Qt::EventPriority"/>
   <enum-type name="Qt::MaskMode"/>
   <enum-type name="QCryptographicHash::Algorithm"/>
-  
+
   <enum-type name="QtConcurrent::ReduceOption" flags="QtConcurrent::ReduceOptions"/>
   <enum-type name="QtConcurrent::ThreadFunctionResult"/>
+ 
 
   <enum-type name="QCoreApplication::Encoding">
-    <reject-enum-value name="DefaultCodec"/> 
+    <reject-enum-value name="DefaultCodec"/>
   </enum-type>
 
   <enum-type name="Qt::AlignmentFlag" flags="Qt::Alignment">
@@ -548,9 +611,8 @@
   </enum-type>
 
 
-  <enum-type name="QDataStream::Version"> 
+  <enum-type name="QDataStream::Version">
     <reject-enum-value name="Qt_4_1"/>
-    <reject-enum-value name="Qt_4_5"/>
   </enum-type>
 
   <enum-type name="QDir::SortFlag" flags="QDir::SortFlags">
@@ -586,41 +648,44 @@
   <enum-type name="Qt::ToolBarArea" flags="Qt::ToolBarAreas">
     <reject-enum-value name="AllToolBarAreas"/>
   </enum-type>
-  
+
   <enum-type name="Qt::WidgetAttribute">
     <reject-enum-value name="WA_ForceAcceptDrops"/>
     <reject-enum-value name="WA_NoBackground"/>
     <reject-enum-value name="WA_MacMetalStyle"/>
   </enum-type>
-  
-  <value-type name="QBasicTimer"/>  
+
+  <value-type name="QProcessEnvironment"/>
+  <value-type name="QBasicTimer"/>
   <value-type name="QByteArrayMatcher">
     <modify-function signature="operator=(QByteArrayMatcher)" remove="all"/>
   </value-type>
-  
-  <value-type name="QDate">    
+
+  <value-type name="QDate">
     <modify-function signature="julianToGregorian(uint,int&amp;,int&amp;,int&amp;)">
-        <remove/>
-    </modify-function>    
-  
-    <modify-function signature="setYMD(int, int, int)" remove="all"/> <!--### Obsolete in 4.3-->
+      <remove/>
+    </modify-function>
+
+    <modify-function signature="setYMD(int, int, int)" remove="all"/>
+    <!--### Obsolete in 4.3-->
   </value-type>
-  
+
   <value-type name="QDateTime">
     <modify-function signature="operator=(QDateTime)" remove="all"/>
   </value-type>
-  
+
   <value-type name="QDir">
     <modify-function signature="QDir(QString,QString,QFlags&lt;QDir::SortFlag&gt;,QFlags&lt;QDir::Filter&gt;)">
-        <modify-argument index="3">
-            <replace-default-expression with="SortFlag.Name, SortFlag.IgnoreCase"/>
-        </modify-argument>
-    </modify-function>  
+      <modify-argument index="3">
+        <replace-default-expression with="SortFlag.Name, SortFlag.IgnoreCase"/>
+      </modify-argument>
+    </modify-function>
     <modify-function signature="operator=(QDir)" remove="all"/>
     <modify-function signature="operator=(QString)" remove="all"/>
-    <modify-function signature="addResourceSearchPath(QString)" remove="all"/> <!--### Obsolete in 4.3-->
+    <modify-function signature="addResourceSearchPath(QString)" remove="all"/>
+    <!--### Obsolete in 4.3-->
   </value-type>
-  
+
   <value-type name="QPoint">
     <modify-function signature="rx()" remove="all"/> 
     <modify-function signature="ry()" remove="all"/> 
@@ -630,59 +695,108 @@
     <modify-function signature="ry()" remove="all"/> 
   </value-type>
 
-  <value-type name="QLine">
-  </value-type>
-  <value-type name="QLineF">
-  </value-type>
-  
   <value-type name="QRect">
-    <modify-function signature="getCoords(int*,int*,int*,int*)const"> <remove/> </modify-function>
-    <modify-function signature="getRect(int*,int*,int*,int*)const"> <remove/> </modify-function>
-    <modify-function signature="operator&amp;=(QRect)"> <remove/> </modify-function>
-    <modify-function signature="operator|=(QRect)"> <remove/> </modify-function>
-    <modify-function signature="operator&amp;(QRect)const"> <remove/> </modify-function>
-    <modify-function signature="operator|(QRect)const"> <remove/> </modify-function>
-
-    <modify-function signature="intersect(const QRect&amp;)const" remove="all"/> <!--### Obsolete in 4.3-->
-    <modify-function signature="unite(const QRect&amp;)const" remove="all"/> <!--### Obsolete in 4.3-->
+    <modify-function signature="getCoords(int*,int*,int*,int*)const">
+      <remove/>
+    </modify-function>
+    <modify-function signature="getRect(int*,int*,int*,int*)const">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&amp;=(QRect)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator|=(QRect)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&amp;(QRect)const">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator|(QRect)const">
+      <remove/>
+    </modify-function>
+
+    <modify-function signature="intersect(const QRect&amp;)const" remove="all"/>
+    <!--### Obsolete in 4.3-->
+    <modify-function signature="unite(const QRect&amp;)const" remove="all"/>
+    <!--### Obsolete in 4.3-->
   </value-type>
 
   <value-type name="QRectF">
-    <modify-function signature="getCoords(qreal*,qreal*,qreal*,qreal*)const"> <remove/> </modify-function>
-    <modify-function signature="getRect(qreal*,qreal*,qreal*,qreal*)const"> <remove/> </modify-function>
-    <modify-function signature="operator&amp;=(QRectF)"> <remove/> </modify-function>
-    <modify-function signature="operator|=(QRectF)"> <remove/> </modify-function>
-    <modify-function signature="operator&amp;(QRectF)const"> <remove/> </modify-function>
-    <modify-function signature="operator|(QRectF)const"> <remove/> </modify-function>
-  
-    <modify-function signature="intersect(const QRectF&amp;)const" remove="all"/> <!--### Obsolete in 4.3-->
-    <modify-function signature="unite(const QRectF&amp;)const" remove="all"/> <!--### Obsolete in 4.3-->
+    <modify-function signature="getCoords(double*,double*,double*,double*)const">
+      <remove/>
+    </modify-function>
+    <modify-function signature="getRect(double*,double*,double*,double*)const">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&amp;=(QRectF)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator|=(QRectF)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&amp;(QRectF)const">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator|(QRectF)const">
+      <remove/>
+    </modify-function>
+
+    <modify-function signature="intersect(const QRectF&amp;)const" remove="all"/>
+    <!--### Obsolete in 4.3-->
+    <modify-function signature="unite(const QRectF&amp;)const" remove="all"/>
+    <!--### Obsolete in 4.3-->
   </value-type>
 
 
   <value-type name="QSize">
-    <modify-function signature="operator*=(qreal)"> <access modifier="private"/> </modify-function>
-    <modify-function signature="operator/=(qreal)"> <access modifier="private"/> </modify-function>
-    <modify-function signature="operator+=(QSize)"> <access modifier="private"/> </modify-function>
-    <modify-function signature="operator-=(QSize)"> <access modifier="private"/> </modify-function>
-    <modify-function signature="rheight()"> <remove/> </modify-function>
-    <modify-function signature="rwidth()"> <remove/> </modify-function>     
+    <modify-function signature="operator*=(double)">
+      <access modifier="private"/>
+    </modify-function>
+    <modify-function signature="operator/=(double)">
+      <access modifier="private"/>
+    </modify-function>
+    <modify-function signature="operator+=(QSize)">
+      <access modifier="private"/>
+    </modify-function>
+    <modify-function signature="operator-=(QSize)">
+      <access modifier="private"/>
+    </modify-function>
+    <modify-function signature="rheight()">
+      <remove/>
+    </modify-function>
+    <modify-function signature="rwidth()">
+      <remove/>
+    </modify-function>
   </value-type>
 
   <value-type name="QSizeF">
-    <modify-function signature="operator*=(qreal)"> <access modifier="private"/> </modify-function>
-    <modify-function signature="operator/=(qreal)"> <access modifier="private"/> </modify-function>
-    <modify-function signature="operator+=(QSizeF)"> <access modifier="private"/> </modify-function>
-    <modify-function signature="operator-=(QSizeF)"> <access modifier="private"/> </modify-function>
-    <modify-function signature="rheight()"> <remove/> </modify-function>
-    <modify-function signature="rwidth()"> <remove/> </modify-function>     
+    <modify-function signature="operator*=(double)">
+      <access modifier="private"/>
+    </modify-function>
+    <modify-function signature="operator/=(double)">
+      <access modifier="private"/>
+    </modify-function>
+    <modify-function signature="operator+=(QSizeF)">
+      <access modifier="private"/>
+    </modify-function>
+    <modify-function signature="operator-=(QSizeF)">
+      <access modifier="private"/>
+    </modify-function>
+    <modify-function signature="rheight()">
+      <remove/>
+    </modify-function>
+    <modify-function signature="rwidth()">
+      <remove/>
+    </modify-function>
   </value-type>
-  
+
   <value-type name="QStringMatcher">
     <modify-function signature="operator=(QStringMatcher)" remove="all"/>
+    <modify-function signature="QStringMatcher(const QChar*,int,Qt::CaseSensitivity)" remove="all"/>
+    <modify-function signature="indexIn(const QChar*,int,int)const" remove="all"/>
   </value-type>
 
-  <value-type name="QTime"/>  
+  <value-type name="QTime"/>
 
   <value-type name="QPersistentModelIndex">
     <modify-function signature="operator=(QPersistentModelIndex)" remove="all"/>
@@ -692,18 +806,17 @@
 
   <value-type name="QUuid">
     <modify-function signature="QUuid(const char*)">
-        <remove/>
+      <remove/>
     </modify-function>
   </value-type>
 
-  <value-type name="QLocale">  
-    <modify-function signature="toString(qlonglong) const" remove="all"/>
-    <modify-function signature="toString(ushort) const" remove="all"/>
+  <value-type name="QLocale">
+    <modify-function signature="toString(unsigned long long) const" remove="all"/>
+    <modify-function signature="toString(unsigned short) const" remove="all"/>
     <modify-function signature="toString(unsigned int) const" remove="all"/>
     <modify-function signature="toUInt(QString,bool*,int)const" remove="all"/>
     <modify-function signature="toULongLong(QString,bool*,int)const" remove="all"/>
     <modify-function signature="operator=(QLocale)" remove="all"/>
-    
   
     <extra-includes>
         <include file-name="QDate" location="global"/>
@@ -807,8 +920,8 @@
         </modify-argument>
     </modify-function>
   </value-type>
-  
-  
+
+
   <value-type name="QBitArray">
     <modify-function signature="operator[](int)" remove="all"/>
     <modify-function signature="operator[](int)const" remove="all"/>
@@ -899,59 +1012,83 @@
     <modify-function signature="operator|=(QBitArray)">
       <modify-argument index="0" replace-value="this"/>
     </modify-function>
-  </value-type>  
+  </value-type>
 
+  <object-type name="QReadWriteLock"/>
   <object-type name="QDirIterator"/>
   <object-type name="QAbstractFileEngineIterator"/>
-  <object-type name="QAbstractItemModel"/>
-    
+  <object-type name="QAbstractItemModel">
+    <modify-function signature="rowsAboutToBeInserted(QModelIndex,int,int)" private-signal="yes"/>
+    <modify-function signature="rowsInserted(QModelIndex,int,int)" private-signal="yes"/>
+
+    <modify-function signature="rowsAboutToBeRemoved(QModelIndex,int,int)" private-signal="yes"/>
+    <modify-function signature="rowsRemoved(QModelIndex,int,int)" private-signal="yes"/>
+
+    <modify-function signature="columnsAboutToBeInserted(QModelIndex,int,int)" private-signal="yes"/>
+    <modify-function signature="columnsInserted(QModelIndex,int,int)" private-signal="yes"/>
+
+    <modify-function signature="columnsAboutToBeRemoved(QModelIndex,int,int)" private-signal="yes"/>
+    <modify-function signature="columnsRemoved(QModelIndex,int,int)" private-signal="yes"/>
+
+    <modify-function signature="modelAboutToBeReset()" private-signal="yes"/>
+    <modify-function signature="modelReset()" private-signal="yes"/>
+  </object-type>
+
   <object-type name="QAbstractListModel">
     <extra-includes>
-        <include file-name="QStringList" location="global"/>
-        <include file-name="QSize" location="global"/>
+      <include file-name="QStringList" location="global"/>
+      <include file-name="QSize" location="global"/>
     </extra-includes>
   </object-type>
-  
-  <object-type name="QAbstractTableModel">
-    <extra-includes>
-        <include file-name="QStringList" location="global"/>
-        <include file-name="QSize" location="global"/>
-    </extra-includes>  
-  </object-type>
-  
+
   <value-type name="QUrl">
     <extra-includes>
-        <include file-name="QStringList" location="global"/>
+      <include file-name="QStringList" location="global"/>
     </extra-includes>
     <modify-function signature="operator=(QUrl)" remove="all"/>
     <modify-function signature="operator=(QString)" remove="all"/>
-  
-    <modify-function signature="fromPunycode(const QByteArray&amp;)" remove="all"/> <!--### Obsolete in 4.3-->
-    <modify-function signature="toPunycode(const QString&amp;)" remove="all"/> <!--### Obsolete in 4.3-->
+
+    <modify-function signature="fromPunycode(const QByteArray&amp;)" remove="all"/>
+    <!--### Obsolete in 4.3-->
+    <modify-function signature="toPunycode(const QString&amp;)" remove="all"/>
+    <!--### Obsolete in 4.3-->
   </value-type>
-  
+
   <value-type name="QRegExp">
     <extra-includes>
-        <include file-name="QStringList" location="global"/>
+      <include file-name="QStringList" location="global"/>
     </extra-includes>
     <modify-function signature="operator=(QRegExp)" remove="all"/>
+    <modify-function signature="pos(int)const">
+      <remove/>
+    </modify-function>
+    <modify-function signature="cap(int)const">
+      <remove/>
+    </modify-function>
+    <modify-function signature="capturedTexts()const">
+      <remove/>
+    </modify-function>
+    <modify-function signature="errorString()const">
+      <remove/>
+    </modify-function>
   </value-type>
 
   <value-type name="QFileInfo">
     <extra-includes>
-        <include file-name="QDateTime" location="global"/>
-        <include file-name="QDir" location="global"/>
+      <include file-name="QDateTime" location="global"/>
+      <include file-name="QDir" location="global"/>
     </extra-includes>
     <modify-function signature="operator!=(const QFileInfo &amp;)const" remove="all"/>
     <modify-function signature="operator==(const QFileInfo &amp;)const" remove="all"/>
     <modify-function signature="operator=(QFileInfo)" remove="all"/>
     <modify-function signature="setFile(QFile)">
-        <modify-argument index="1">
-            <reference-count action="ignore"/>
-        </modify-argument>
+      <modify-argument index="1">
+        <reference-count action="ignore"/>
+      </modify-argument>
     </modify-function>
-  
-    <modify-function signature="readLink()const" remove="all"/> <!--### Obsolete in 4.3-->
+
+    <modify-function signature="readLink()const" remove="all"/>
+    <!--### Obsolete in 4.3-->
   
     <modify-function signature="QFileInfo(QFile)">
       <modify-argument index="1">
@@ -971,12 +1108,12 @@
     </modify-function>
   </value-type>
 
-  <!-- <interface-type name="QFactoryInterface" java-name="QAbstractFactory" /> -->
+  <interface-type name="QFactoryInterface"/>
 
   <value-type name="QByteArray">
-   
+
     <extra-includes>
-        <include file-name="QNoImplicitBoolCast" location="global"/>
+      <include file-name="QNoImplicitBoolCast" location="global"/>
     </extra-includes>
 
     <!-- removed functions -->
@@ -990,7 +1127,7 @@
     <modify-function signature="end()" remove="all"/>
     <modify-function signature="end()const" remove="all"/>
     <modify-function signature="number(uint,int)" remove="all"/>
-    <modify-function signature="number(qulonglong,int)" remove="all"/>
+    <modify-function signature="number(unsigned long long,int)" remove="all"/>
     <modify-function signature="operator const char *()const" remove="all"/>
     <modify-function signature="operator const void *()const" remove="all"/>
     <modify-function signature="operator+=(const char*)" remove="all"/>
@@ -1006,8 +1143,8 @@
     <modify-function signature="push_front(const QByteArray&amp;)" remove="all"/>
     <modify-function signature="push_front(const char*)" remove="all"/>
     <modify-function signature="setNum(uint,int)" remove="all"/>
-    <modify-function signature="setNum(qulonglong,int)" remove="all"/>
-    <modify-function signature="setNum(ushort,int)" remove="all"/>
+    <modify-function signature="setNum(unsigned long long,int)" remove="all"/>
+    <modify-function signature="setNum(unsigned short,int)" remove="all"/>
     <modify-function signature="toLong(bool*, int) const" remove="all"/>
     <modify-function signature="toLongLong(bool*, int) const" remove="all"/>
     <modify-function signature="toShort(bool*, int) const" remove="all"/>
@@ -1243,24 +1380,50 @@
         </modify-argument>
     </modify-function>
   </value-type>
-  
+
   <value-type name="QTextBoundaryFinder">
     <modify-function signature="QTextBoundaryFinder(QTextBoundaryFinder::BoundaryType,const QChar*,int,unsigned char*,int)" remove="all"/>
     <modify-function signature="operator=(QTextBoundaryFinder)" remove="all"/>
   </value-type>
 
+  <value-type name="QEasingCurve">
+    <modify-function signature="customType()const" remove="all"/>
+    <modify-function signature="setCustomType(double)" remove="all"/>
+  </value-type>
+
+  <object-type name="QAbstractAnimation"/>
+  <object-type name="QVariantAnimation"/>
+  <object-type name="QAnimationGroup"/>
+  <object-type name="QPauseAnimation"/>
+  <object-type name="QParallelAnimationGroup"/>
+  <object-type name="QSequentialAnimationGroup"/>
+  <object-type name="QPropertyAnimation"/>
+
+  <object-type name="QAbstractState"/>
+  <object-type name="QAbstractTransition"/>
+  <object-type name="QState"/>
+  <object-type name="QStateMachine"/>
+  <object-type name="QHistoryState"/>
+  <object-type name="QSignalTransition"/>
+  <object-type name="QEventTransition"/>
+  <object-type name="QFinalState"/>
+
   <object-type name="QXmlStreamEntityResolver"/>
   <object-type name="QAbstractEventDispatcher">
     <extra-includes>
         <include file-name="QPair" location="global"/>
     </extra-includes>
-  </object-type>  
+  </object-type>
   <object-type name="QEventLoop"/>
-  <object-type name="QFile">  
-    <modify-function signature="readLink()const" remove="all"/> <!--### Obsolete in 4.3-->
-    <modify-function signature="readLink(QString)" remove="all"/> <!--### Obsolete in 4.3-->
-    <modify-function signature="map(qint64,qint64,QFile::MemoryMapFlags)" remove="all"/> <!-- Can't provide same API and performance -->
-    <modify-function signature="unmap(uchar*)" remove="all"/> <!-- Can't provide same API and performance -->    
+  <object-type name="QFile">
+    <modify-function signature="readLink()const" remove="all"/>
+    <!--### Obsolete in 4.3-->
+    <modify-function signature="readLink(QString)" remove="all"/>
+    <!--### Obsolete in 4.3-->
+    <modify-function signature="map(long long,long long,QFile::MemoryMapFlags)" remove="all"/>
+    <!-- Can't provide same API and performance -->
+    <modify-function signature="unmap(unsigned char*)" remove="all"/>
+    <!-- Can't provide same API and performance -->
   
     <modify-function signature="open(int,QFlags&lt;QIODevice::OpenModeFlag&gt;)" remove="all"/>
     <modify-function signature="decodeName(const char*)" remove="all"/>
@@ -1274,12 +1437,14 @@
     <modify-function signature="readLine(char *,qint64)" remove="all"/>
     <modify-function signature="write(const char *,qint64)" remove="all"/>
   </object-type>
+  <object-type name="QStateMachine::SignalEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::StateMachineSignal"/>
+  <object-type name="QStateMachine::WrappedEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::StateMachineWrapped"/>
 
   <object-type name="QCryptographicHash">
     <modify-function signature="addData(const char*,int)" remove="all"/>
   </object-type>
   <object-type name="QLibraryInfo"/>
-  <object-type name="QMutex"/>  
+  <object-type name="QMutex"/>
   <object-type name="QSemaphore"/>
   <object-type name="QSocketNotifier"/>
   <object-type name="QSystemLocale"/>
@@ -1297,74 +1462,71 @@
   </object-type>
   <object-type name="QMimeData">
     <extra-includes>
-        <include file-name="QStringList" location="global"/>
-        <include file-name="QUrl" location="global"/>
+      <include file-name="QStringList" location="global"/>
+      <include file-name="QUrl" location="global"/>
     </extra-includes>
-  </object-type>  
-  <object-type name="QTextCodec">          
+  </object-type>
+  <object-type name="QTextCodec">
 
     <modify-function signature="setCodecForTr(QTextCodec*)">
-        <access modifier="private"/>
-        <modify-argument index="1">
-            <reference-count action="set" variable-name="__rcCodecForTr"/>
-        </modify-argument>
+      <access modifier="private"/>
+      <modify-argument index="1">
+        <reference-count action="set" variable-name="__rcCodecForTr"/>
+      </modify-argument>
     </modify-function>
     <modify-function signature="setCodecForCStrings(QTextCodec*)">
-        <modify-argument index="1">
-            <reference-count action="set" variable-name="__rcCodecForCStrings"/>
-        </modify-argument>
+      <modify-argument index="1">
+        <reference-count action="set" variable-name="__rcCodecForCStrings"/>
+      </modify-argument>
     </modify-function>
     <modify-function signature="setCodecForLocale(QTextCodec*)">
-        <modify-argument index="1">
-            <reference-count action="set" variable-name="__rcCodecForLocale"/>
-        </modify-argument>
+      <modify-argument index="1">
+        <reference-count action="set" variable-name="__rcCodecForLocale"/>
+      </modify-argument>
     </modify-function>
-    
+
 
     <modify-function signature="codecForTr()">
-        <remove/>
+      <remove/>
     </modify-function>
 
     <modify-function signature="QTextCodec()">
-        <modify-argument index="-1">
-            <define-ownership class="java" owner="c++"/>
-        </modify-argument>
+      <modify-argument index="-1">
+        <define-ownership class="java" owner="c++"/>
+      </modify-argument>
     </modify-function>
-  
+
     <modify-function signature="fromUnicode(const QChar*,int,QTextCodec::ConverterState*)const">
-        <remove/>
+      <remove/>
     </modify-function>
-    
+
     <modify-function signature="toUnicode(const char*,int,QTextCodec::ConverterState*)const">
-        <remove/>
+      <remove/>
     </modify-function>
-    
+
     <modify-function signature="toUnicode(const char*)const">
-        <remove/>
+      <remove/>
     </modify-function>
   </object-type>
 
-  <interface-type name="QTextCodecFactoryInterface" java-name="QAbstractTextCodecFactory"/>
-  <object-type name="QTextCodecPlugin"/>
-
   <object-type name="QTextDecoder">
     <modify-function signature="toUnicode(const char*,int)">
-        <remove/>
-    </modify-function>    
+      <remove/>
+    </modify-function>
     <modify-function signature="toUnicode(QString*,const char*,int)" remove="all"/>
   </object-type>
   <object-type name="QTextEncoder">
     <modify-function signature="fromUnicode(const QChar*,int)">
-        <remove/>
-    </modify-function>    
+      <remove/>
+    </modify-function>
   </object-type>
-  <object-type name="QTimeLine"/> 
+  <object-type name="QTimeLine"/>
   <object-type name="QTranslator">
     <modify-function signature="translate(const char*,const char*,const char*,int)const">
-        <remove/>
+      <remove/>
     </modify-function>
   </object-type>
-  
+
   <object-type name="QWaitCondition"/>
 
   <object-type name="QFileSystemWatcher">
@@ -1372,15 +1534,17 @@
       <include file-name="QStringList" location="global"/>
     </extra-includes>
   </object-type>
-  
+
   <object-type name="QTextCodec::ConverterState">
     <include file-name="QTextCodec" location="global"/>
   </object-type>
 
-  <object-type name="QBuffer">  
+  <object-type name="QBuffer">
     <modify-function signature="buffer()">
-        <remove/>
+      <remove/>
     </modify-function>
+    <modify-function signature="connectNotify(const char *)" remove="all"/>
+    <modify-function signature="disconnectNotify(const char *)" remove="all"/>
   
     <!-- ### modify to return value by pointer? -->
     <modify-function signature="buffer()const" remove="all"/>
@@ -1388,47 +1552,49 @@
 
     <modify-function signature="setData(const char*,int)" remove="all"/>
   </object-type>
-  
+
   <object-type name="QTimer"/>
 
   <object-type name="QAbstractFileEngineHandler">
     <modify-function signature="create(const QString &amp;) const">
-        <modify-argument index="return">
-            <define-ownership owner="c++" class="shell"/>
-        </modify-argument>
+      <modify-argument index="return">
+        <define-ownership owner="c++" class="shell"/>
+      </modify-argument>
     </modify-function>
   </object-type>
-  
-  <!-- <object-type name="QAbstractFileEngine::MapExtensionOption" /> -->
-  <!-- <object-type name="QAbstractFileEngine::MapExtensionReturn" /> -->
-  <!-- <object-type name="QAbstractFileEngine::UnMapExtensionOption" /> -->
+
+  <object-type name="QAbstractFileEngine::MapExtensionOption"/>
+  <object-type name="QAbstractFileEngine::MapExtensionReturn"/>
+  <object-type name="QAbstractFileEngine::UnMapExtensionOption"/>
   <object-type name="QAbstractFileEngine">
     <extra-includes>
-        <include file-name="QDateTime" location="global"/>
+      <include file-name="QDateTime" location="global"/>
     </extra-includes>
-    <modify-function signature="map(qlonglong,qlonglong,QFile::MemoryMapFlags)" remove="all"/>
+    <modify-function signature="map(long long,long long,QFile::MemoryMapFlags)" remove="all"/>
     <modify-function signature="unmap(unsigned char*)" remove="all"/>
   </object-type>
-  
+
   <object-type name="QProcess">
-    <modify-function signature="readChannelMode()const" remove="all"/> <!--### Obsolete in 4.3-->
-    <modify-function signature="setReadChannelMode(QProcess::ProcessChannelMode)" remove="all"/> <!--### Obsolete in 4.3-->
+    <modify-function signature="readChannelMode()const" remove="all"/>
+    <!--### Obsolete in 4.3-->
+    <modify-function signature="setReadChannelMode(QProcess::ProcessChannelMode)" remove="all"/>
+    <!--### Obsolete in 4.3-->
   </object-type>
-  
+
   <object-type name="QSignalMapper">
     <modify-function signature="mapped(const QString &amp;)">
-        <rename to="mappedString"/>
+      <rename to="mappedString"/>
     </modify-function>
     <modify-function signature="mapped(int)">
-        <rename to="mappedInteger"/>
-    </modify-function>    
+      <rename to="mappedInteger"/>
+    </modify-function>
     <modify-function signature="mapped(QObject *)">
-        <rename to="mappedQObject"/>
-    </modify-function>    
+      <rename to="mappedQObject"/>
+    </modify-function>
     <modify-function signature="mapped(QWidget *)" remove="all"/>
-    
+
     <modify-function signature="mapping(QWidget*)const" remove="all"/>
-        
+
     <modify-function signature="setMapping(QObject*,QWidget*)" remove="all"/>
   
     <!-- ### overloads -->
@@ -1450,62 +1616,62 @@
     <modify-function signature="setMapping(QObject*,QObject*)">
       <rename to="setMappingByObject"/>
     </modify-function>
-  </object-type>  
-  
+  </object-type>
+
   <object-type name="QObject">
     <modify-function signature="childEvent(QChildEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+      <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
     <modify-function signature="customEvent(QEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+      <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
     <modify-function signature="event(QEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+      <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
     <modify-function signature="eventFilter(QObject*,QEvent*)">
-        <modify-argument index="2" invalidate-after-use="yes"/>
+      <modify-argument index="2" invalidate-after-use="yes"/>
     </modify-function>
     <modify-function signature="timerEvent(QTimerEvent*)">
-        <modify-argument index="1" invalidate-after-use="yes"/>
+      <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
 
     <modify-function signature="installEventFilter(QObject*)">
-        <modify-argument index="1">
-            <reference-count action="add" variable-name="__rcEventFilters"/>
-        </modify-argument>
+      <modify-argument index="1">
+        <reference-count action="add" variable-name="__rcEventFilters"/>
+      </modify-argument>
     </modify-function>
     <modify-function signature="removeEventFilter(QObject*)">
-        <modify-argument index="1">
-            <reference-count action="remove" variable-name="__rcEventFilters"/>
-        </modify-argument>
+      <modify-argument index="1">
+        <reference-count action="remove" variable-name="__rcEventFilters"/>
+      </modify-argument>
     </modify-function>
     <modify-function signature="setParent(QObject*)">
-        <modify-argument index="1">
-            <reference-count action="ignore"/>
-        </modify-argument>
+      <modify-argument index="1">
+        <reference-count action="ignore"/>
+      </modify-argument>
     </modify-function>
 
     <modify-function signature="deleteLater()">
-        <rename to="disposeLater"/>
+      <rename to="disposeLater"/>
     </modify-function>
-    <!--
+
     <modify-function signature="inherits(const char*)const">
-        <remove/>
+      <remove/>
     </modify-function>
-    -->
+
     <modify-function signature="property(const char*)const">
-        <access modifier="private"/>
+      <access modifier="private"/>
     </modify-function>
-    
+
     <modify-function signature="setProperty(const char*,QVariant)">
-        <access modifier="private"/>        
+      <access modifier="private"/>
     </modify-function>
-    
-    
+
+
     <extra-includes>
-        <include file-name="QVarLengthArray" location="global"/>
+      <include file-name="QVarLengthArray" location="global"/>
     </extra-includes>
-    
+
   
     <modify-function signature="property(const char*)const">
       <modify-argument index="1">
@@ -1537,49 +1703,51 @@
 
   <object-type name="QCoreApplication">
     <extra-includes>
-        <include file-name="QStringList" location="global"/>
+      <include file-name="QStringList" location="global"/>
     </extra-includes>
-    
-    <modify-function signature="argv()" remove="all"/> <!-- Obsolete -->
-    <modify-function signature="argc()" remove="all"/> <!-- Obsolete -->
-    
+
+    <modify-function signature="argv()" remove="all"/>
+    <!-- Obsolete -->
+    <modify-function signature="argc()" remove="all"/>
+    <!-- Obsolete -->
+
     <modify-function signature="notify(QObject*,QEvent*)">
-        <modify-argument index="2" invalidate-after-use="yes"/>
+      <modify-argument index="2" invalidate-after-use="yes"/>
     </modify-function>
-    
-    
+
+
     <modify-function signature="QCoreApplication(int &amp;, char  **)">
       <access modifier="private"/>
-    </modify-function>     
+    </modify-function>
     <modify-function signature="removePostedEvents(QObject*)">
-        <modify-argument index="1">
-            <reference-count action="ignore"/>
-        </modify-argument>
+      <modify-argument index="1">
+        <reference-count action="ignore"/>
+      </modify-argument>
     </modify-function>
     <modify-function signature="removePostedEvents(QObject*,int)">
-        <modify-argument index="1">
-            <reference-count action="ignore"/>
-        </modify-argument>
+      <modify-argument index="1">
+        <reference-count action="ignore"/>
+      </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="installTranslator(QTranslator *)">
-        <modify-argument index="1">
-            <reference-count action="add" variable-name="__rcTranslators"/>
-        </modify-argument>
+      <modify-argument index="1">
+        <reference-count action="add" variable-name="__rcTranslators"/>
+      </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="removeTranslator(QTranslator *)">
-        <modify-argument index="1">
-            <reference-count action="remove" variable-name="__rcTranslators"/>
-        </modify-argument>
-    </modify-function>    
-    
-    
+      <modify-argument index="1">
+        <reference-count action="remove" variable-name="__rcTranslators"/>
+      </modify-argument>
+    </modify-function>
+
+
     <modify-function signature="postEvent(QObject*,QEvent*)">
-        <modify-argument index="2">
-            <define-ownership class="java" owner="c++"/>  
-        </modify-argument>
-    </modify-function>    
+      <modify-argument index="2">
+        <define-ownership class="java" owner="c++"/>
+      </modify-argument>
+    </modify-function>
   
     <modify-function signature="QCoreApplication(int &amp;, char **)" remove="all"/>
     <!-- ### arguments() causes a warning: "QScriptValue::setProperty(arguments): cannot change flags of a native property" -->
@@ -1629,11 +1797,19 @@
 
   <object-type name="QSettings">
     <extra-includes>
-        <include file-name="QStringList" location="global"/>
+      <include file-name="QStringList" location="global"/>
     </extra-includes>
-  
-    <modify-function signature="setSystemIniPath(const QString&amp;)" remove="all"/> <!--### Obsolete in 4.3-->
-    <modify-function signature="setUserIniPath(const QString&amp;)" remove="all"/> <!--### Obsolete in 4.3-->
+
+    <modify-function signature="setIniCodec(QTextCodec*)">
+      <modify-argument index="1">
+        <reference-count action="set" variable-name="__rcIniCodec"/>
+      </modify-argument>
+    </modify-function>
+
+    <modify-function signature="setSystemIniPath(const QString&amp;)" remove="all"/>
+    <!--### Obsolete in 4.3-->
+    <modify-function signature="setUserIniPath(const QString&amp;)" remove="all"/>
+    <!--### Obsolete in 4.3-->
   </object-type>
 
   <object-type name="QEvent" polymorphic-base="yes" polymorphic-id-expression="%1-&gt;type() == QEvent::None"/>
@@ -1641,34 +1817,62 @@
     <modify-field name="c" read="false" write="false"/>
   </object-type>
   <object-type name="QTimerEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Timer"/>
-  <object-type name="QDynamicPropertyChangeEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::DynamicPropertyChange"/>  
-            
-  <object-type name="QDataStream">    
+  <object-type name="QDynamicPropertyChangeEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::DynamicPropertyChange"/>
+
+  <object-type name="QDataStream">
     <modify-function signature="setDevice(QIODevice*)">
-        <modify-argument index="1">
-            <reference-count action="set" variable-name="__rcDevice"/>
-        </modify-argument>
+      <modify-argument index="1">
+        <reference-count action="set" variable-name="__rcDevice"/>
+      </modify-argument>
     </modify-function>
-<!--
     <modify-function signature="unsetDevice()">
-        <inject-code position="end">
-            __rcDevice = null;
-        </inject-code>
+      <inject-code position="end">
+        __rcDevice = null;
+      </inject-code>
     </modify-function>
--->
 
 
-    <modify-function signature="operator&lt;&lt;(const char*)"> <remove/> </modify-function>
-    <modify-function signature="operator&lt;&lt;(unsigned int)"> <remove/> </modify-function>     
-    <modify-function signature="operator&lt;&lt;(unsigned long long)"> <remove/> </modify-function>
-    <modify-function signature="operator&lt;&lt;(unsigned short)"> <remove/> </modify-function>
+    <modify-function signature="operator&lt;&lt;(const char*)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(unsigned char)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(unsigned int)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(unsigned long long)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(unsigned short)">
+      <remove/>
+    </modify-function>
 
-    <modify-function signature="operator&gt;&gt;(char &amp;*)"> <remove/> </modify-function>  
+    <modify-function signature="operator&gt;&gt;(char &amp;*)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&gt;&gt;(uint&amp;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&gt;&gt;(unsigned char&amp;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&gt;&gt;(unsigned long long&amp;)">
+      <remove/>
+    </modify-function>
 
-    <modify-function signature="readRawData(char*,int)"> <remove/> </modify-function>
-    <modify-function signature="readBytes(char&amp;*,uint&amp;)"> <remove/> </modify-function>
-    <modify-function signature="writeRawData(const char*,int)"> <remove/> </modify-function>
-    <modify-function signature="writeBytes(const char*,uint)"> <remove/> </modify-function>
+    <modify-function signature="readRawData(char*,int)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="readBytes(char&amp;*,uint&amp;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="writeRawData(const char*,int)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="writeBytes(const char*,uint)">
+      <remove/>
+    </modify-function>
   
       <modify-function signature="operator&gt;&gt;(signed char&amp;)" remove="all"/>
       <modify-function signature="operator&lt;&lt;(signed char)" remove="all"/>
@@ -1855,49 +2059,99 @@
   </object-type>
 
   <object-type name="QFSFileEngine">
-  <extra-includes>
-           <include file-name="QDateTime" location="global"/>
-        </extra-includes>
+    <extra-includes>
+      <include file-name="QDateTime" location="global"/>
+    </extra-includes>
   </object-type>
 
   <object-type name="QTextStream">
-    <modify-function signature="QTextStream(QByteArray *, QFlags&lt;QIODevice::OpenModeFlag&gt;)"> <remove/> </modify-function>
-    <modify-function signature="QTextStream(QString*,QFlags&lt;QIODevice::OpenModeFlag&gt;)"> <remove/> </modify-function>
-    <modify-function signature="operator&gt;&gt;(QChar&amp;)"> <remove/> </modify-function>
-    <modify-function signature="operator&lt;&lt;(const void*)"> <remove/> </modify-function>
-    <modify-function signature="operator&lt;&lt;(unsigned int)"> <remove/> </modify-function>     
-    <modify-function signature="operator&lt;&lt;(qlonglong)"> <remove/> </modify-function>    
-    <modify-function signature="operator&lt;&lt;(const QChar &amp;)"> <remove/> </modify-function>        
-    <modify-function signature="operator&lt;&lt;(unsigned long)"> <remove/> </modify-function>
-    <modify-function signature="operator&lt;&lt;(signed long)"> <remove/> </modify-function>
-    <modify-function signature="operator&lt;&lt;(const char*)"> <remove/> </modify-function>    
-    <modify-function signature="operator&lt;&lt;(unsigned short)"> <remove/> </modify-function>   
-    <modify-function signature="operator&gt;&gt;(qulonglong&amp;)"> <remove/> </modify-function>
-    <modify-function signature="operator&gt;&gt;(ulong&amp;)"> <remove/> </modify-function>
-    <modify-function signature="setString(QString*,QFlags&lt;QIODevice::OpenModeFlag&gt;)"> <remove/> </modify-function>    
-    <modify-function signature="string()const"> <remove/> </modify-function>
-    <modify-function signature="operator&gt;&gt;(signed long&amp;)"> <remove/> </modify-function>
-    <modify-function signature="operator&gt;&gt;(char*)"> <remove/> </modify-function>
-    <modify-function signature="operator&gt;&gt;(QByteArray&amp;)"> <remove/> </modify-function>
-    <modify-function signature="operator&gt;&gt;(QString&amp;)"> <remove/> </modify-function>
-    
-  
+    <modify-function signature="QTextStream(QByteArray *, QFlags&lt;QIODevice::OpenModeFlag&gt;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="QTextStream(QString*,QFlags&lt;QIODevice::OpenModeFlag&gt;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&gt;&gt;(QChar&amp;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(const void*)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(unsigned int)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(unsigned long long)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(const QChar &amp;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(unsigned long)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(signed long)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(const char*)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(unsigned short)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(const QByteArray&amp;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&gt;&gt;(unsigned long long&amp;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&gt;&gt;(uint&amp;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&gt;&gt;(ulong&amp;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="setString(QString*,QFlags&lt;QIODevice::OpenModeFlag&gt;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="string()const">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&gt;&gt;(signed long&amp;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&gt;&gt;(char*)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&gt;&gt;(QByteArray&amp;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&gt;&gt;(QString&amp;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&gt;&gt;(unsigned short&amp;)">
+      <remove/>
+    </modify-function>
+    <modify-function signature="operator&lt;&lt;(const QString&amp;)">
+      <remove/>
+    </modify-function>
+
+
     <modify-function signature="setCodec(QTextCodec *)">
-        <modify-argument index="1">
-            <reference-count action="set" variable-name="__rcCodec"/>
-        </modify-argument>
+      <modify-argument index="1">
+        <reference-count action="set" variable-name="__rcCodec"/>
+      </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="QTextStream(QIODevice *)">
-        <modify-argument index="1">
-            <reference-count action="set" variable-name="__rcDevice"/>
-        </modify-argument>
-    </modify-function>    
+      <modify-argument index="1">
+        <reference-count action="set" variable-name="__rcDevice"/>
+      </modify-argument>
+    </modify-function>
     <modify-function signature="setDevice(QIODevice *)">
-        <modify-argument index="1">
-            <reference-count action="set" variable-name="__rcDevice"/>
-        </modify-argument>
-    </modify-function>         
+      <modify-argument index="1">
+        <reference-count action="set" variable-name="__rcDevice"/>
+      </modify-argument>
+    </modify-function>
   
       <modify-function signature="setCodec(const char *)"> 
         <modify-argument index="1">
@@ -2084,433 +2338,61 @@
       <modify-function signature="operator&lt;&lt;(qulonglong)" remove="all"/> 
       <modify-function signature="operator&gt;&gt;(qulonglong&amp;)" remove="all"/> 
   </object-type>
-  
+
   <object-type name="QSystemSemaphore"/>
-  
+
   <namespace-type name="QtConcurrent" target-type="class">
     <extra-includes>
         <include file-name="qtconcurrentreducekernel.h" location="global"/>
         <include file-name="qtconcurrentthreadengine.h" location="global"/>
     </extra-includes>
   </namespace-type>
-  
+
   <value-type name="QFuture" generate="no">
     <modify-function signature="operator T() const" remove="all"/>
     <modify-function signature="operator=(const QFuture &amp;)" remove="all"/>
   </value-type>
-  <value-type name="QtScriptVoidFuture" java-name="QFutureVoid">
+  <value-type name="QtJambiVoidFuture" java-name="QFutureVoid">
     <modify-function signature="resultCount()const" remove="all"/>
     <modify-function signature="isResultReadyAt(int)const" remove="all"/>
-  
-    <modify-function signature="operator==(const QFuture &amp;)const">
-        <modify-argument index="1">
-            <replace-type modified-type="QtScriptVoidFuture"/>
-        </modify-argument>
-    </modify-function>  
-    <modify-function signature="QFuture(const QFuture &amp;)">
-        <modify-argument index="1">
-            <replace-type modified-type="QtScriptVoidFuture"/>
-        </modify-argument>
-    </modify-function>    
   </value-type>
-  <value-type name="QtScriptFuture" java-name="QFuture" generic-class="yes">
-    <modify-function signature="operator==(const QFuture &amp;)const">
-        <modify-argument index="1">
-            <replace-type modified-type="QtScriptFuture"/>
-        </modify-argument>
-    </modify-function>  
-    <modify-function signature="QFuture(const QFuture &amp;)">
-        <modify-argument index="1">
-            <replace-type modified-type="QtScriptFuture"/>
-        </modify-argument>
-    </modify-function>  
-    <inject-code class="native">
-    </inject-code>
-  </value-type>
-  
+  <value-type name="QtJambiFuture" java-name="QFuture" generic-class="yes"/>
+
   <object-type name="QFutureWatcherBase">
     <modify-function signature="connectNotify(const char *)" remove="all"/>
     <modify-function signature="disconnectNotify(const char *)" remove="all"/>
-  </object-type>  
-  <object-type name="QtScriptVoidFutureWatcher" java-name="QFutureWatcherVoid">
-    <modify-function signature="setFuture(const QFuture &amp;)">
-        <modify-argument index="1">
-            <replace-type modified-type="QtScriptVoidFuture"/>
-        </modify-argument>
-    </modify-function>         
   </object-type>
-  
+  <object-type name="QtJambiVoidFutureWatcher" java-name="QFutureWatcherVoid"/>
+
   <object-type name="QFutureWatcher" generate="no">
     <modify-function signature="future()const" remove="all"/>
   </object-type>
-  <object-type name="QtScriptFutureWatcher" java-name="QFutureWatcher" generic-class="yes">
-    <modify-function signature="setFuture(const QFuture &amp;)">
-        <modify-argument index="1">
-            <replace-type modified-type="QtScriptFuture"/>
-        </modify-argument>
-    </modify-function>         
-  </object-type>
-  
+  <object-type name="QtJambiFutureWatcher" java-name="QFutureWatcher" generic-class="yes"/>
+
   <object-type name="QFutureSynchronizer" generate="no"/>
-  <object-type name="QtScriptFutureSynchronizer" generic-class="yes" java-name="QFutureSynchronizer">
-      <modify-function signature="QFutureSynchronizer(const QFuture &amp;)">
-        <modify-argument index="1">
-            <replace-type modified-type="QtScriptFuture"/>
-        </modify-argument>
-      </modify-function>
-      <modify-function signature="addFuture(const QFuture &amp;)">
-        <modify-argument index="1">
-            <replace-type modified-type="QtScriptFuture"/>
-        </modify-argument>
-      </modify-function>      
-      <modify-function signature="setFuture(const QFuture &amp;)">
-        <modify-argument index="1">
-            <replace-type modified-type="QtScriptFuture"/>
-        </modify-argument>
-      </modify-function>            
-      <modify-function signature="futures()const" remove="all"/>
-  </object-type>
-  <object-type name="QtScriptVoidFutureSynchronizer" java-name="QFutureSynchronizerVoid">
-      <modify-function signature="QFutureSynchronizer(const QFuture &amp;)">
-        <modify-argument index="1">
-            <replace-type modified-type="QtScriptVoidFuture"/>
-        </modify-argument>
-      </modify-function>
-      <modify-function signature="addFuture(const QFuture &amp;)">
-        <modify-argument index="1">
-            <replace-type modified-type="QtScriptVoidFuture"/>
-        </modify-argument>
-      </modify-function>      
-      <modify-function signature="setFuture(const QFuture &amp;)">
-        <modify-argument index="1">
-            <replace-type modified-type="QtScriptVoidFuture"/>
-        </modify-argument>
-      </modify-function>                  
-      <modify-function signature="futures()const" remove="all"/>
-  </object-type>
+  <object-type name="QtJambiFutureSynchronizer" generic-class="yes" java-name="QFutureSynchronizer"/>
+  <object-type name="QtJambiVoidFutureSynchronizer" java-name="QFutureSynchronizerVoid"/>
   <object-type name="QThreadPool"/>
-  
+
   <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>       
+    <modify-function signature="operator=(const QFuture&amp;)" remove="all"/>
   </object-type>
+  <object-type name="QtJambiFutureIterator" generic-class="yes" java-name="QFutureIterator"/>
   <object-type name="QRunnable"/>
 
-  
-    <value-type name="QXmlStreamAttribute">
-        <modify-function signature="operator=(QXmlStreamAttribute)" remove="all"/>
-
-      <modify-function signature="name()const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-
-      <modify-function signature="namespaceUri()const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-
-      <modify-function signature="prefix()const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-
-      <modify-function signature="qualifiedName()const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-
-      <modify-function signature="value()const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-
-    </value-type>
-    <value-type name="QXmlStreamAttributes">
-        <modify-function signature="operator+(QVector&lt;QXmlStreamAttribute&gt;)const" remove="all"/>
-        <modify-function signature="operator&lt;&lt;(QVector&lt;QXmlStreamAttribute&gt;)" remove="all"/>
-        <modify-function signature="operator&lt;&lt;(QXmlStreamAttribute)" remove="all"/>
-        <modify-function signature="push_back(QXmlStreamAttribute)" remove="all"/>
-        <modify-function signature="pop_back()" remove="all"/>
-        <modify-function signature="push_front(QXmlStreamAttribute)" remove="all"/>
-        <modify-function signature="pop_front()" remove="all"/>
-
-        <modify-function signature="value(const QString &amp;, const QLatin1String &amp;)const">
-            <remove/>
-        </modify-function>            
-        <modify-function signature="value(const QLatin1String &amp;, const QLatin1String &amp;)const">
-            <remove/>
-        </modify-function>            
-        <modify-function signature="value(const QLatin1String &amp;)const">
-            <remove/>            
-        </modify-function>            
-        <modify-function signature="hasAttribute(const QLatin1String &amp;)const">
-            <remove/>            
-        </modify-function>            
-
-
-      <modify-function signature="value(QString,QString)const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-
-      <modify-function signature="value(QString)const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-
-    </value-type>
-    <value-type name="QXmlStreamNamespaceDeclaration">
-        <modify-function signature="operator=(QXmlStreamNamespaceDeclaration)" remove="all"/>
-
-      <modify-function signature="namespaceUri()const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-
-      <modify-function signature="prefix()const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-
-    </value-type>
-    <value-type name="QXmlStreamNotationDeclaration">
-        <modify-function signature="operator=(QXmlStreamNotationDeclaration)" remove="all"/>
+  <!-- Inefficient hash codes -->
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUuid' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QLocale' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFuture' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QRegExp' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFutureVoid' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUrl' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QProcessEnvironment' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
 
-      <modify-function signature="name()const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-
-      <modify-function signature="publicId()const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-
-      <modify-function signature="systemId()const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-
-    </value-type>
-    <value-type name="QXmlStreamEntityDeclaration">
-        <modify-function signature="operator=(QXmlStreamEntityDeclaration)" remove="all"/>
-
-      <modify-function signature="name()const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-
-      <modify-function signature="notationName()const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-
-      <modify-function signature="publicId()const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-
-      <modify-function signature="systemId()const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-
-      <modify-function signature="value()const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-
-    </value-type>
-    <object-type name="QXmlStreamReader">
-      <modify-function signature="QXmlStreamReader(const char*)" remove="all"/>
-      <modify-function signature="addData(const char*)" remove="all"/>
-      <modify-function signature="setEntityResolver(QXmlStreamEntityResolver*)">
-        <modify-argument index="1">
-            <reference-count action="set" variable-name="__rcEntityResolver"/>
-        </modify-argument>
-      </modify-function>      
-
-      <modify-function signature="name()const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-
-      <modify-function signature="documentEncoding()const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-
-      <modify-function signature="documentVersion()const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-
-      <modify-function signature="dtdName()const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-
-      <modify-function signature="dtdPublicId()const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-
-      <modify-function signature="dtdSystemId()const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-
-      <modify-function signature="namespaceUri()const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-
-      <modify-function signature="prefix()const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-
-      <modify-function signature="processingInstructionData()const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-
-      <modify-function signature="processingInstructionTarget()const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-
-      <modify-function signature="qualifiedName()const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-
-      <modify-function signature="text()const">
-        <modify-argument index="return">
-            <conversion-rule class="native">
-            <insert-template name="core.convert_stringref_to_string"/>
-            </conversion-rule>
-        </modify-argument>
-      </modify-function>      
-    </object-type>
-    <object-type name="QXmlStreamWriter">
-        <modify-function signature="QXmlStreamWriter(QString *)">
-            <remove/>
-        </modify-function>
-
-        <modify-function signature="setCodec(const char*)">
-          <modify-argument index="1">
-            <replace-type modified-type="QString"/>
-            <conversion-rule class="native">
-              <insert-template name="core.convert_string_arg_to_char*"/>
-            </conversion-rule>
-          </modify-argument>
-        </modify-function>
-
-        <modify-function signature="writeCurrentToken(QXmlStreamReader)">
-          <modify-argument index="1">
-            <replace-type modified-type="QXmlStreamReader*"/>
-            <conversion-rule class="native">
-            QXmlStreamReader &amp; %out% = *qscriptvalue_cast&lt;QXmlStreamReader*&gt;(%in%);
-            </conversion-rule>
-          </modify-argument>
-        </modify-function>
-
-    </object-type>
-
-    <value-type name="QModelIndex"/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::selectIteration', unmatched parameter type 'T'"/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QVariantAnimation::registerInterpolator', unmatched parameter type 'QVariantAnimation::Interpolator'"/>
 
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'Qt::Initialization'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'std::*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private\*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private&amp;'"/>
@@ -2527,40 +2409,23 @@
   <suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QPointer&lt;*&gt;'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QVector&lt;*&gt;'"/>
-  <suppress-warning text="* private virtual function '*' in 'QAbstractListModel'"/>  
-  <suppress-warning text="* private virtual function '*' in 'QAbstractTableModel'"/>  
-  <suppress-warning text="* private virtual function '*' in 'QListWidget'"/>  
-  <suppress-warning text="* private virtual function '*' in 'QTreeWidget'"/>  
-  <suppress-warning text="* private virtual function '*' in 'QFontDialog'"/>  
-  <suppress-warning text="* private virtual function '*' in 'QTableWidget'"/>  
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QDateTime' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPersistentModelIndex' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUuid' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QRect' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTime' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QLocale' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QDir' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPointF' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSize' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFileInfo' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSizeF' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QRegExp' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QRectF' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QDate' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPoint' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUrl' has equals operators but no qHash() function"/>
+  <suppress-warning text="* private virtual function '*' in 'QAbstractListModel'"/>
+  <suppress-warning text="* private virtual function '*' in 'QAbstractTableModel'"/>
+  <suppress-warning text="* private virtual function '*' in 'QListWidget'"/>
+  <suppress-warning text="* private virtual function '*' in 'QTreeWidget'"/>
+  <suppress-warning text="* private virtual function '*' in 'QFontDialog'"/>
+  <suppress-warning text="* private virtual function '*' in 'QTableWidget'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcherBase::futureInterface', unmatched return type 'QFutureInterfaceBase&amp;'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcherBase::futureInterface', unmatched return type 'QFutureInterfaceBase const&amp;'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcher::futureInterface', unmatched return type 'QFutureInterfaceBase&amp;'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFutureWatcher::futureInterface', unmatched return type 'QFutureInterfaceBase const&amp;'"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFuture' has equals operators but no qHash() function"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: unknown operator 'T'"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFutureVoid' has equals operators but no qHash() function"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::constBegin', unmatched return type 'const_iterator'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::end', unmatched return type 'const_iterator'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::constEnd', unmatched return type 'const_iterator'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::QFuture', unmatched parameter type 'QFutureInterface&lt;T&gt;*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFuture::begin', unmatched return type 'const_iterator'"/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::advance', unmatched parameter type 'It&amp;'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMapped', unmatched return type 'Sequence'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMapped', unmatched return type 'QList&lt;U&gt;'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMapped', unmatched return type 'QList&lt;MapFunctor::result_type&gt;'"/>
@@ -2568,6 +2433,7 @@
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::filtered', unmatched parameter type 'Iterator'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::filtered', unmatched parameter type 'Sequence const&amp;'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::filter', unmatched parameter type 'Sequence&amp;'"/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::startFiltered', unmatched return type 'ThreadEngineStarter&lt;qValueType&lt;Iterator&gt;::value_type&gt;"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::startFiltered', unmatched return type 'ThreadEngineStarter&lt;Sequence::value_type&gt;'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::startFiltered', unmatched return type 'ThreadEngineStarter&lt;Iterator::value_type&gt;'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingMappedReduced', unmatched return type 'V'"/>
@@ -2606,4 +2472,9 @@
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::blockingFilter', unmatched parameter type 'Sequence&amp;'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QtConcurrent::createFunctor', unmatched return type 'QtConcurrent::SelectMemberFunctor0&lt;T,Class&gt;::type'"/>
 
+  <suppress-warning text="WARNING(Parser) :: ** WARNING scope not found for function definition:QFuture&lt;void&gt;::operator= - definition *ignored*"/>
+  <suppress-warning text="WARNING(Parser) :: ** WARNING scope not found for function definition:QFutureInterface&lt;void&gt;::future - definition *ignored*"/>
+  <suppress-warning text="WARNING(Parser) :: ** WARNING scope not found for function definition:QFutureWatcher&lt;void&gt;::setFuture - definition *ignored*"/>
+
+
 </typesystem>
diff --git a/generator/typesystem_gui-common.xml b/generator/typesystem_gui-common.xml
index 3a10fbc..610513c 100644
--- a/generator/typesystem_gui-common.xml
+++ b/generator/typesystem_gui-common.xml
@@ -1,13 +1,18 @@
 <?xml version="1.0"?>
 <typesystem>
+
   <rejection class="*" function-name="d_func"/>
 
   <rejection class="*" field-name="d_ptr"/>
   <rejection class="*" field-name="d"/>
 
+  <rejection class="QGenericMatrix" />  
+  <rejection class="QPixmapFilterPrivate" />
+  <rejection class="QPenPrivate" />
+  <rejection class="QGtkStyle" />
   <rejection class="QWindowsCEStyle" />
   <rejection class="QWindowsMobileStyle" />
-  <rejection class="QAbstractUndoItem"/>    
+  <rejection class="QAbstractUndoItem"/>
   <rejection class="QAccessibleApplication"/>
   <rejection class="QBrushData"/>
   <rejection class="QImageTextKeyLang"/>
@@ -37,8 +42,8 @@
   <rejection class="QAccessibleEditableTextInterface"/>
   <rejection class="QAccessibleSimpleEditableTextInterface"/>
   <rejection class="QAccessibleTextInterface"/>
-  <rejection class="QAccessibleValueInterface"/>        
-  <rejection class="QIconEngineFactoryInterface"/>    
+  <rejection class="QAccessibleValueInterface"/>
+  <rejection class="QIconEngineFactoryInterface"/>
   <rejection class="QIconEnginePlugin"/>
   <rejection class="QWidgetItemV2" />
   <rejection class="QAbstractItemDelegate" function-name="operator="/>
@@ -46,7 +51,7 @@
   <rejection class="QAccessible" function-name="installRootObjectHandler"/>
   <rejection class="QAccessible" function-name="installUpdateHandler"/>
   <rejection class="QAccessible" function-name="removeFactory"/>
-  <rejection class="QApplication" function-name="compressEvent"/>  
+  <rejection class="QApplication" function-name="compressEvent"/>
   <rejection class="QBrush" function-name="cleanUp"/>
   <rejection class="QPictureIO" function-name="defineIOHandler"/>
   <rejection class="QPolygon" function-name="putPoints"/>
@@ -61,27 +66,43 @@
   <rejection class="QWidget" function-name="handle"/>
   <rejection class="QWidget" function-name="styleChange"/>
   <rejection class="QWidget" function-name="internalWinId"/>
-  <rejection class="QActionGroup" function-name="selected"/> 
-  <rejection class="QPaintEngine" function-name="fix_neg_rect"/>           
+  <rejection class="QActionGroup" function-name="selected"/>
+  <rejection class="QPaintEngine" function-name="fix_neg_rect"/>
   <rejection class="QTreeModel" function-name="node"/>
   <rejection class="QTreeModel" function-name="initializeNode"/>
   <rejection class="QTreeModel" function-name="queryChildren"/>
+  <rejection class="QTextObjectInterface" />
   <rejection class="QAccessible" function-name="cast_helper"/>
   <rejection class="QAccessible2"/>
   <rejection class="QAccessibleInterface" function-name="backgroundColor"/>
   <rejection class="QAccessibleInterface" function-name="foregroundColor"/>
   <rejection class="QAccessibleInterface" function-name="textInterface"/>
-  <rejection class="QAccessibleInterface" function-name="valueInterface"/>    
+  <rejection class="QAccessibleInterface" function-name="valueInterface"/>
   <rejection class="QAccessibleInterface" function-name="tableInterface"/>
   <rejection class="QAccessibleInterface" function-name="editableTextInterface"/>
   <rejection class="QAccessibleInterface" function-name="cast_helper"/>
   <rejection class="QAccessibleInterfaceEx" function-name="interface_cast"/>
   <rejection class="QAccessibleBridgePlugin" />
-  <rejection class="QAccessibleBridgeFactoryInterface" />  
-  <rejection class="QTabletEvent" field-name="mExtra"/>  
+  <rejection class="QAccessibleBridgeFactoryInterface" />
+  <rejection class="QTabletEvent" field-name="mExtra"/>
   <rejection class="QWidgetItem" field-name="wid" />
   <rejection class="QFont" enum-name="ResolveProperties" />
+  <rejection class="QGradient" enum-name="InterpolationMode" />
+  <rejection class="QIconEngineV2::AvailableSizesArgument" />
+  <rejection class="QIconEngineV2" enum-name="IconEngineHook" />
+  <rejection class="QGradient" enum-name="InterpolationMode" />
+  <rejection class="QGradient" function-name="setInterpolationMode" />
+  <rejection class="QGradient" function-name="interpolationMode" />
+  <rejection class="QAbstractTextDocumentLayout" function-name="handlerForObject" />
+  
 
+  <enum-type name="QStyleOptionTabBarBaseV2::StyleOptionVersion" />
+  <enum-type name="QTabBar::SelectionBehavior" />
+  <enum-type name="QTabBar::ButtonPosition" />
+  <enum-type name="QInputDialog::InputMode" />
+  <enum-type name="QInputDialog::InputDialogOption" flags="QInputDialog::InputDialogOptions" />
+  <enum-type name="QFontDialog::FontDialogOption" flags="QFontDialog::FontDialogOptions" />
+  <enum-type name="QColorDialog::ColorDialogOption" flags="QColorDialog::ColorDialogOptions" />
   <enum-type name="QAbstractItemDelegate::EndEditHint"/>
   <enum-type name="QAbstractItemView::CursorAction"/>
   <enum-type name="QAbstractItemView::DragDropMode"/>
@@ -106,7 +127,7 @@
   <enum-type name="QAccessible::StateFlag" flags="QAccessible::State"/>
   <enum-type name="QAccessible::Text"/>
   <enum-type name="QDesktopServices::StandardLocation" />
-  <enum-type name="QDirModel::Roles"/>  
+  <enum-type name="QDirModel::Roles"/>
   <enum-type name="QFont::Capitalization" />
   <enum-type name="QFont::SpacingType" />
   <enum-type name="QGraphicsItem::CacheMode" />
@@ -116,18 +137,20 @@
   <enum-type name="QFileSystemModel::Roles" />
   <enum-type name="QFormLayout::FieldGrowthPolicy" />
   <enum-type name="QFormLayout::FormStyle" />
-  <enum-type name="QFormLayout::ItemRole" />    
+  <enum-type name="QFormLayout::ItemRole" />
   <enum-type name="QFormLayout::RowWrapPolicy" />
   <enum-type name="QGraphicsProxyWidget::enum_1" />
   <enum-type name="QGraphicsWidget::enum_1" />
   <enum-type name="QPlainTextEdit::LineWrapMode" />
   <enum-type name="QPrintPreviewWidget::ViewMode" />
   <enum-type name="QPrintPreviewWidget::ZoomMode" />
+  <enum-type name="QStyleOptionTabV3::StyleOptionVersion" />
+  <enum-type name="QStyleOptionFrameV3::StyleOptionVersion" />
   <enum-type name="QStyleOptionViewItemV4::StyleOptionVersion" />
   <enum-type name="QStyleOptionViewItemV4::ViewItemPosition" />
 
   <enum-type name="QMdiSubWindow::SubWindowOption" flags="QMdiSubWindow::SubWindowOptions"/>
- 
+
   <enum-type name="QAction::ActionEvent"/>
   <enum-type name="QAction::MenuRole"/>
   <enum-type name="QApplication::ColorSpec"/>
@@ -136,7 +159,6 @@
   <enum-type name="QCalendarWidget::SelectionMode"/>
   <enum-type name="QCalendarWidget::VerticalHeaderFormat"/>
   <enum-type name="QColor::Spec"/>
-  <enum-type name="QColorDialog::ColorDialogOption" flags="QColorDialog::ColorDialogOptions"/>
   <enum-type name="QColormap::Mode"/>
   <enum-type name="QComboBox::InsertPolicy"/>
   <enum-type name="QComboBox::SizeAdjustPolicy"/>
@@ -159,7 +181,6 @@
   <enum-type name="QFont::StyleStrategy"/>
   <enum-type name="QFont::Weight"/>
   <enum-type name="QFontComboBox::FontFilter" flags="QFontComboBox::FontFilters"/>
-  <enum-type name="QFontDialog::FontDialogOption" flags="QFontDialog::FontDialogOptions"/>
   <enum-type name="QFrame::Shadow" extensible="yes"/>
   <enum-type name="QFrame::Shape"/>
   <enum-type name="QFrame::StyleMask"/>
@@ -186,7 +207,7 @@
   <enum-type name="QGraphicsView::DragMode"/>
   <enum-type name="QGraphicsView::OptimizationFlag" flags="QGraphicsView::OptimizationFlags"/>
   <enum-type name="QGraphicsView::ViewportAnchor"/>
-  <enum-type name="QGraphicsView::ViewportUpdateMode"/>  
+  <enum-type name="QGraphicsView::ViewportUpdateMode"/>
   <enum-type name="QIcon::Mode"/>
   <enum-type name="QIcon::State"/>
   <enum-type name="QImage::Format"/>
@@ -195,8 +216,6 @@
   <enum-type name="QImageReader::ImageReaderError"/>
   <enum-type name="QImageWriter::ImageWriterError"/>
   <enum-type name="QInputContext::StandardFormat"/>
-  <enum-type name="QInputDialog::InputDialogOption" flags="QInputDialog::InputDialogOptions"/>
-  <enum-type name="QInputDialog::InputMode"/>
   <enum-type name="QInputMethodEvent::AttributeType"/>
   <enum-type name="QItemSelectionModel::SelectionFlag" flags="QItemSelectionModel::SelectionFlags"/>
   <enum-type name="QKeySequence::SequenceFormat"/>
@@ -241,8 +260,7 @@
   <enum-type name="QPrinter::Unit" />
   <enum-type name="QPrinter::DuplexMode" />
   <enum-type name="QProgressBar::Direction"/>
-  <enum-type name="QReadWriteLock::RecursionMode" />  
-  <enum-type name="QRegion::RegionType"/>  
+  <enum-type name="QRegion::RegionType"/>
   <enum-type name="QRubberBand::Shape"/>
   <enum-type name="QSessionManager::RestartHint"/>
   <enum-type name="QSizePolicy::Policy"/>
@@ -348,8 +366,6 @@
   <enum-type name="QStyleOptionViewItemV2::ViewItemFeature" flags="QStyleOptionViewItemV2::ViewItemFeatures"/>
   <enum-type name="QSystemTrayIcon::ActivationReason"/>
   <enum-type name="QSystemTrayIcon::MessageIcon"/>
-  <enum-type name="QTabBar::ButtonPosition"/>
-  <enum-type name="QTabBar::SelectionBehavior"/>
   <enum-type name="QTabBar::Shape"/>
   <enum-type name="QTabWidget::TabPosition"/>
   <enum-type name="QTabWidget::TabShape"/>
@@ -391,7 +407,7 @@
   <enum-type name="QStyleOptionToolBoxV2::StyleOptionVersion"/>
   <enum-type name="QStyleOptionToolBoxV2::TabPosition"/>
   <enum-type name="QStyleOptionViewItemV3::StyleOptionVersion"/>
-  <enum-type name="QTransform::TransformationType"/>  
+  <enum-type name="QTransform::TransformationType"/>
   <enum-type name="QTreeWidgetItem::ChildIndicatorPolicy"/>
   <enum-type name="QWizard::WizardOption" flags="QWizard::WizardOptions"/>
   <enum-type name="QWizard::WizardPixmap"/>
@@ -422,12 +438,12 @@
   <enum-type name="QDialogButtonBox::StandardButton" flags="QDialogButtonBox::StandardButtons">
     <reject-enum-value name="FirstButton"/>
     <reject-enum-value name="LastButton"/>
-    <reject-enum-value name="YesAll"/>             
+    <reject-enum-value name="YesAll"/>
     <reject-enum-value name="NoAll"/>
-    <reject-enum-value name="Default"/>        
+    <reject-enum-value name="Default"/>
     <reject-enum-value name="Escape"/>
     <reject-enum-value name="FlagMask"/>
-    <reject-enum-value name="ButtonMask"/>    
+    <reject-enum-value name="ButtonMask"/>
   </enum-type>
 
   <enum-type name="QDockWidget::DockWidgetFeature" flags="QDockWidget::DockWidgetFeatures"/>
@@ -487,20 +503,38 @@
     <reject-enum-value name="FirstFontProperty"/>
     <reject-enum-value name="LastFontProperty"/>
   </enum-type>
+
+ <enum-type name="QAction::Priority" />
+ <enum-type name="QAction::SoftKeyRole" />
+  <enum-type name="QGraphicsEffect::ChangeFlag" flags="QGraphicsEffect::ChangeFlags" />
+  <enum-type name="QGraphicsItem::PanelModality" />
+  <enum-type name="QPinchGesture::WhatChange" flags="QPinchGesture::WhatChanged" />
+  <enum-type name="QStyle::RequestSoftwareInputPanel" />
+  <enum-type name="QSwipeGesture::SwipeDirection" />
+  <enum-type name="QTouchEvent::DeviceType" />
   
+
+  <value-type name="QPixmapCache::Key" />
+  <value-type name="QTileRules" />
+  <value-type name="QVector2D" />
+  <value-type name="QVector3D" />
+  <value-type name="QVector4D" />
+  <value-type name="QTouchEvent::TouchPoint" />
+
+
   <value-type name="QTransform">
     <modify-function signature="operator=(QTransform)" remove="all"/>
     <modify-function signature="map(int,int,int*,int*)const" remove="all"/>
-    <modify-function signature="map(qreal,qreal,qreal*,qreal*)const" remove="all"/>
-    
-    <modify-function signature="operator*=(qreal)" access="private"/>    
-    <modify-function signature="operator+=(qreal)" access="private"/>
-    <modify-function signature="operator-=(qreal)" access="private"/>
-    <modify-function signature="operator/=(qreal)" access="private"/>
+    <modify-function signature="map(double,double,double*,double*)const" remove="all"/>
+
+    <modify-function signature="operator*=(double)" access="private"/>
+    <modify-function signature="operator+=(double)" access="private"/>
+    <modify-function signature="operator-=(double)" access="private"/>
+    <modify-function signature="operator/=(double)" access="private"/>
     <modify-function signature="operator*(QTransform)const" rename="multiplied" />
     <modify-function signature="operator*=(QTransform)" access="private"/>
-  </value-type>  
-  
+  </value-type>
+
   <value-type name="QStyleOption" delete-in-main-thread="yes" polymorphic-base="yes" polymorphic-id-expression="%1-&gt;type == QStyleOption::SO_Default">
       <modify-function signature="operator=(QStyleOption)" remove="all"/>
       <modify-function signature="init(const QWidget*)" remove="all"/> <!--### Obsolete in 4.3-->
@@ -511,62 +545,71 @@
   <value-type name="QStyleOptionComboBox" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionComboBox::Type &amp;&amp; %1-&gt;version == QStyleOptionComboBox::Version"/>
   <value-type name="QStyleOptionComplex" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionComplex::Type &amp;&amp; %1-&gt;version == QStyleOptionComplex::Version"/>
   <value-type name="QStyleOptionDockWidget" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionDockWidget::Type &amp;&amp; %1-&gt;version == QStyleOptionDockWidget::Version"/>
-  <value-type name="QStyleOptionDockWidgetV2" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionDockWidgetV2::Type &amp;&amp; %1-&gt;version == QStyleOptionDockWidgetV2::Version"> 
+  <value-type name="QStyleOptionDockWidgetV2" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionDockWidgetV2::Type &amp;&amp; %1-&gt;version == QStyleOptionDockWidgetV2::Version">
       <modify-function signature="operator=(QStyleOptionDockWidget)" remove="all"/>
   </value-type>
   <value-type name="QStyleOptionFocusRect" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionFocusRect::Type &amp;&amp; %1-&gt;version == QStyleOptionFocusRect::Version"/>
   <value-type name="QStyleOptionFrame" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionFrame::Type &amp;&amp; %1-&gt;version == QStyleOptionFrame::Version"/>
-              
+
   <value-type name="QStyleOptionFrameV2" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionFrameV2::Type &amp;&amp; %1-&gt;version == QStyleOptionFrameV2::Version">
     <modify-function signature="operator=(QStyleOptionFrame)" remove="all"/>
-  </value-type>              
-              
+  </value-type>
+  <value-type name="QStyleOptionFrameV3" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionFrameV3::Type &amp;&amp; %1-&gt;version == QStyleOptionFrameV3::Version">
+    <modify-function signature="operator=(QStyleOptionFrame)" remove="all"/>
+  </value-type>
+
   <value-type name="QStyleOptionGroupBox" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionGroupBox::Type &amp;&amp; %1-&gt;version == QStyleOptionGroupBox::Version"/>
   <value-type name="QStyleOptionHeader" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionHeader::Type &amp;&amp; %1-&gt;version == QStyleOptionHeader::Version"/>
   <value-type name="QStyleOptionMenuItem" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionMenuItem::Type &amp;&amp; %1-&gt;version == QStyleOptionMenuItem::Version"/>
   <value-type name="QStyleOptionProgressBar" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionProgressBar::Type &amp;&amp; %1-&gt;version == QStyleOptionProgressBar::Version"/>
-              
+
   <value-type name="QStyleOptionProgressBarV2" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionProgressBarV2::Type &amp;&amp; %1-&gt;version == QStyleOptionProgressBarV2::Version">
     <modify-function signature="operator=(QStyleOptionProgressBar)" remove="all"/>
-  </value-type>              
-  
+  </value-type>
+
   <value-type name="QStyleOptionRubberBand" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionRubberBand::Type &amp;&amp; %1-&gt;version == QStyleOptionRubberBand::Version"/>
   <value-type name="QStyleOptionSlider" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionSlider::Type &amp;&amp; %1-&gt;version == QStyleOptionSlider::Version"/>
   <value-type name="QStyleOptionSpinBox" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionSpinBox::Type &amp;&amp; %1-&gt;version == QStyleOptionSpinBox::Version"/>
   <value-type name="QStyleOptionTab" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTab::Type &amp;&amp; %1-&gt;version == QStyleOptionTab::Version"/>
   <value-type name="QStyleOptionTabV2" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabV2::Type &amp;&amp; %1-&gt;version == QStyleOptionTabV2::Version">
     <modify-function signature="operator=(const QStyleOptionTab &amp;)" remove="all"/>
-  </value-type>             
-  <value-type name="QStyleOptionTabBarBase" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabBarBase::Type &amp;&amp; %1-&gt;version == QStyleOptionTabBarBase::Version"/> 
+  </value-type>
+  <value-type name="QStyleOptionTabV3" delete-in-main-thread="yes"  polymorphic-id-expression="%1-&gt;type == QStyleOptionTabV3::Type &amp;&amp; %1-&gt;version == QStyleOptionTabV3::Version">
+    <modify-function signature="operator=(QStyleOptionTab)" remove="all" />
+  </value-type>
+  <value-type name="QStyleOptionTabBarBase" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabBarBase::Type &amp;&amp; %1-&gt;version == QStyleOptionTabBarBase::Version"/>
+  <value-type name="QStyleOptionTabBarBaseV2" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabBarBaseV2::Type &amp;&amp; %1-&gt;version == QStyleOptionTabBarBaseV2::Version">
+    <modify-function signature="operator=(QStyleOptionTabBarBase)" remove="all" />
+  </value-type>
   <value-type name="QStyleOptionTabWidgetFrame" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabWidgetFrame::Type &amp;&amp; %1-&gt;version == QStyleOptionTabWidgetFrame::Version"/>
   <value-type name="QStyleOptionTitleBar" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTitleBar::Type &amp;&amp; %1-&gt;version == QStyleOptionTitleBar::Version"/>
   <value-type name="QStyleOptionToolBar" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionToolBar::Type &amp;&amp; %1-&gt;version == QStyleOptionToolBar::Version"/>
   <value-type name="QStyleOptionToolBox" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionToolBox::Type &amp;&amp; %1-&gt;version == QStyleOptionToolBox::Version"/>
   <value-type name="QStyleOptionToolBoxV2" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionToolBoxV2::Type &amp;&amp; %1-&gt;version == QStyleOptionToolBoxV2::Version">
     <modify-function signature="operator=(QStyleOptionToolBox)" remove="all"/>
-  </value-type>              
+  </value-type>
   <value-type name="QStyleOptionToolButton" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionToolButton::Type &amp;&amp; %1-&gt;version == QStyleOptionToolButton::Version"/>
-  <value-type name="QStyleOptionViewItem" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionViewItem::Type &amp;&amp; %1-&gt;version == QStyleOptionViewItem::Version"/>  
-  <value-type name="QStyleOptionViewItemV2" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionViewItemV2::Type &amp;&amp; %1-&gt;version == QStyleOptionViewItemV2::Version">                
+  <value-type name="QStyleOptionViewItem" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionViewItem::Type &amp;&amp; %1-&gt;version == QStyleOptionViewItem::Version"/>
+  <value-type name="QStyleOptionViewItemV2" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionViewItemV2::Type &amp;&amp; %1-&gt;version == QStyleOptionViewItemV2::Version">
     <modify-function signature="operator=(QStyleOptionViewItem)" remove="all"/>
-  </value-type>              
+  </value-type>
   <value-type name="QStyleOptionViewItemV3" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionViewItemV3::Type &amp;&amp; %1-&gt;version == QStyleOptionViewItemV3::Version">
     <modify-function signature="operator=(QStyleOptionViewItem)" remove="all"/>
-  </value-type>              
+  </value-type>
   <value-type name="QStyleOptionViewItemV4" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionViewItemV4::Type &amp;&amp; %1-&gt;version == QStyleOptionViewItemV4::Version">
     <modify-function signature="operator=(QStyleOptionViewItem)" remove="all" />
   </value-type>
-  <value-type name="QTextFragment" delete-in-main-thread="yes">  
+  <value-type name="QTextFragment" delete-in-main-thread="yes">
     <modify-function signature="operator=(QTextFragment)" remove="all"/>
   </value-type>
-  <value-type name="QBitmap" delete-in-main-thread="yes">  
+  <value-type name="QBitmap" delete-in-main-thread="yes">
     <modify-function signature="operator=(const QPixmap &amp;)" remove="all"/>
     <modify-function signature="QBitmap(QString,const char*)" access="private">
         <modify-argument index="2"> <remove-default-expression/> </modify-argument>
     </modify-function>
 
-    <modify-function signature="fromData(QSize,const uchar*,QImage::Format)">
-        <access modifier="private"/>        
+    <modify-function signature="fromData(QSize,const unsigned char*,QImage::Format)">
+        <access modifier="private"/>
         <modify-argument index="3">
             <remove-default-expression/>
         </modify-argument>
@@ -598,12 +641,12 @@
   <value-type name="QLine"/>
   <value-type name="QLineF"/>
 
-  <value-type name="QPainterPath">  
+  <value-type name="QPainterPath">
     <modify-function signature="operator=(QPainterPath)" remove="all"/>
   </value-type>
   <value-type name="QPalette">
     <modify-function signature="operator=(const QPalette&amp;)" remove="all"/>
-  
+
       <modify-function signature="QPalette(QColor, QColor, QColor, QColor, QColor, QColor, QColor)" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="background()const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="foreground()const" remove="all"/> <!--### Obsolete in 4.3-->
@@ -620,7 +663,7 @@
     <modify-function signature="pictureFormat(QString)">
         <remove/>
     </modify-function>
-    
+
     <modify-function signature="inputFormatList()" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="inputFormats()" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="outputFormatList()" remove="all"/> <!--### Obsolete in 4.3-->
@@ -660,16 +703,16 @@
   <value-type name="QTextTableCellFormat" delete-in-main-thread="yes" />
   <value-type name="QTextCharFormat" delete-in-main-thread="yes">
     <modify-function signature="isValid()const" access="non-final"/>
-  
+
       <modify-function signature="anchorName()const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="setAnchorName(QString)" remove="all"/> <!--### Obsolete in 4.3-->
   </value-type>
   <value-type name="QTextFormat" delete-in-main-thread="yes">
     <modify-function signature="operator=(QTextFormat)" remove="all"/>
     <modify-function signature="isValid()const" access="non-final"/>
-    
+
   </value-type>
-  
+
   <value-type name="QTextListFormat" delete-in-main-thread="yes"/>
   <value-type name="QPolygon">
     <modify-function signature="QPolygon(int, const int *)" remove="all"/>
@@ -686,7 +729,7 @@
     <modify-function signature="operator&lt;&lt;(QVector&lt;QPointF&gt;)" remove="all"/>
   </value-type>
 
-  <value-type name="QIcon" delete-in-main-thread="yes">    
+  <value-type name="QIcon" delete-in-main-thread="yes">
     <modify-function signature="operator=(QIcon)" remove="all"/>
     <modify-function signature="serialNumber()const" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="QIcon(QIconEngineV2 *)">
@@ -698,8 +741,8 @@
         <modify-argument index="1">
             <define-ownership class="java" owner="c++" />
         </modify-argument>
-    </modify-function>    
-  </value-type>  
+    </modify-function>
+  </value-type>
 
   <value-type name="QTextFrame::iterator" delete-in-main-thread="yes">
     <include file-name="QTextFrame" location="global"/>
@@ -710,7 +753,7 @@
     <modify-function signature="operator--()" access="private"/>
   </value-type>
 
-  <value-type name="QTreeWidgetItemIterator" delete-in-main-thread="yes">  
+  <value-type name="QTreeWidgetItemIterator" delete-in-main-thread="yes">
     <custom-constructor>
     return new QTreeWidgetItemIterator(*copy);
     </custom-constructor>
@@ -726,10 +769,10 @@
     <modify-function signature="operator--()" access="private"/>
     <modify-function signature="operator*()const" access="private"/>
    </value-type>
-   
+
   <value-type name="QTextBlock::iterator" delete-in-main-thread="yes">
     <include file-name="QTextBlock" location="global"/>
-    
+
     <modify-function signature="operator++()" access="private"/>
     <modify-function signature="operator--()" access="private"/>
     <modify-function signature="operator++(int)" remove="all"/>
@@ -745,18 +788,18 @@
     <modify-function signature="operator=(QPixmap)" remove="all"/>
     <modify-function signature="operator!()const" remove="all"/>
     <modify-function signature="QPixmap(const char **)" access="private"/>
-    <modify-function signature="serialNumber()const" remove="all"/> <!--### Obsolete in 4.3-->    
+    <modify-function signature="serialNumber()const" remove="all"/> <!--### Obsolete in 4.3-->
   </value-type>
 
   <value-type name="QTextCursor" delete-in-main-thread="yes">
     <extra-includes>
         <include file-name="QTextBlock" location="global"/>
         <include file-name="QTextDocumentFragment" location="global"/>
-    </extra-includes>  
+    </extra-includes>
     <modify-function signature="operator=(QTextCursor)" remove="all"/>
     <modify-function signature="selectedTableCells(int*,int*,int*,int*)const">
         <access modifier="private"/>
-    </modify-function>    
+    </modify-function>
   </value-type>
 
   <value-type name="QTextLayout::FormatRange">
@@ -772,8 +815,8 @@
     delete copy;
     </custom-destructor>
   </value-type>
-  
-  <value-type name="QItemSelection" delete-in-main-thread="yes"> 
+
+  <value-type name="QItemSelection" delete-in-main-thread="yes">
 
     <modify-function signature="operator+(const QList&lt;QItemSelectionRange&gt;&amp;)const" remove="all"/>
     <modify-function signature="operator+=(const QList&lt;QItemSelectionRange&gt;&amp;)" remove="all"/>
@@ -782,26 +825,30 @@
     <modify-function signature="operator&lt;&lt;(QItemSelectionRange)" remove="all"/>
   </value-type>
 
+  <value-type name="QMatrix4x4">
+    <modify-function signature="data()const" remove="all" />
+    <modify-function signature="operator()(int, int)const" remove="all" />
+  </value-type>
   <value-type name="QMatrix">
       <extra-includes>
         <include file-name="QPainterPath" location="global"/>
       </extra-includes>
 
       <modify-function signature="map(int,int,int*,int*)const" remove="all"/>
-      <modify-function signature="map(qreal,qreal,qreal*,qreal*)const" remove="all"/>
+      <modify-function signature="map(double,double,double*,double*)const" remove="all"/>
       <modify-function signature="operator=(QMatrix)" remove="all"/>
-    
+
       <modify-function signature="operator*(QMatrix)const" access="private"/>
       <modify-function signature="operator*=(QMatrix)" access="private"/>
-      <modify-function signature="rotate(qreal)" access="private" rename="rotate_private"/>
-      <modify-function signature="scale(qreal,qreal)" access="private" rename="scale_private"/>
-      <modify-function signature="shear(qreal,qreal)" access="private" rename="shear_private"/>
-      <modify-function signature="translate(qreal,qreal)" access="private" rename="translate_private"/>
+      <modify-function signature="rotate(double)" access="private" rename="rotate_private"/>
+      <modify-function signature="scale(double,double)" access="private" rename="scale_private"/>
+      <modify-function signature="shear(double,double)" access="private" rename="shear_private"/>
+      <modify-function signature="translate(double,double)" access="private" rename="translate_private"/>
 
       <modify-function signature="inverted(bool*)const">
         <access modifier="private"/>
         <modify-argument index="1">
-            <!-- <remove-default-expression/> -->
+            <remove-default-expression/>
         </modify-argument>
       </modify-function>
 
@@ -810,21 +857,21 @@
         <replace from="%FUNCTION_NAME" to="rotate"/>
         <replace from="%OUT_TYPE" to="QMatrix"/>
         <replace from="%IN_TYPE" to="double"/>
-      </insert-template>    
+      </insert-template>
 
       <insert-template name="core.private_function_return_self">
         <replace from="%RETURN_TYPE" to="QMatrix"/>
         <replace from="%FUNCTION_NAME" to="scale"/>
         <replace from="%ARGUMENTS" to="double sx, double sy"/>
         <replace from="%ARGUMENT_NAMES" to="sx, sy"/>
-      </insert-template>        
+      </insert-template>
 
       <insert-template name="core.private_function_return_self">
         <replace from="%RETURN_TYPE" to="QMatrix"/>
         <replace from="%FUNCTION_NAME" to="shear"/>
         <replace from="%ARGUMENTS" to="double sh, double sv"/>
         <replace from="%ARGUMENT_NAMES" to="sh, sv"/>
-      </insert-template>            
+      </insert-template>
 
       <insert-template name="core.private_function_return_self">
         <replace from="%RETURN_TYPE" to="QMatrix"/>
@@ -841,10 +888,10 @@
     </custom-constructor>
     <custom-destructor>
     delete copy;
-    </custom-destructor>  
+    </custom-destructor>
   </value-type>
 
-  <value-type name="QFontInfo" delete-in-main-thread="yes">
+  <value-type name="QFontInfo" delete-in-main-thread="yes" expense-cost="1" expense-limit="1000">
     <custom-constructor>
     return new QFontInfo(*copy);
     </custom-constructor>
@@ -852,7 +899,7 @@
     delete copy;
     </custom-destructor>
     <modify-function signature="operator=(QFontInfo)" remove="all"/>
-    
+
   </value-type>
 
   <value-type name="QRadialGradient" polymorphic-id-expression="%1-&gt;type() == QGradient::RadialGradient">
@@ -863,7 +910,7 @@
     delete copy;
     </custom-destructor>
   </value-type>
-    
+
   <value-type name="QPainterPath::Element">
     <modify-field name="x" write="false"/>
     <modify-field name="y" write="false"/>
@@ -876,10 +923,10 @@
     <include file-name="QTextEdit" location="global"/>
   </value-type>
 
-  <value-type name="QFont" delete-in-main-thread="yes">
+  <value-type name="QFont" delete-in-main-thread="yes" expense-cost="1" expense-limit="1000">
     <extra-includes>
         <include file-name="QStringList" location="global"/>
-    </extra-includes>    
+    </extra-includes>
     <modify-function signature="operator=(QFont)" remove="all"/>
   </value-type>
 
@@ -889,7 +936,7 @@
     </extra-includes>
     <modify-function signature="operator=(QTextTableCell)" remove="all"/>
   </value-type>
-  
+
   <value-type name="QImage" expense-limit="67108864" expense-cost="height()*bytesPerLine()">
     <modify-function signature="QImage(const char *, const char *)">
         <remove/>
@@ -897,8 +944,8 @@
     <modify-function signature="QImage(const char **)">
         <access modifier="private"/>
     </modify-function>
-    <modify-function signature="QImage(const uchar*,int,int,int,QImage::Format)">
-	    <remove/>
+    <modify-function signature="QImage(const unsigned char*,int,int,int,QImage::Format)">
+        <remove/>
     </modify-function>
     <modify-function signature="bits()const">
         <remove/>
@@ -906,77 +953,85 @@
     <modify-function signature="scanLine(int)const">
         <remove/>
     </modify-function>
-    <modify-function signature="QImage(const uchar *, int, int, QImage::Format)">
+    <modify-function signature="QImage(const unsigned char *, int, int, QImage::Format)">
         <remove/>
     </modify-function>
-  
+
     <extra-includes>
         <include file-name="QStringList" location="global"/>
         <include file-name="QMatrix" location="global"/>
     </extra-includes>
-    
-    <modify-function signature="QImage(uchar*,int,int,QImage::Format)">
+    <modify-function signature="save(const QString &amp;, const char *, int) const">
+        <access modifier="private"/>
+        <rename to="private_save"/>
+        <modify-argument index="2">
+            <remove-default-expression/>
+        </modify-argument>
+        <modify-argument index="3">
+            <remove-default-expression/>
+        </modify-argument>
+    </modify-function>
+
+    <modify-function signature="QImage(unsigned char*,int,int,QImage::Format)">
         <access modifier="private"/>
     </modify-function>
 
-    <!--     
     <modify-function signature="QImage(QString,const char*)">
         <access modifier="private"/>
         <modify-argument index="2">
             <remove-default-expression/>
         </modify-argument>
     </modify-function>
-    -->
-    
+
     <modify-function signature="load(QString,const char*)">
         <access modifier="private"/>
         <modify-argument index="2">
             <remove-default-expression/>
         </modify-argument>
     </modify-function>
-        
+
     <modify-function signature="load(QIODevice*,const char*)">
         <access modifier="private"/>
     </modify-function>
-       
-    <modify-function signature="loadFromData(const uchar*,int,const char*)">
+
+    <modify-function signature="loadFromData(const unsigned char*,int,const char*)">
         <access modifier="private"/>
         <modify-argument index="2">
             <remove-default-expression/>
         </modify-argument>
         <modify-argument index="3">
             <remove-default-expression/>
-        </modify-argument>        
+        </modify-argument>
     </modify-function>
-        
+
     <modify-function signature="loadFromData(QByteArray,const char*)">
         <access modifier="private"/>
         <modify-argument index="2">
             <remove-default-expression/>
         </modify-argument>
     </modify-function>
-        
+
     <modify-function signature="operator=(QImage)" remove="all"/>
-    
+
     <modify-function signature="setText(const char*,const char*,QString)">
         <remove/>
     </modify-function>
-    
+
     <modify-function signature="text(const char*,const char*)const">
         <remove/>
     </modify-function>
-    
+
     <modify-function signature="fromData(QByteArray,const char*)">
         <access modifier="private"/>
         <modify-argument index="2">
             <remove-default-expression/>
         </modify-argument>
     </modify-function>
-      
-    <modify-function signature="fromData(const uchar*,int,const char*)">
+
+    <modify-function signature="fromData(const unsigned char*,int,const char*)">
         <remove/>
-    </modify-function>        
-  
+    </modify-function>
+
       <modify-function signature="serialNumber()const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="textLanguages()const" remove="all"/> <!--### Obsolete in 4.3-->
   </value-type>
@@ -985,27 +1040,27 @@
     <modify-function signature="operator=(QColormap)" remove="all"/>
     <extra-includes>
         <include file-name="QColor" location="global"/>
-    </extra-includes>               
+    </extra-includes>
     <custom-constructor>
     return new QColormap(*copy);
     </custom-constructor>
     <custom-destructor>
     delete copy;
-    </custom-destructor>    
+    </custom-destructor>
   </value-type>
 
-  <value-type name="QCursor" delete-in-main-thread="yes">  
+  <value-type name="QCursor" delete-in-main-thread="yes">
      <extra-includes>
         <include file-name="QPixmap" location="global"/>
     </extra-includes>
     <modify-function signature="operator=(QCursor)" remove="all"/>
   </value-type>
-      
+
   <value-type name="QFontDatabase" delete-in-main-thread="yes">
       <extra-includes>
         <include file-name="QStringList" location="global"/>
     </extra-includes>
-  </value-type>  
+  </value-type>
 
   <value-type name="QPen">
       <extra-includes>
@@ -1013,15 +1068,15 @@
     </extra-includes>
 
     <modify-function signature="operator=(QPen)" remove="all"/>
-  </value-type>  
-  
+  </value-type>
+
   <value-type name="QBrush">
     <modify-function signature="QBrush(Qt::GlobalColor, Qt::BrushStyle)" remove="all"/>
     <modify-function signature="operator=(const QBrush &amp;)" remove="all"/>
 
     <extra-includes>
         <include file-name="QPixmap" location="global"/>
-    </extra-includes>  
+    </extra-includes>
   </value-type>
 
   <value-type name="QColor">
@@ -1032,36 +1087,36 @@
     <modify-function signature="QColor(const char*)">
         <remove/>
     </modify-function>
-        
+
     <modify-function signature="getCmyk(int*,int*,int*,int*,int*)">
         <remove/>
     </modify-function>
-    
-    <modify-function signature="getCmykF(qreal*,qreal*,qreal*,qreal*,qreal*)">
+
+    <modify-function signature="getCmykF(double*,double*,double*,double*,double*)">
         <remove/>
     </modify-function>
-    
+
     <modify-function signature="getHsv(int*,int*,int*,int*)const">
         <remove/>
     </modify-function>
-    
-    <modify-function signature="getHsvF(qreal*,qreal*,qreal*,qreal*)const">
+
+    <modify-function signature="getHsvF(double*,double*,double*,double*)const">
         <remove/>
     </modify-function>
-    
+
     <modify-function signature="getRgb(int*,int*,int*,int*)const">
         <remove/>
     </modify-function>
-    
-    <modify-function signature="getRgbF(qreal*,qreal*,qreal*,qreal*)const">
+
+    <modify-function signature="getRgbF(double*,double*,double*,double*)const">
         <remove/>
     </modify-function>
-      
+
       <modify-function signature="dark(int)const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="light(int)const" remove="all"/> <!--### Obsolete in 4.3-->
   </value-type>
- 
-  <value-type name="QFontMetricsF" delete-in-main-thread="yes">
+
+  <value-type name="QFontMetricsF" delete-in-main-thread="yes" expense-cost="1" expense-limit="1000">
     <custom-constructor>
         return new QFontMetricsF(*copy);
     </custom-constructor>
@@ -1073,8 +1128,8 @@
     </modify-function>
     <modify-function signature="operator==(const QFontMetricsF &amp;)">
         <remove/>
-    </modify-function>        
-        
+    </modify-function>
+
     <modify-function signature="boundingRect(QRectF,int,QString,int,int*)const">
         <access modifier="private"/>
         <modify-argument index="4">
@@ -1082,25 +1137,25 @@
         </modify-argument>
         <modify-argument index="5">
             <remove-default-expression/>
-        </modify-argument>                
+        </modify-argument>
     </modify-function>
-   
+
     <modify-function signature="operator=(QFontMetrics)" remove="all"/>
     <modify-function signature="operator=(QFontMetricsF)" remove="all"/>
-    
+
     <modify-function signature="size(int,QString,int,int*)const">
         <access modifier="private"/>
         <modify-argument index="3">
             <remove-default-expression/>
-        </modify-argument>        
+        </modify-argument>
         <modify-argument index="4">
             <remove-default-expression/>
-        </modify-argument>                
+        </modify-argument>
     </modify-function>
    </value-type>
    <value-type name="QTextOption::Tab" />
 
-  <value-type name="QFontMetrics" delete-in-main-thread="yes">
+  <value-type name="QFontMetrics" delete-in-main-thread="yes" expense-cost="1" expense-limit="1000">
     <custom-constructor>
         return new QFontMetrics(*copy);
     </custom-constructor>
@@ -1112,7 +1167,7 @@
     </modify-function>
     <modify-function signature="operator==(const QFontMetrics &amp;)">
         <remove/>
-    </modify-function>    
+    </modify-function>
 
     <modify-function signature="boundingRect(int,int,int,int,int,QString,int,int*)const">
         <access modifier="private"/>
@@ -1121,9 +1176,9 @@
         </modify-argument>
         <modify-argument index="8">
             <remove-default-expression/>
-        </modify-argument>        
+        </modify-argument>
     </modify-function>
-            
+
     <modify-function signature="boundingRect(QRect,int,QString,int,int*)const">
         <access modifier="private"/>
         <modify-argument index="4">
@@ -1131,21 +1186,21 @@
         </modify-argument>
         <modify-argument index="5">
             <remove-default-expression/>
-        </modify-argument>                
+        </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="operator=(QFontMetrics)" remove="all"/>
-    
+
     <modify-function signature="size(int,QString,int,int*)const">
         <access modifier="private"/>
         <modify-argument index="3">
             <remove-default-expression/>
-        </modify-argument>        
+        </modify-argument>
         <modify-argument index="4">
             <remove-default-expression/>
-        </modify-argument>                
+        </modify-argument>
     </modify-function>
-       
+
   </value-type>
 
   <value-type name="QGradient" force-abstract="yes" polymorphic-base="yes" polymorphic-id-expression="%1-&gt;type() == QGradient::NoGradient">
@@ -1159,7 +1214,7 @@
     </custom-destructor>
     <modify-function signature="operator==(const QGradient &amp;)">
         <remove/>
-    </modify-function>        
+    </modify-function>
   </value-type>
 
   <value-type name="QLinearGradient" polymorphic-id-expression="%1-&gt;type() == QGradient::LinearGradient">
@@ -1173,17 +1228,20 @@
     delete copy;
     </custom-destructor>
   </value-type>
-  
+
   <value-type name="QPrinterInfo">
     <modify-function signature="operator=(const QPrinterInfo &amp;)" remove="all" />
   </value-type>
-     
+
+  <value-type name="QMargins" />
+
   <interface-type name="QLayoutItem"/>
   <interface-type name="QPaintDevice"/>
 
   <interface-type name="QGraphicsItem" delete-in-main-thread="yes">
     <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/>
-    
+    <modify-function signature="toGraphicsObject() const" remove="all" />
+
     <modify-function signature="paint(QPainter*,const QStyleOptionGraphicsItem*,QWidget*)">
         <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
@@ -1255,48 +1313,48 @@
     <modify-function signature="wheelEvent(QGraphicsSceneWheelEvent*)">
         <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
-   
-    <modify-function signature="children()const" remove="all"/>	
+
+    <modify-function signature="children()const" remove="all"/>
     <modify-function signature="installSceneEventFilter(QGraphicsItem *)">
         <modify-argument index="1">
-            <!-- Safe to ignore because items in a scene are memory managed by the scene --> 
-            <reference-count action="ignore"/> 
+            <!-- Safe to ignore because items in a scene are memory managed by the scene -->
+            <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
     <modify-function signature="removeSceneEventFilter(QGraphicsItem *)">
         <modify-argument index="1">
-            <!-- Safe to ignore because items in a scene are memory managed by the scene --> 
-            <reference-count action="ignore"/> 
+            <!-- Safe to ignore because items in a scene are memory managed by the scene -->
+            <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-   
+
     <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="sceneMatrix()const" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <!--### Obsolete in 4.3-->
-  </interface-type>  
-  
+  </interface-type>
+
   <object-type name="QAbstractGraphicsShapeItem" delete-in-main-thread="yes">
     <modify-function signature="QAbstractGraphicsShapeItem(QGraphicsItem*,QGraphicsScene*)">
         <inject-code position="end">
             <argument-map index="1" meta-name="%1"/>
             if (%1 != null) disableGarbageCollection();
         </inject-code>
-    </modify-function>    
-  
+    </modify-function>
+
     <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="sceneMatrix()const" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <!--### Obsolete in 4.3-->
   </object-type>
-    
+
   <object-type name="QAbstractItemView">
       <modify-function signature="update()" remove="all"/>
       <modify-function signature="horizontalStepsPerItem()const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="setHorizontalStepsPerItem(int)" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="setVerticalStepsPerItem(int)" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="verticalStepsPerItem()const" remove="all"/> <!--### Obsolete in 4.3-->
-      
+
       <modify-function signature="edit(QModelIndex,QAbstractItemView::EditTrigger,QEvent*)">
         <modify-argument index="3" invalidate-after-use="yes" />
       </modify-function>
@@ -1304,16 +1362,16 @@
         <modify-argument index="2" invalidate-after-use="yes" />
       </modify-function>
 
-  </object-type>  
+  </object-type>
 
   <object-type name="QAbstractPageSetupDialog"/>
   <object-type name="QAbstractPrintDialog"/>
-  <object-type name="QAbstractSlider"/>  
+  <object-type name="QAbstractSlider"/>
   <object-type name="QAbstractTextDocumentLayout">
     <modify-function signature="setPaintDevice(QPaintDevice*)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcPaintDevice"/>
-        </modify-argument>
+        </modify-argument>        
     </modify-function>
     
     <modify-function signature="draw(QPainter*,QAbstractTextDocumentLayout::PaintContext)">
@@ -1337,7 +1395,7 @@
             <define-ownership class="java" owner="java" />
         </modify-argument>
     </modify-function>
-  </object-type>      
+  </object-type>
   <object-type name="QAccessibleBridge">
     <modify-function signature="setRootObject(QAccessibleInterface *)">
         <modify-argument index="1">
@@ -1347,25 +1405,25 @@
     <modify-function signature="notifyAccessibilityUpdate(int,QAccessibleInterface*,int)">
         <modify-argument invalidate-after-use="yes" index="2" />
     </modify-function>
-  </object-type>  
+  </object-type>
   <object-type name="QAccessible2Interface"/>
   <object-type name="QAccessibleTableInterface">
     <modify-function signature="qAccessibleTableCastHelper()" remove="all"/>
   </object-type>
-  
+
   <object-type name="QAccessibleInterface">
     <modify-function signature="indexOfChild(const QAccessibleInterface*)const">
         <modify-argument invalidate-after-use="yes" index="1" />
     </modify-function>
     <modify-function signature="relationTo(int,const QAccessibleInterface*,int)const">
         <modify-argument invalidate-after-use="yes" index="2" />
-    </modify-function>  
+    </modify-function>
   </object-type>
   <object-type name="QAccessibleInterfaceEx"/>
   <object-type name="QAccessibleObject"/>
   <object-type name="QAccessibleObjectEx"/>
   <object-type name="QAccessibleWidget"/>
-  <object-type name="QAccessibleWidgetEx"/>  
+  <object-type name="QAccessibleWidgetEx"/>
   <object-type name="QActionGroup" />
   <object-type name="QCDEStyle">
       <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/>
@@ -1375,14 +1433,14 @@
         <access modifier="private"/>
     </modify-function>
   </object-type>
-  <object-type name="QCleanlooksStyle">  
+  <object-type name="QCleanlooksStyle">
     <modify-function signature="standardPixmap(QStyle::StandardPixmap,const QStyleOption*,const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/>
-  </object-type>  
+  </object-type>
   <object-type name="QCommonStyle">
       <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*,const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/>
-  </object-type>  
+  </object-type>
   <object-type name="QDataWidgetMapper">
     <modify-function signature="addMapping(QWidget*,int)">
         <modify-argument index="1">
@@ -1423,9 +1481,11 @@
     <modify-function signature="exec()" access="non-final"/>
     <modify-function signature="extension()const" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="orientation()const" remove="all"/> <!--### Obsolete in 4.3-->
+    <modify-function signature="open()" virtual-slot="yes" />
     <modify-function signature="setOrientation(Qt::Orientation)" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="showExtension(bool)" remove="all"/> <!--### Obsolete in 4.3-->
-  </object-type>  
+    <modify-function signature="setVisible(bool)" allow-as-slot="yes"/>
+  </object-type>
   <object-type name="QDialogButtonBox">
     <modify-function signature="addButton(QAbstractButton*,QDialogButtonBox::ButtonRole)">
         <modify-argument index="1">
@@ -1481,7 +1541,7 @@
             <remove-default-expression/>
         </modify-argument>
     </modify-function>
-   
+
   </object-type>
   <object-type name="QFocusFrame">
     <modify-function signature="initStyleOption(QStyleOption*)const">
@@ -1496,10 +1556,11 @@
         <insert-template name="gui.init_style_option">
             <replace from="%TYPE" to="QStyleOption"/>
         </insert-template>
-    </inject-code>  
+    </inject-code>
   </object-type>
   <object-type name="QFontComboBox"/>
-  <object-type name="QFontDialog"/>
+  <object-type name="QFontDialog" />
+
   <object-type name="QGraphicsEllipseItem" delete-in-main-thread="yes"/>
   <object-type name="QGraphicsItemAnimation" >
     <modify-function signature="setItem(QGraphicsItem*)">
@@ -1511,9 +1572,9 @@
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcTimeLine"/>
         </modify-argument>
-    </modify-function>  
+    </modify-function>
   </object-type>
-  <object-type name="QGraphicsItemGroup" delete-in-main-thread="yes"> 
+  <object-type name="QGraphicsItemGroup" delete-in-main-thread="yes">
       <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="sceneMatrix()const" remove="all"/> <!--### Obsolete in 4.3-->
@@ -1526,7 +1587,7 @@
       <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <!--### Obsolete in 4.3-->
   </object-type>
   <object-type name="QGraphicsPathItem" delete-in-main-thread="yes"/>
-   
+
   <object-type name="QGraphicsPixmapItem" delete-in-main-thread="yes">
       <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3-->
@@ -1541,16 +1602,16 @@
     <modify-function signature="initStyleOption(QStyleOptionHeader*)const">
         <access modifier="private"/>
     </modify-function>
-    
+
     <modify-function signature="paintSection(QPainter*,QRect,int)const">
         <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
-    
+
     <inject-code>
         <insert-template name="gui.init_style_option">
             <replace from="%TYPE" to="QStyleOptionHeader"/>
         </insert-template>
-    </inject-code>  
+    </inject-code>
     <modify-function signature="setModel(QAbstractItemModel*)">
         <modify-argument index="1">
             <reference-count declare-variable="QAbstractItemView" action="set" variable-name="__rcModel"/>
@@ -1560,7 +1621,7 @@
   <object-type name="QIconEngine">
     <modify-function signature="paint(QPainter*,QRect,QIcon::Mode,QIcon::State)">
         <modify-argument index="1" invalidate-after-use="yes" />
-    </modify-function>  
+    </modify-function>
   </object-type>
   <object-type name="QIconEngineV2">
     <modify-function signature="read(QDataStream&amp;)">
@@ -1569,13 +1630,13 @@
     <modify-function signature="write(QDataStream&amp;)const">
         <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
-  
+
     <modify-function signature="virtual_hook(int,void*)" remove="all"/>
     <modify-function signature="clone()const">
         <modify-argument index="return">
             <define-ownership class="shell" owner="c++"/>
-        </modify-argument>    
-    </modify-function>    
+        </modify-argument>
+    </modify-function>
   </object-type>
   <object-type name="QImageWriter">
   <modify-function signature="setDevice(QIODevice*)">
@@ -1588,11 +1649,11 @@
   </object-type>
   <object-type name="QInputContextFactory"/>
   <object-type name="QIntValidator"/>
-  <object-type name="QItemDelegate">  
+  <object-type name="QItemDelegate">
     <modify-function signature="doLayout(QStyleOptionViewItem,QRect*,QRect*,QRect*,bool)const">
         <remove/>
     </modify-function>
-    
+
     <modify-function signature="drawCheck(QPainter*,QStyleOptionViewItem,QRect,Qt::CheckState)const">
         <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
@@ -1606,7 +1667,7 @@
         <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
 
-    
+
     <modify-function signature="selected(QPixmap,QPalette,bool)const">
         <remove/>
     </modify-function>
@@ -1625,7 +1686,7 @@
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-    
+
   </object-type>
   <object-type name="QItemEditorCreatorBase"/>
   <object-type name="QItemEditorFactory">
@@ -1659,7 +1720,7 @@
             <no-null-pointer/>
             <reference-count declare-variable="QAbstractItemView" action="set" variable-name="__rcItemSelectionModel"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
   </object-type>
   <object-type name="QMainWindow">
     <modify-function signature="addDockWidget(Qt::DockWidgetArea,QDockWidget*,Qt::Orientation)">
@@ -1738,25 +1799,25 @@
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-   
+
     <modify-function signature="removeSubWindow(QWidget*)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-   
+
     <modify-function signature="setActiveSubWindow(QMdiSubWindow*)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-   
+
     <modify-function signature="setupViewport(QWidget*)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-  
+
   </object-type>
   <object-type name="QMdiSubWindow">
     <modify-function signature="setSystemMenu(QMenu*)">
@@ -1803,26 +1864,26 @@
     <modify-function signature="initStyleOption(QStyleOptionMenuItem*,const QAction*)const">
         <access modifier="private"/>
     </modify-function>
-    
+
     <modify-function signature="addAction(QString,const QObject*,const char*,QKeySequence)">
-        <remove/>        
+        <remove/>
     </modify-function>
-        
+
     <modify-function signature="addAction(QIcon,QString,const QObject*,const char*,QKeySequence)">
         <remove/>
     </modify-function>
   </object-type>
-  
-  <object-type name="QMenuBar">  
+
+  <object-type name="QMenuBar">
     <modify-function signature="addAction(QAction *)" remove="all"/>
     <modify-function signature="addAction(QString,const QObject*,const char*)">
         <remove/>
     </modify-function>
-        
+
     <modify-function signature="initStyleOption(QStyleOptionMenuItem*,const QAction*)const">
         <access modifier="private"/>
     </modify-function>
-         
+
     <modify-function signature="addMenu(QMenu*)">
         <modify-argument index="1">
             <reference-count action="add" variable-name="__rcMenus"/>
@@ -1831,7 +1892,7 @@
     <modify-function signature="insertMenu(QAction*,QMenu*)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
-        </modify-argument>        
+        </modify-argument>
         <modify-argument index="2">
             <reference-count action="add" variable-name="__rcMenus"/>
         </modify-argument>
@@ -1855,9 +1916,9 @@
   <object-type name="QMotifStyle">
     <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*, const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/>
-  </object-type>  
+  </object-type>
   <object-type name="QPainterPathStroker"/>
- 
+
   <object-type name="QPictureIO">
       <modify-function signature="QPictureIO(QIODevice*,const char*)">
         <access modifier="private"/>
@@ -1865,42 +1926,43 @@
             <reference-count action="set" variable-name="__rcDevice"/>
         </modify-argument>
     </modify-function>
-   
+
     <modify-function signature="setIODevice(QIODevice*)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcDevice"/>
         </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="QPictureIO(QString,const char*)">
         <access modifier="private"/>
     </modify-function>
-                  
+
     <modify-function signature="format()const">
         <access modifier="private"/>
         <rename to="format_private"/>
     </modify-function>
-        
+
     <modify-function signature="parameters()const">
         <access modifier="private"/>
         <rename to="parameters_private"/>
     </modify-function>
-      
+
     <modify-function signature="setFormat(const char*)">
         <access modifier="private"/>
     </modify-function>
-       
+
     <modify-function signature="setParameters(const char*)">
         <access modifier="private"/>
     </modify-function>
-   
+
   </object-type>
-  
+
   <object-type name="QPixmapCache">
     <modify-function signature="find(QString)">
         <remove/>
     </modify-function>
-    
+    <modify-function signature="find(QString,QPixmap*)" remove="all" />
+
     <modify-function signature="find(QString,QPixmap&amp;)">
         <access modifier="private"/>
     </modify-function>
@@ -1908,9 +1970,10 @@
   <object-type name="QPlastiqueStyle">
     <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*, const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/>
-    <modify-function signature="layoutSpacingImplementation(QSizePolicy::ControlType, QSizePolicy::ControlType, Qt::Orientation, const QStyleOption *, const QWidget *) const" virtual-slot="yes" />    
+    <modify-function signature="layoutSpacingImplementation(QSizePolicy::ControlType, QSizePolicy::ControlType, Qt::Orientation, const QStyleOption *, const QWidget *) const" virtual-slot="yes" />
+  </object-type>
+  <object-type name="QPrintDialog">
   </object-type>
-  <object-type name="QPrintDialog" />
   <object-type name="QPrintEngine"/>
   <object-type name="QProgressBar">
     <modify-function signature="initStyleOption(QStyleOptionProgressBar*)const">
@@ -1921,21 +1984,20 @@
     <modify-function signature="initStyleOption(QStyleOptionButton*)const">
         <access modifier="private"/>
     </modify-function>
-    
+
     <modify-function signature="setMenu(QMenu*)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcMenu"/>
         </modify-argument>
     </modify-function>
   </object-type>
-  <object-type name="QReadWriteLock"/>
   <object-type name="QRegExpValidator"/>
   <object-type name="QScrollArea">
     <modify-function signature="setWidget(QWidget*)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
   </object-type>
   <object-type name="QSessionManager"/>
   <object-type name="QShortcut">
@@ -1949,11 +2011,11 @@
         </modify-argument>
         <modify-argument index="5">
             <remove-default-expression/>
-        </modify-argument>        
-    </modify-function>     
+        </modify-argument>
+    </modify-function>
   </object-type>
   <object-type name="QSizeGrip"/>
-  <object-type name="QSound"/>  
+  <object-type name="QSound"/>
   <object-type name="QSpacerItem"/>
   <object-type name="QStandardItem">
     <modify-function signature="operator=(QStandardItem)" remove="all"/>
@@ -1968,7 +2030,7 @@
     </modify-function>
 
   </object-type>
-  <object-type name="QStatusBar">   
+  <object-type name="QStatusBar">
     <modify-function signature="addPermanentWidget(QWidget *, int)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
@@ -2012,7 +2074,7 @@
             <reference-count action="set" variable-name="__rcDocument"/>
         </modify-argument>
     </modify-function>
-    
+
   </object-type>
   <object-type name="QSystemTrayIcon">
     <modify-function signature="setContextMenu(QMenu*)">
@@ -2042,8 +2104,8 @@
             <no-null-pointer/>
             <reference-count declare-variable="QAbstractItemView" action="set" variable-name="__rcItemSelectionModel"/>
         </modify-argument>
-    </modify-function>  
-  
+    </modify-function>
+
       <modify-function signature="sortByColumn(int)" remove="all"/> <!--### Obsolete in 4.3-->
   </object-type>
   <object-type name="QTextBlockGroup" delete-in-main-thread="yes"/>
@@ -2051,15 +2113,22 @@
   <object-type name="QTextItem" delete-in-main-thread="yes"/>
   <object-type name="QTextList" delete-in-main-thread="yes">
     <modify-function signature="format()const" rename="textListFormat"/>
-  
+
       <modify-function signature="isEmpty()const" remove="all"/> <!--### Obsolete in 4.3-->
   </object-type>
   <object-type name="QTextObject" delete-in-main-thread="yes"/>
-  <object-type name="QTextObjectInterface" delete-in-main-thread="yes">
+
+  <!-- The original QTextObjectInterface has been rejected and replaced by this, since the original
+       usage is based on an interface pattern we can't mimic in Java (our users can't implement our
+       interfaces.) The new class inherits both QObject and QTextObjectInterface, and can be extended
+       in Java to get a type that can properly be used with registerHandler() in 
+       QAbstractTextDocumentLayout. -->
+  <object-type name="QtJambiTextObjectInterface" delete-in-main-thread="yes" java-name="QTextObjectInterface">
     <modify-function signature="drawObject(QPainter*,QRectF,QTextDocument*,int,QTextFormat)">
         <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
   </object-type>
+    
   <object-type name="QTimeEdit"/>
   <object-type name="QToolBox">
     <modify-function signature="addItem(QWidget*,QString)">
@@ -2092,7 +2161,7 @@
     <modify-function signature="initStyleOption(QStyleOptionToolButton*)const">
         <access modifier="private"/>
     </modify-function>
-    
+
     <modify-function signature="setDefaultAction(QAction *)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcDefaultAction"/>
@@ -2106,7 +2175,7 @@
   </object-type>
   <object-type name="QToolTip"/>
   <object-type name="QTreeView">
-  
+
     <modify-function signature="drawBranches(QPainter*,QRect,QModelIndex)const">
         <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
@@ -2129,8 +2198,8 @@
             <no-null-pointer/>
             <reference-count declare-variable="QAbstractItemView" action="set" variable-name="__rcItemSelectionModel"/>
         </modify-argument>
-    </modify-function>  
-  
+    </modify-function>
+
       <modify-function signature="sortByColumn(int)" remove="all"/> <!--### Obsolete in 4.3-->
   </object-type>
   <object-type name="QUndoCommand">
@@ -2157,7 +2226,7 @@
   </object-type>
 
   <object-type name="QUndoStack"/>
- 
+
   <object-type name="QUndoView">
     <modify-function signature="setGroup(QUndoGroup *)">
         <modify-argument index="1">
@@ -2190,11 +2259,11 @@
         </modify-argument>
     </modify-function>
   </object-type>
-  <object-type name="QWidgetItem" /> 
+  <object-type name="QWidgetItem" />
   <object-type name="QWindowsStyle">
       <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*, const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/>
-  </object-type>  
+  </object-type>
   <object-type name="QWorkspace">
     <modify-function signature="addWindow(QWidget*,QFlags&lt;Qt::WindowType&gt;)">
         <modify-argument index="1">
@@ -2207,39 +2276,39 @@
         </modify-argument>
     </modify-function>
   </object-type>
-  
+
   <object-type name="QActionEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::ActionAdded || %1-&gt;type() == QEvent::ActionRemoved || %1-&gt;type() == QEvent::ActionChanged"/>
   <object-type name="QClipboardEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Clipboard"/>
-  <object-type name="QCloseEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Close"/>  
+  <object-type name="QCloseEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Close"/>
   <object-type name="QContextMenuEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::ContextMenu"/>
   <object-type name="QDragEnterEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::DragEnter"/>
   <object-type name="QDragLeaveEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::DragLeave"/>
   <object-type name="QDragMoveEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::DragMove">
     <modify-function signature="accept()" remove="all"/>
-    <modify-function signature="ignore()" remove="all"/>           
-  </object-type>           
+    <modify-function signature="ignore()" remove="all"/>
+  </object-type>
   <object-type name="QDropEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Drop">
     <modify-function signature="encodedData(const char*)const">
         <remove/>
     </modify-function>
-    
+
     <modify-function signature="format(int)const">
         <remove/>
     </modify-function>
-    
+
     <modify-function signature="provides(const char*)const">
         <remove/>
     </modify-function>
-    
-               
+
+
   </object-type>
   <object-type name="QFileOpenEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::FileOpen"/>
   <object-type name="QFocusEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::FocusIn || %1-&gt;type() == QEvent::FocusOut">
         <modify-function signature="reason()const">
             <remove/>
-        </modify-function>                   
+        </modify-function>
   </object-type>
-           
+
   <object-type name="QGraphicsSceneContextMenuEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::GraphicsSceneContextMenu"/>
   <object-type name="QGraphicsSceneDragDropEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::GraphicsSceneDragEnter || %1-&gt;type() == QEvent::GraphicsSceneDragLeave || %1-&gt;type() == QEvent::GraphicsSceneDragMove || %1-&gt;type() == QEvent::GraphicsSceneDrop">
     <modify-function signature="setMimeData(const QMimeData *)">
@@ -2271,13 +2340,13 @@
         <!-- All these have const overloads that are used instead -->
         <modify-function signature="isAmbiguous()">
             <remove/>
-        </modify-function>               
+        </modify-function>
         <modify-function signature="shortcutId()">
             <remove/>
-        </modify-function>                    
+        </modify-function>
         <modify-function signature="key()">
             <remove/>
-        </modify-function>                          
+        </modify-function>
   </object-type>
   <object-type name="QShowEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Show"/>
   <object-type name="QStatusTipEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::StatusTip"/>
@@ -2287,20 +2356,20 @@
   <object-type name="QWheelEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Wheel"/>
   <object-type name="QWindowStateChangeEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::WindowStateChange"/>
   <object-type name="QDragResponseEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::DragResponse"/>
-  <object-type name="QInputEvent">  
+  <object-type name="QInputEvent">
     <modify-function signature="modifiers()const" access="non-final"/>
   </object-type>
   <object-type name="QKeyEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::KeyPress || %1-&gt;type() == QEvent::KeyRelease"/>
   <object-type name="QMouseEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::MouseButtonDblClick || %1-&gt;type() == QEvent::MouseButtonPress || %1-&gt;type() == QEvent::MouseButtonRelease || %1-&gt;type() == QEvent::MouseMove"/>
   <object-type name="QPaintEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Paint"/>
   <object-type name="QAccessibleEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::AccessibilityDescription || %1-&gt;type() == QEvent::AccessibilityHelp"/>
-  
+
   <object-type name="QAbstractButton" />
 
   <object-type name="QStyle">
       <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/>
       <modify-function signature="layoutSpacingImplementation(QSizePolicy::ControlType, QSizePolicy::ControlType, Qt::Orientation, const QStyleOption *, const QWidget *) const" virtual-slot="yes" />
-      
+
       <modify-function signature="drawComplexControl(QStyle::ComplexControl,const QStyleOptionComplex*,QPainter*,const QWidget*)const">
         <modify-argument index="3" invalidate-after-use="yes" />
       </modify-function>
@@ -2323,21 +2392,32 @@
   </object-type>
 
   <object-type name="QColorDialog">
+
     <modify-function signature="getColor(const QColor &amp;, QWidget *)">
       <modify-argument index="1">
-        <replace-default-expression with="QColor.white"/>      
+        <replace-default-expression with="QColor.white"/>
       </modify-argument>
     </modify-function>
     <modify-function signature="getRgba(uint,bool*,QWidget*)">
-        <remove/>
-    </modify-function>    
+        <rename to="getRgba_internal"/>
+        <access modifier="private"/>
+        <modify-argument index="1">
+            <remove-default-expression />
+        </modify-argument>
+        <modify-argument index="2">
+            <remove-default-expression />
+        </modify-argument>
+        <modify-argument index="3">
+            <remove-default-expression />
+        </modify-argument>
+    </modify-function>
   </object-type>
-  
-  <object-type name="QLayout">  
+
+  <object-type name="QLayout">
     <modify-function signature="addItem(QLayoutItem*)">
         <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
-  
+
     <modify-function signature="setSpacing(int)" rename="setWidgetSpacing"/>
     <modify-function signature="spacing()const" rename="widgetSpacing"/>
     <modify-function signature="addWidget(QWidget *)">
@@ -2351,14 +2431,14 @@
             <no-null-pointer/>
             <reference-count variable-name="__rcWidgets" action="add"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="removeWidget(QWidget *)">
         <modify-argument index="1">
             <no-null-pointer/>
             <reference-count variable-name="__rcWidgets" action="remove"/>
         </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="setAlignment(QWidget*,QFlags&lt;Qt::AlignmentFlag&gt;)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
@@ -2377,12 +2457,12 @@
     <modify-function signature="getContentsMargins(int*,int*,int*,int*)const">
         <access modifier="private"/>
     </modify-function>
-      
+
     <modify-function signature="margin()const" remove="all"/> <!--### Obsolete in 4.3-->
     <!-- <modify-function signature="setMargin(int)" remove="all"/> --> <!--### Obsolete in 4.3-->
   </object-type>
 
-  <object-type name="QStackedLayout">  
+  <object-type name="QStackedLayout">
     <modify-function signature="addItem(QLayoutItem *)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
@@ -2399,7 +2479,7 @@
             <no-null-pointer/>
             <reference-count action="add" declare-variable="QLayout" variable-name="__rcWidgets"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="insertWidget(int,QWidget*)">
         <modify-argument index="2">
             <no-null-pointer/>
@@ -2413,13 +2493,13 @@
         </modify-argument>
     </modify-function>
   </object-type>
-  
-  <object-type name="QBoxLayout">  
+
+  <object-type name="QBoxLayout">
     <modify-function signature="addWidget(QWidget *, int, QFlags&lt;Qt::AlignmentFlag&gt;)">
         <modify-argument index="1">
             <no-null-pointer/>
         </modify-argument>
-    </modify-function>  
+    </modify-function>
     <modify-function signature="addItem(QLayoutItem *)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
@@ -2429,12 +2509,12 @@
         <modify-argument index="2">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="insertItem(int, QLayoutItem *)">
         <modify-argument index="2">
             <define-ownership class="java" owner="c++"/>
-        </modify-argument>            
-    </modify-function>    
+        </modify-argument>
+    </modify-function>
     <modify-function signature="addSpacerItem(QSpacerItem*)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++" />
@@ -2445,7 +2525,7 @@
             <define-ownership class="java" owner="c++" />
         </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="addLayout(QLayout *, int)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
@@ -2473,7 +2553,7 @@
     </modify-function>
   </object-type>
 
-  <object-type name="QGridLayout">  
+  <object-type name="QGridLayout">
     <modify-function signature="addWidget(QWidget *)" remove="all"/>
     <modify-function signature="addItem(QLayoutItem *)">
         <modify-argument index="1">
@@ -2484,7 +2564,7 @@
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="addLayout(QLayout *, int, int, QFlags&lt;Qt::AlignmentFlag&gt;)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
@@ -2494,7 +2574,7 @@
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>            
+    </modify-function>
         <modify-function signature="addWidget(QWidget*,int,int,QFlags&lt;Qt::AlignmentFlag&gt;)">
             <modify-argument index="1">
                 <reference-count declare-variable="QLayout" action="add" variable-name="__rcWidgets"/>
@@ -2514,12 +2594,17 @@
         <access modifier="private"/>
     </modify-function>
   </object-type>
-  
+
   <object-type name="QGraphicsView">
     <extra-includes>
       <include file-name="QPainterPath" location="global"/>
-      <include file-name="QVarLengthArray" location="global"/>      
-    </extra-includes>    
+      <include file-name="QVarLengthArray" location="global"/>
+    </extra-includes>
+    <modify-function signature="fitInView(const QGraphicsItem *, Qt::AspectRatioMode)">
+        <modify-argument index="1">
+            <no-null-pointer />
+        </modify-argument>
+    </modify-function>
     <modify-function signature="setupViewport(QWidget *)" access="non-final"/>
     <modify-function signature="setScene(QGraphicsScene*)">
         <modify-argument index="1">
@@ -2531,7 +2616,7 @@
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="drawBackground(QPainter*,QRectF)">
         <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
@@ -2541,8 +2626,7 @@
     <modify-function signature="drawItems(QPainter*,int,QGraphicsItem**,const QStyleOptionGraphicsItem*)">
         <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
-    
-    <!--
+
     <modify-function signature="drawItems(QPainter*,int,QGraphicsItem**,const QStyleOptionGraphicsItem*)">
         <modify-argument index="2">
             <remove-argument/>
@@ -2554,8 +2638,8 @@
                     <replace from="%ARRAY" to="%3"/>
                 </insert-template>
                 int __length = %out;
-            </conversion-rule>            
-        </modify-argument>    
+            </conversion-rule>
+        </modify-argument>
 
         <modify-argument index="3">
             <replace-type modified-type="com.trolltech.qt.gui.QGraphicsItemInterface[]"/>
@@ -2563,33 +2647,64 @@
                 <insert-template name="gui.convert_graphicsitem_array_to_java">
                     <replace from="%LENGTH" to="%2"/>
                 </insert-template>
+                jobjectArray graphicsItemArrayHolder = %out;
             </conversion-rule>
             <conversion-rule class="native">
-                <insert-template name="gui.convert_graphicsitem_array_from_java"/>              
-            </conversion-rule>            
-        </modify-argument>        
-        
+                <insert-template name="gui.convert_graphicsitem_array_from_java"/>
+            </conversion-rule>
+        </modify-argument>
+
         <modify-argument index="4">
             <replace-type modified-type="com.trolltech.qt.gui.QStyleOptionGraphicsItem[]"/>
             <conversion-rule class="shell">
                 <insert-template name="gui.convert_styleoptiongraphicsitem_array_to_java">
                     <replace from="%LENGTH" to="%2"/>
                 </insert-template>
+                jobjectArray styleOptionArrayHolder = %out;
             </conversion-rule>
             <conversion-rule class="native">
                 <insert-template name="gui.convert_styleoptiongraphicsitem_array_from_java"/>
-            </conversion-rule>                    
+            </conversion-rule>
         </modify-argument>
+
+        <modify-argument index="return">
+            <conversion-rule class="shell">
+                qtjambi_invalidate_array(__jni_env, styleOptionArrayHolder);
+                qtjambi_invalidate_array(__jni_env, graphicsItemArrayHolder);
+            </conversion-rule>
+        </modify-argument>
+
     </modify-function>
-    -->
   </object-type>
-  
+
   <object-type name="QInputDialog">
+
+    <modify-function signature="getInt(QWidget*,QString,QString,int,int,int,int,bool*,QFlags&lt;Qt::WindowType&gt;)">
+        <rename to="getInt_private" />
+        <access modifier="private" />
+        <modify-argument index="4">
+            <remove-default-expression />
+        </modify-argument>
+        <modify-argument index="5">
+            <remove-default-expression />
+        </modify-argument>
+        <modify-argument index="6">
+            <remove-default-expression />
+        </modify-argument>
+        <modify-argument index="7">
+            <remove-default-expression />
+        </modify-argument>
+        <modify-argument index="8">
+            <remove-default-expression />
+        </modify-argument>
+        <modify-argument index="9">
+            <remove-default-expression />
+        </modify-argument>
+    </modify-function>
+
     <modify-function signature="getDouble(QWidget *, const QString &amp;, const QString &amp;, double, double, double, int, bool *, QFlags&lt;Qt::WindowType&gt;)">
-        <!--
         <rename to="getDouble_internal"/>
         <access modifier="private"/>
-        -->
         <modify-argument index="4">
             <remove-default-expression />
         </modify-argument>
@@ -2607,14 +2722,12 @@
         </modify-argument>
         <modify-argument index="9">
             <remove-default-expression />
-        </modify-argument>        
+        </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="getInteger(QWidget *, const QString &amp;, const QString &amp;, int, int, int, int, bool *, QFlags&lt;Qt::WindowType&gt;)">
-        <!--
         <rename to="getInteger_internal"/>
         <access modifier="private"/>
-        -->
         <modify-argument index="4">
             <remove-default-expression />
         </modify-argument>
@@ -2632,14 +2745,12 @@
         </modify-argument>
         <modify-argument index="9">
             <remove-default-expression />
-        </modify-argument>                
+        </modify-argument>
     </modify-function>
-      
+
     <modify-function signature="getItem(QWidget *, const QString &amp;, const QString &amp;, const QStringList&lt;QString&gt; &amp;, int, bool, bool *, QFlags&lt;Qt::WindowType&gt;)">
-        <!--
         <rename to="getItem_internal"/>
         <access modifier="private"/>
-        -->
         <modify-argument index="4">
             <remove-default-expression />
         </modify-argument>
@@ -2656,12 +2767,10 @@
             <remove-default-expression />
         </modify-argument>
     </modify-function>
-   
+
     <modify-function signature="getText(QWidget *, const QString &amp;, const QString &amp;, QLineEdit::EchoMode, const QString &amp;, bool *, QFlags&lt;Qt::WindowType&gt;)">
-        <!--
         <rename to="getText_internal"/>
         <access modifier="private"/>
-        -->
         <modify-argument index="4">
             <remove-default-expression />
         </modify-argument>
@@ -2676,13 +2785,13 @@
         </modify-argument>
     </modify-function>
   </object-type>
-  
+
 
   <object-type name="QGraphicsScene">
     <extra-includes>
         <include file-name="QVarLengthArray" location="global"/>
     </extra-includes>
-        
+
     <modify-function signature="contextMenuEvent(QGraphicsSceneContextMenuEvent*)">
         <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
@@ -2740,7 +2849,7 @@
     <modify-function signature="wheelEvent(QGraphicsSceneWheelEvent*)">
         <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
-    
+
     <modify-function signature="setActiveWindow(QGraphicsWidget*)">
         <modify-argument index="1">
             <reference-count action="ignore" />
@@ -2756,7 +2865,7 @@
       <modify-argument index="1">
         <define-ownership class="java" owner="c++"/>
       </modify-argument>
-    </modify-function>   
+    </modify-function>
     <modify-function signature="addEllipse(const QRectF &amp;, const QPen &amp;, const QBrush &amp;)">
       <modify-argument index="return">
         <define-ownership class="java" owner="c++"/>
@@ -2790,7 +2899,7 @@
     <modify-function signature="addText(const QString &amp;, const QFont &amp;)">
         <modify-argument index="return">
             <define-ownership class="java" owner="c++"/>
-        </modify-argument>        
+        </modify-argument>
     </modify-function>
     <modify-function signature="addWidget(QWidget*,QFlags&lt;Qt::WindowType&gt;)">
         <modify-argument index="return">
@@ -2817,16 +2926,30 @@
     <extra-includes>
       <include file-name="QTextCharFormat" location="global"/>
     </extra-includes>
-  
+
       <modify-function signature="isHeaderVisible()const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="setHeaderVisible(bool)" remove="all"/> <!--### Obsolete in 4.3-->
-      
+
       <modify-function signature="paintCell(QPainter*,QRect,QDate)const">
         <modify-argument invalidate-after-use="yes" index="1" />
       </modify-function>
   </object-type>
 
   <object-type name="QTreeWidget">
+    <modify-function signature="setSelectionModel(QItemSelectionModel*)">
+        <modify-argument index="1">
+            <no-null-pointer/>
+            <reference-count declare-variable="QAbstractItemView" action="set" variable-name="__rcItemSelectionModel"/>
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="removeItemWidget(QTreeWidgetItem*,int)">
+        <modify-argument index="1">
+            <reference-count action="ignore" />
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="mimeData(const QList&lt;QTreeWidgetItem*&gt;)const">
+        <modify-argument index="1" invalidate-after-use="yes"/>
+    </modify-function>
     <modify-function signature="dropMimeData(QTreeWidgetItem*,int,const QMimeData*,Qt::DropAction)">
         <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
@@ -2848,8 +2971,8 @@
     <modify-function signature="addTopLevelItems(const QList&lt;QTreeWidgetItem*&gt; &amp;)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
-        </modify-argument>    
-    </modify-function>    
+        </modify-argument>
+    </modify-function>
     <modify-function signature="insertTopLevelItem(int, QTreeWidgetItem *)">
         <modify-argument index="2">
             <define-ownership class="java" owner="c++"/>
@@ -2859,7 +2982,7 @@
         <modify-argument index="2">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>        
+    </modify-function>
     <modify-function signature="setHeaderItem(QTreeWidgetItem *)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
@@ -2870,11 +2993,6 @@
             <define-ownership class="java" owner="default"/>
         </modify-argument>
     </modify-function>
-    <modify-function signature="removeItemWidget(QTreeWidgetItem*,int)">
-        <modify-argument index="1">
-            <define-ownership class="java" owner="default"/>
-        </modify-argument>
-    </modify-function>
     <modify-function signature="setCurrentItem(QTreeWidgetItem*,int,QFlags&lt;QItemSelectionModel::SelectionFlag&gt;)">
         <modify-argument index="1">
             <reference-count action="ignore" />
@@ -2910,8 +3028,8 @@
     <modify-function signature="isItemSelected(const QTreeWidgetItem*)const">
         <remove/>
     </modify-function>
-    <modify-function signature="setItemSelected(const QTreeWidgetItem*,bool)">  
-        <remove/>    
+    <modify-function signature="setItemSelected(const QTreeWidgetItem*,bool)">
+        <remove/>
     </modify-function>
     <modify-function signature="setItemWidget(QTreeWidgetItem*,int,QWidget*)">
         <modify-argument index="1">
@@ -2919,17 +3037,17 @@
         </modify-argument>
         <modify-argument index="3">
             <reference-count action="ignore"/>
-        </modify-argument>        
+        </modify-argument>
     </modify-function>
     <modify-function signature="setModel(QAbstractItemModel*)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
         </modify-argument>
-    </modify-function>    
-  
+    </modify-function>
+
       <modify-function signature="items(const QMimeData*)const" remove="all"/> <!--### Obsolete in 4.3-->
   </object-type>
-  
+
   <object-type name="QAbstractItemDelegate">
     <modify-function signature="setEditorData(QWidget*,QModelIndex)const">
         <modify-argument index="1">
@@ -2945,14 +3063,14 @@
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="paint(QPainter*,QStyleOptionViewItem,QModelIndex)const">
-        <modify-argument index="1" invalidate-after-use="yes" />        
+        <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
     <modify-function signature="editorEvent(QEvent*,QAbstractItemModel*,QStyleOptionViewItem,QModelIndex)">
         <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
-  
+
       <modify-function signature="elidedText(QFontMetrics, int, Qt::TextElideMode, QString)" remove="all"/> <!--### Obsolete in 4.3-->
   </object-type>
 
@@ -2962,13 +3080,13 @@
         <modify-argument index="return">
             <define-ownership class="shell" owner="c++"/>
         </modify-argument>
-    </modify-function>    
-  
+    </modify-function>
+
       <modify-function signature="backgroundColor()const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="setBackgroundColor(QColor)" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="setTextColor(QColor)" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="textColor()const" remove="all"/> <!--### Obsolete in 4.3-->
-      
+
     <modify-function signature="operator&lt;(QTableWidgetItem)const">
         <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
@@ -2982,7 +3100,7 @@
   </object-type>
 
   <object-type name="QListWidgetItem" delete-in-main-thread="yes">
-  
+
     <modify-function signature="operator&lt;(QListWidgetItem)const">
         <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
@@ -2993,7 +3111,7 @@
         <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
 
-  
+
     <modify-function signature="operator=(const QListWidgetItem&amp;)" remove="all"/>
     <modify-function signature="QListWidgetItem(QListWidget *, int)">
         <modify-argument index="this">
@@ -3004,18 +3122,18 @@
         <modify-argument index="this">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="QListWidgetItem(const QIcon &amp;, const QString &amp;, QListWidget *, int)">
         <modify-argument index="this">
             <define-ownership class="java" owner="c++"/>
-        </modify-argument>    
-    </modify-function>    
+        </modify-argument>
+    </modify-function>
     <modify-function signature="clone() const">
         <modify-argument index="return">
             <define-ownership class="shell" owner="c++"/>
         </modify-argument>
     </modify-function>
-  
+
       <modify-function signature="backgroundColor()const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="setBackgroundColor(QColor)" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="setTextColor(QColor)" remove="all"/> <!--### Obsolete in 4.3-->
@@ -3031,24 +3149,24 @@
             <argument-map index="1" meta-name="%1"/>
             if (%1 != null) disableGarbageCollection();
         </inject-code>
-    </modify-function>  
+    </modify-function>
     <modify-function signature="QGraphicsTextItem(const QString &amp;,QGraphicsItem*,QGraphicsScene*)">
         <inject-code position="end">
             <argument-map index="2" meta-name="%2"/>
             if (%2 != null) disableGarbageCollection();
         </inject-code>
-    </modify-function>  
+    </modify-function>
     <modify-function signature="setDocument(QTextDocument*)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcDocument"/>
         </modify-argument>
     </modify-function>
-  
+
       <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="sceneMatrix()const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <!--### Obsolete in 4.3-->
-  </object-type>
+ </object-type>
 
   <object-type name="QCompleter">
     <modify-function signature="activated(const QModelIndex &amp;)">
@@ -3100,12 +3218,12 @@
         <modify-argument index="this">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="QTreeWidgetItem(QTreeWidget *,QTreeWidgetItem *,int)">
         <modify-argument index="this">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>        
+    </modify-function>
     <modify-function signature="QTreeWidgetItem(QTreeWidgetItem *,int)">
         <modify-argument index="this">
             <define-ownership class="java" owner="c++"/>
@@ -3115,12 +3233,12 @@
         <modify-argument index="this">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="QTreeWidgetItem(QTreeWidgetItem *,QTreeWidgetItem *,int)">
         <modify-argument index="this">
             <define-ownership class="java" owner="c++"/>
-        </modify-argument>    
-    </modify-function>            
+        </modify-argument>
+    </modify-function>
     <modify-function signature="clone() const">
         <modify-argument index="return">
             <define-ownership class="shell" owner="c++"/>
@@ -3135,7 +3253,7 @@
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="insertChild(int, QTreeWidgetItem *)">
         <modify-argument index="2">
             <define-ownership class="java" owner="c++"/>
@@ -3145,7 +3263,7 @@
         <modify-argument index="2">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>        
+    </modify-function>
     <modify-function signature="removeChild(QTreeWidgetItem*)">
         <modify-argument index="1">
             <define-ownership class="java" owner="default"/>
@@ -3161,7 +3279,7 @@
             <define-ownership class="java" owner="default"/>
         </modify-argument>
     </modify-function>
-  
+
       <modify-function signature="backgroundColor(int)const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="setBackgroundColor(int, QColor)" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="setTextColor(int, QColor)" remove="all"/> <!--### Obsolete in 4.3-->
@@ -3169,6 +3287,9 @@
   </object-type>
 
   <object-type name="QListWidget">
+    <modify-function signature="mimeData(const QList&lt;QListWidgetItem *&gt;)const">
+        <modify-argument index="1" invalidate-after-use="yes" />
+    </modify-function>
     <modify-function signature="addItem(QListWidgetItem *)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
@@ -3177,11 +3298,6 @@
     <modify-function signature="insertItem(int, QListWidgetItem *)">
         <modify-argument index="2">
             <define-ownership class="java" owner="c++"/>
-        </modify-argument>            
-    </modify-function>
-    <modify-function signature="removeItemWidget(QListWidgetItem*)">
-        <modify-argument index="1">
-            <define-ownership class="java" owner="default"/>
         </modify-argument>
     </modify-function>
     <modify-function signature="setCurrentItem(QListWidgetItem*)">
@@ -3193,7 +3309,7 @@
         <modify-argument index="1">
             <reference-count action="ignore"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="setItemHidden(const QListWidgetItem*,bool)">
         <remove/>
     </modify-function>
@@ -3218,7 +3334,12 @@
         <modify-argument index="2">
             <reference-count action="ignore"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
+    <modify-function signature="removeItemWidget(QListWidgetItem*)">
+        <modify-argument index="1">
+            <reference-count action="ignore" />
+        </modify-argument>
+    </modify-function>
     <modify-function signature="setModel(QAbstractItemModel*)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
@@ -3231,8 +3352,8 @@
     <extra-includes>
         <include file-name="QIcon" location="global"/>
         <include file-name="QMessageBox" location="global"/>
-    </extra-includes> 
-    
+    </extra-includes>
+
     <modify-function signature="actionEvent(QActionEvent*)">
         <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
@@ -3318,8 +3439,7 @@
             <remove-default-expression />
         </modify-argument>
     </modify-function>
-    
-    <!--
+
     <inject-code class="native">
         extern "C" JNIEXPORT void JNICALL QTJAMBI_FUNCTION_PREFIX(Java_com_trolltech_qt_gui_QWidget__1_1qt_1QMessageBox_1setWindowTitle)
         (JNIEnv *__jni_env,
@@ -3335,7 +3455,7 @@
             Q_ASSERT(__qt_this);
             __qt_this-&gt;setWindowTitle((const QString&amp; )__qt_title0);
             QTJAMBI_DEBUG_TRACE("(native) -&gt; leaving: QMessageBox::setWindowTitle(const QString &amp; title)");
-        }    
+        }
     </inject-code>
 
     <inject-code class="native">
@@ -3356,18 +3476,17 @@
             QTJAMBI_DEBUG_TRACE("(native) -&gt; leaving: QMessageBox::setWindowModality(Qt::WindowModality modality)");
         }
     </inject-code>
-    -->
-    
+
     <modify-function signature="render(QPaintDevice *, const QPoint &amp;, const QRegion &amp;, QFlags&lt;QWidget::RenderFlag&gt;)">
         <modify-argument index="4">
             <replace-default-expression with="RenderFlag.DrawWindowBackground, RenderFlag.DrawChildren"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="render(QPainter *, const QPoint &amp;, const QRegion &amp;, QFlags&lt;QWidget::RenderFlag&gt;)">
         <modify-argument index="4">
             <replace-default-expression with="RenderFlag.DrawWindowBackground, RenderFlag.DrawChildren"/>
         </modify-argument>
-    </modify-function>       
+    </modify-function>
     <modify-function signature="setFocusProxy(QWidget*)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcFocusProxy"/>
@@ -3405,12 +3524,12 @@
         </modify-argument>
         <modify-argument index="2">
             <reference-count action="ignore"/>
-        </modify-argument>        
-    </modify-function>           
+        </modify-argument>
+    </modify-function>
     <modify-function signature="getContentsMargins(int*,int*,int*,int*)const">
         <access modifier="private"/>
     </modify-function>
-        
+
     <modify-function signature="addAction(QAction *)">
         <modify-argument index="1">
             <reference-count action="add" variable-name="__rcActions"/>
@@ -3451,8 +3570,10 @@
   </object-type>
 
   <object-type name="QMessageBox">
+
+
     <modify-function signature="setWindowTitle(const QString &amp;)" remove="all"/>
-    <modify-function signature="setWindowModality(Qt::WindowModality)" remove="all"/> 
+    <modify-function signature="setWindowModality(Qt::WindowModality)" remove="all"/>
     <extra-includes>
         <include file-name="QPixmap" location="global"/>
     </extra-includes>
@@ -3476,7 +3597,7 @@
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-  
+
       <modify-function signature="QMessageBox(QString,QString,QMessageBox::Icon,int,int,int,QWidget*,QFlags&lt;Qt::WindowType&gt;)" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="buttonText(int)const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="setButtonText(int, QString)" remove="all"/> <!--### Obsolete in 4.3-->
@@ -3508,13 +3629,13 @@
   <object-type name="QTextFrame" delete-in-main-thread="yes">
     <extra-includes>
         <include file-name="QTextCursor" location="global"/>
-    </extra-includes>              
+    </extra-includes>
   </object-type>
 
   <object-type name="QImageIOHandler">
     <extra-includes>
         <include file-name="QRect" location="global"/>
-    </extra-includes>                
+    </extra-includes>
     <modify-function signature="setFormat(const QByteArray &amp;)const">
         <remove/>
     </modify-function>
@@ -3523,18 +3644,17 @@
             <reference-count action="set" variable-name="__rcDevice"/>
         </modify-argument>
     </modify-function>
-    <!--
     <modify-function signature="read(QImage*)">
         <modify-argument index="1">
             <replace-type modified-type="com.trolltech.qt.gui.QImage"/>
             <conversion-rule class="shell">
                 jobject %out = qtjambi_from_object(__jni_env, %in, "QImage", "com/trolltech/qt/gui/", false);
-                
-                QtJambiLink *__link = %out != 0 ? QtJambiLink::findLink(__jni_env, %out) : 0;                
-            </conversion-rule>                
+
+                QtJambiLink *__link = %out != 0 ? QtJambiLink::findLink(__jni_env, %out) : 0;
+            </conversion-rule>
             <conversion-rule class="native">
                 QImage *%out = (QImage *) qtjambi_to_object(__jni_env, %in);
-            </conversion-rule>                            
+            </conversion-rule>
         </modify-argument>
         <modify-argument index="0">
             <conversion-rule class="shell">
@@ -3542,20 +3662,19 @@
                 if (__link != 0) __link-&gt;resetObject(__jni_env);
                 bool %out = (bool) %in;
             </conversion-rule>
-        </modify-argument>        
-    </modify-function>    
-    -->
-  
+        </modify-argument>
+    </modify-function>
+
       <modify-function signature="name()const" remove="all"/> <!--### Obsolete in 4.3-->
   </object-type>
-    
+
   <object-type name="QProxyModel">
     <modify-function signature="parent()const" remove="all"/>
     <extra-includes>
         <include file-name="QPixmap" location="global"/>
         <include file-name="QStringList" location="global"/>
         <include file-name="QSize" location="global"/>
-    </extra-includes>            
+    </extra-includes>
     <modify-function signature="setModel(QAbstractItemModel*)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcModel"/>
@@ -3563,14 +3682,14 @@
     </modify-function>
   </object-type>
 
-  <object-type name="QImageReader">  
+  <object-type name="QImageReader">
     <extra-includes>
         <include file-name="QColor" location="global"/>
         <include file-name="QRect" location="global"/>
         <include file-name="QSize" location="global"/>
         <include file-name="QStringList" location="global"/>
         <include file-name="QImage" location="global"/>
-    </extra-includes>             
+    </extra-includes>
     <modify-function signature="read(QImage*) ">
         <remove/>
     </modify-function>
@@ -3578,9 +3697,9 @@
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcDevice"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
   </object-type>
-  
+
   <object-type name="QMovie">
     <extra-includes>
         <include file-name="QColor" location="global"/>
@@ -3588,7 +3707,7 @@
         <include file-name="QPixmap" location="global"/>
         <include file-name="QRect" location="global"/>
         <include file-name="QSize" location="global"/>
-    </extra-includes>   
+    </extra-includes>
     <modify-function signature="cacheMode()">
         <remove/>
     </modify-function>
@@ -3598,9 +3717,8 @@
         </modify-argument>
     </modify-function>
   </object-type>
-    
-  <object-type name="QPageSetupDialog">
-  </object-type>
+
+  <object-type name="QPageSetupDialog" />
 
   <object-type name="QTabWidget">
     <modify-function signature="initStyleOption(QStyleOptionTabWidgetFrame*)const">
@@ -3610,7 +3728,7 @@
         <insert-template name="gui.init_style_option">
             <replace from="%TYPE" to="QStyleOptionTabWidgetFrame"/>
         </insert-template>
-    </inject-code>  
+    </inject-code>
     <modify-function signature="addTab(QWidget*,QIcon,QString)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
@@ -3651,25 +3769,25 @@
     <extra-includes>
         <include file-name="QPoint" location="global"/>
         <include file-name="QPixmap" location="global"/>
-    </extra-includes>  
+    </extra-includes>
     <modify-function signature="setMimeData(QMimeData*)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>                
-  
+    </modify-function>
+
     <modify-function signature="start(QFlags&lt;Qt::DropAction&gt;)" remove="all"/> <!--### Obsolete in 4.3-->
   </object-type>
-  
+
   <object-type name="QDateTimeEdit">
     <modify-function signature="initStyleOption(QStyleOptionSpinBox*)const" access="private" rename="initDateTimeEditStyleOption"/>
     <modify-function signature="setCalendarWidget(QCalendarWidget*)">
         <modify-argument index="1">
-            <!-- Safe to ignore because widget is reparented --> 
-            <reference-count action="ignore"/> 
+            <!-- Safe to ignore because widget is reparented -->
+            <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-    
+
   </object-type>
 
   <object-type name="QSortFilterProxyModel">
@@ -3678,14 +3796,14 @@
         <include file-name="QItemSelection" location="global"/>
         <include file-name="QStringList" location="global"/>
         <include file-name="QSize" location="global"/>
-    </extra-includes>            
-    
+    </extra-includes>
+
     <modify-function signature="setSourceModel(QAbstractItemModel *)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcSourceModel"/>
         </modify-argument>
     </modify-function>
-      
+
       <modify-function signature="clear()" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="filterChanged()" remove="all"/> <!--### Obsolete in 4.3-->
   </object-type>
@@ -3699,7 +3817,7 @@
   <object-type name="QInputContext">
     <extra-includes>
         <include file-name="QTextFormat" location="global"/>
-    </extra-includes> 
+    </extra-includes>
     <modify-function signature="setFocusWidget(QWidget*)">
         <remove/>
     </modify-function>
@@ -3711,8 +3829,9 @@
     </modify-function>
 
   </object-type>
-      
+
   <object-type name="QProgressDialog">
+
     <modify-function signature="setBar(QProgressBar*)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
@@ -3730,7 +3849,7 @@
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-   
+
   </object-type>
 
   <object-type name="QLabel">
@@ -3738,7 +3857,7 @@
         <access modifier="private"/>
         <rename to="picture_private"/>
     </modify-function>
-    
+
     <modify-function signature="setBuddy(QWidget *)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcBuddy"/>
@@ -3751,7 +3870,7 @@
     </modify-function>
     <modify-function signature="pixmap()const">
         <access modifier="private"/>
-        <rename to="pixmap_private"/>    
+        <rename to="pixmap_private"/>
     </modify-function>
   </object-type>
 
@@ -3759,7 +3878,7 @@
     <extra-includes>
         <include file-name="QUrl" location="global"/>
     </extra-includes>
-<!--
+
     <modify-function signature="getOpenFileName(QWidget*,QString,QString,QString,QString*,QFlags&lt;QFileDialog::Option&gt;)">
         <access modifier="private"/>
         <modify-argument index="1">
@@ -3779,9 +3898,9 @@
         </modify-argument>
         <modify-argument index="6">
             <remove-default-expression/>
-        </modify-argument>        
+        </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="getOpenFileNames(QWidget*,QString,QString,QString,QString*,QFlags&lt;QFileDialog::Option&gt;)">
         <access modifier="private"/>
         <modify-argument index="1">
@@ -3801,9 +3920,9 @@
         </modify-argument>
         <modify-argument index="6">
             <remove-default-expression/>
-        </modify-argument>    
+        </modify-argument>
     </modify-function>
-       
+
     <modify-function signature="getSaveFileName(QWidget*,QString,QString,QString,QString*,QFlags&lt;QFileDialog::Option&gt;)">
         <access modifier="private"/>
         <modify-argument index="1">
@@ -3823,29 +3942,28 @@
         </modify-argument>
         <modify-argument index="6">
             <remove-default-expression/>
-        </modify-argument>    
+        </modify-argument>
     </modify-function>
--->
-     
+
     <modify-function signature="setIconProvider(QFileIconProvider*)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcIconProvider"/>
         </modify-argument>
     </modify-function>
-   
+
     <modify-function signature="setItemDelegate(QAbstractItemDelegate*)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcItemDelegate"/>
         </modify-argument>
     </modify-function>
-   
+
     <modify-function signature="setProxyModel(QAbstractProxyModel*)">
         <modify-argument index="1">
             <!-- Reparented -->
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-       
+
   </object-type>
 
   <object-type name="QErrorMessage" />
@@ -3853,10 +3971,15 @@
   <object-type name="QTabBar">
     <extra-includes>
         <include file-name="QIcon" location="global"/>
-    </extra-includes>        
+    </extra-includes>
     <modify-function signature="initStyleOption(QStyleOptionTab*,int)const">
         <access modifier="private"/>
     </modify-function>
+    <modify-function signature="setTabButton(int,QTabBar::ButtonPosition,QWidget*)">
+        <modify-argument index="3">
+            <reference-count action="ignore" />
+        </modify-argument>
+    </modify-function>
   </object-type>
 
   <object-type name="QStandardItemModel">
@@ -3866,8 +3989,8 @@
     <extra-includes>
         <include file-name="QStringList" location="global"/>
         <include file-name="QSize" location="global"/>
-    </extra-includes>        
-    
+    </extra-includes>
+
     <modify-function signature="appendColumn(const QList&lt;QStandardItem *&gt;&amp;)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
@@ -3882,22 +4005,22 @@
         <modify-argument index="return">
             <define-ownership class="java" owner="default"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="takeHorizontalHeaderItem(int)">
         <modify-argument index="return">
             <define-ownership class="java" owner="default"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="takeVerticalHeaderItem(int)">
         <modify-argument index="return">
             <define-ownership class="java" owner="default"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="takeItem(int,int)">
         <modify-argument index="return">
             <define-ownership class="java" owner="default"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="appendRow(const QList&lt;QStandardItem *&gt;&amp;)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
@@ -3906,7 +4029,7 @@
     <modify-function signature="appendRow(QStandardItem *)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
-        </modify-argument>        
+        </modify-argument>
     </modify-function>
     <modify-function signature="insertColumn(int, const QList&lt;QStandardItem *&gt;&amp;)">
         <modify-argument index="2">
@@ -3921,7 +4044,7 @@
     <modify-function signature="insertRow(int, QStandardItem *)">
         <modify-argument index="2">
             <define-ownership class="java" owner="c++"/>
-        </modify-argument>        
+        </modify-argument>
     </modify-function>
     <modify-function signature="setHorizontalHeaderItem(int, QStandardItem *)">
         <modify-argument index="2">
@@ -3942,12 +4065,12 @@
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="setVerticalHeaderItem(int, QStandardItem *)">
         <modify-argument index="2">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
   </object-type>
 
   <object-type name="QRadioButton">
@@ -3966,7 +4089,7 @@
     <extra-includes>
         <include file-name="QImage" location="global"/>
         <include file-name="QPixmap" location="global"/>
-    </extra-includes>      
+    </extra-includes>
     <modify-function signature="setMimeData(QMimeData *, QClipboard::Mode)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
@@ -3978,11 +4101,11 @@
             <remove-default-expression/>
         </modify-argument>
     </modify-function>
-   
+
   </object-type>
 
   <object-type name="QAbstractScrollArea">
-    <modify-function signature="setupViewport(QWidget *)" access="non-final"/>    
+    <modify-function signature="setupViewport(QWidget *)" access="non-final"/>
     <modify-function signature="addScrollBarWidget(QWidget*,QFlags&lt;Qt::AlignmentFlag&gt;)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
@@ -3998,35 +4121,35 @@
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-   
+
     <modify-function signature="setVerticalScrollBar(QScrollBar*)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-   
+
     <modify-function signature="setViewport(QWidget*)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-   
+
     <modify-function signature="setupViewport(QWidget*)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="viewportEvent(QEvent*)">
         <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
-    
+
   </object-type>
 
   <object-type name="QPaintEngineState">
     <extra-includes>
         <include file-name="QPainterPath" location="global"/>
-    </extra-includes>        
+    </extra-includes>
   </object-type>
 
   <object-type name="QRubberBand">
@@ -4044,12 +4167,15 @@
   <object-type name="QTextLayout">
     <extra-includes>
         <include file-name="QTextOption" location="global"/>
-    </extra-includes>          
-  </object-type>  
+    </extra-includes>
+  </object-type>
 
   <object-type name="QTableWidget">
+    <modify-function signature="mimeData(const QList&lt;QTableWidgetItem*&gt;)const">
+        <modify-argument index="1" invalidate-after-use="yes"/>
+    </modify-function>
     <modify-function signature="isSortingEnabled()const" remove="all"/>
-    <modify-function signature="setSortingEnabled(bool)" remove="all"/>  
+    <modify-function signature="setSortingEnabled(bool)" remove="all"/>
     <modify-function signature="setHorizontalHeaderItem(int, QTableWidgetItem *)">
         <modify-argument index="2">
             <define-ownership class="java" owner="c++"/>
@@ -4059,7 +4185,7 @@
         <modify-argument index="3">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="takeHorizontalHeaderItem(int)">
         <modify-argument index="return">
             <define-ownership class="java" owner="default"/>
@@ -4069,22 +4195,22 @@
         <modify-argument index="return">
             <define-ownership class="java" owner="default"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="takeItem(int,int)">
         <modify-argument index="return">
             <define-ownership class="java" owner="default"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="setItemPrototype(const QTableWidgetItem *)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="setVerticalHeaderItem(int, QTableWidgetItem *)">
         <modify-argument index="2">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function> 
+    </modify-function>
     <modify-function signature="setCellWidget(int,int,QWidget*)">
         <modify-argument index="3">
             <reference-count action="ignore"/>
@@ -4117,23 +4243,36 @@
         <include file-name="QTextBlock" location="global"/>
         <include file-name="QTextFormat" location="global"/>
         <include file-name="QTextCursor" location="global"/>
-    </extra-includes>  
+    </extra-includes>
     <modify-function signature="redo(QTextCursor*)">
-        <access modifier="private"/>        
+        <access modifier="private"/>
     </modify-function>
     <modify-function signature="setDocumentLayout(QAbstractTextDocumentLayout*)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="undo(QTextCursor*)">
-        <access modifier="private"/>        
+        <access modifier="private"/>
+    </modify-function>
+  </object-type>
+
+  <object-type name="QTextDocumentWriter">
+    <modify-function signature="setCodec(QTextCodec*)">
+        <modify-argument index="1">
+            <reference-count action="set" variable-name="__rcCodec" />
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="setDevice(QIODevice*)">
+        <modify-argument index="1">
+            <reference-count action="set" variable-name="__rcDevice" />
+        </modify-argument>
     </modify-function>
   </object-type>
 
   <object-type name="QSplitter">
-   
+
     <modify-function signature="getRange(int,int*,int*)const">
         <access modifier="private"/>
     </modify-function>
@@ -4148,7 +4287,7 @@
         </modify-argument>
     </modify-function>
   </object-type>
-  
+
   <object-type name="QGroupBox">
     <modify-function signature="initStyleOption(QStyleOptionGroupBox*)const">
         <access modifier="private"/>
@@ -4202,9 +4341,9 @@
         </modify-argument>
     </modify-function>
   </object-type>
-  
+
   <object-type name="QLCDNumber" />
-  
+
   <object-type name="QSplashScreen">
     <modify-function signature="showMessage(const QString &amp;, int, const QColor &amp;)">
       <modify-argument index="3">
@@ -4216,7 +4355,7 @@
         <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
   </object-type>
-    
+
   <object-type name="QDockWidget">
     <modify-function signature="initStyleOption(QStyleOptionDockWidget*)const">
         <access modifier="private"/>
@@ -4225,7 +4364,7 @@
         <insert-template name="gui.init_style_option">
             <replace from="%TYPE" to="QStyleOptionDockWidget"/>
         </insert-template>
-    </inject-code>        
+    </inject-code>
     <modify-function signature="setTitleBarWidget(QWidget*)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
@@ -4244,13 +4383,13 @@
         <include file-name="QStringList" location="global"/>
         <include file-name="QSize" location="global"/>
     </extra-includes>
-    
+
     <modify-function signature="setSourceModel(QAbstractItemModel *)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcSourceModel"/>
         </modify-argument>
     </modify-function>
-    
+
   </object-type>
 
   <object-type name="QDesktopWidget">
@@ -4271,20 +4410,20 @@
   <object-type name="QSpinBox">
     <modify-function signature="valueChanged(const QString &amp;)">
         <rename to="valueStringChanged"/>
-    </modify-function>    
-  </object-type>  
-  
+    </modify-function>
+  </object-type>
+
   <object-type name="QTextBrowser">
     <modify-function signature="highlighted(const QString &amp;)">
         <rename to="highlightedString"/>
     </modify-function>
   </object-type>
-  
+
   <object-type name="QDoubleSpinBox">
     <modify-function signature="valueChanged(const QString &amp;)">
         <rename to="valueStringChanged"/>
     </modify-function>
-  </object-type>  
+  </object-type>
 
   <object-type name="QButtonGroup">
     <modify-function signature="buttonClicked(int)">
@@ -4307,21 +4446,21 @@
             <reference-count action="add" variable-name="__rcButtons"/>
             <no-null-pointer/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="removeButton(QAbstractButton *)">
         <modify-argument index="1">
             <reference-count action="remove" variable-name="__rcButtons"/>
             <no-null-pointer/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="setId(QAbstractButton *,int)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
   </object-type>
-    
-  <object-type name="QToolBar">  
+
+  <object-type name="QToolBar">
     <modify-function signature="addAction(QAction *)" remove="all"/>
     <modify-function signature="initStyleOption(QStyleOptionToolBar*)const">
         <access modifier="private"/>
@@ -4336,11 +4475,11 @@
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>  
+    </modify-function>
     <modify-function signature="insertWidget(QAction*,QWidget*)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
-        </modify-argument>           
+        </modify-argument>
         <modify-argument index="2">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
@@ -4351,9 +4490,9 @@
         </modify-argument>
     </modify-function>
   </object-type>
-  
+
   <object-type name="QPaintEngine">
-  
+
     <modify-function signature="begin(QPaintDevice*)">
         <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
@@ -4368,13 +4507,20 @@
         <include file-name="QVarLengthArray" location="global"/>
     </extra-includes>
     <modify-function signature="setPaintDevice(QPaintDevice*)">
-        <remove/>    
+        <remove/>
     </modify-function>
     <modify-field name="state" read="false" write="false"/>
   </object-type>
-  
-  <object-type name="QGuiSignalMapper"/>  
-      
+
+  <object-type name="QAbstractTableModel">
+    <extra-includes>
+        <include file-name="QStringList" location="global"/>
+        <include file-name="QSize" location="global"/>
+    </extra-includes>
+  </object-type>
+
+  <object-type name="QGuiSignalMapper"/>
+
   <object-type name="QComboBox">
     <modify-function signature="initStyleOption(QStyleOptionComboBox*)const">
         <access modifier="private"/>
@@ -4400,7 +4546,7 @@
             <no-null-pointer/>
             <!-- Safe to ignore because combo box reparents view -->
             <reference-count action="ignore"/>
-        </modify-argument> 
+        </modify-argument>
     </modify-function>
     <modify-function signature="setLineEdit(QLineEdit *)">
         <modify-argument index="1">
@@ -4419,9 +4565,9 @@
         <insert-template name="gui.init_style_option">
             <replace from="%TYPE" to="QStyleOptionComboBox"/>
         </insert-template>
-    </inject-code>  
+    </inject-code>
     <modify-function signature="activated(int)">&gt;
-        <rename to="activatedIndex"/>        
+        <rename to="activatedIndex"/>
     </modify-function>
     <modify-function signature="currentIndexChanged(const QString &amp;)">
         <rename to="currentStringChanged"/>
@@ -4429,13 +4575,13 @@
     <modify-function signature="highlighted(int)">
         <rename to="highlightedIndex"/>
     </modify-function>
-  
+
       <modify-function signature="autoCompletion()const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="autoCompletionCaseSensitivity()const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="setAutoCompletion(bool)" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="setAutoCompletionCaseSensitivity(Qt::CaseSensitivity)" remove="all"/> <!--### Obsolete in 4.3-->
-  </object-type>  
- 
+  </object-type>
+
   <object-type name="QTextEdit">
     <extra-includes>
         <include file-name="QTextCursor" location="global"/>
@@ -4469,7 +4615,7 @@
             <reference-count action="set" variable-name="__rcMenu"/>
         </modify-argument>
     </modify-function>
-    
+
   </object-type>
 
   <object-type name="QPainter">
@@ -4478,18 +4624,18 @@
       <include file-name="QPainterPath" location="global"/>
       <include file-name="QPixmap" location="global"/>
     </extra-includes>
-    
+
     <modify-function signature="drawText(const QPointF &amp;, const QString &amp;, int, int)" remove="all" />
-    
+
     <modify-function signature="drawConvexPolygon(const QPoint *, int)">
         <remove/>
     </modify-function>
     <modify-function signature="drawConvexPolygon(const QPointF *, int)">
         <remove/>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="drawLines(const QLine *, int)">
         <remove/>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="drawLines(const QLineF *, int)">
         <remove/>
     </modify-function>
@@ -4504,28 +4650,28 @@
     </modify-function>
     <modify-function signature="drawPoints(const QPointF *, int)">
         <remove/>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="drawPolygon(const QPoint *, int, Qt::FillRule)">
         <remove/>
     </modify-function>
     <modify-function signature="drawPolygon(const QPointF *, int, Qt::FillRule)">
         <remove/>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="drawPolyline(const QPoint *, int)">
         <remove/>
     </modify-function>
     <modify-function signature="drawPolyline(const QPointF *, int)">
         <remove/>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="drawRects(const QRect *, int)">
         <remove/>
     </modify-function>
     <modify-function signature="drawRects(const QRectF *, int)">
         <remove/>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="drawLines(const QVector&lt;QPoint&gt; &amp;)">
         <rename to="drawLinesFromPoints"/>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="drawLines(const QVector&lt;QPointF&gt; &amp;)">
         <rename to="drawLinesFromPointsF"/>
     </modify-function>
@@ -4534,23 +4680,23 @@
     </modify-function>
     <modify-function signature="drawRects(const QVector&lt;QRectF&gt; &amp;)">
         <rename to="drawRectsF"/>
-    </modify-function>    
-    
+    </modify-function>
+
     <modify-function signature="QPainter(QPaintDevice *)">
         <modify-argument index="1">
             <no-null-pointer/>
         </modify-argument>
-    </modify-function>        
+    </modify-function>
     <modify-function signature="begin(QPaintDevice *)">
         <modify-argument index="1">
             <no-null-pointer/>
         </modify-argument>
-    </modify-function>        
+    </modify-function>
     <modify-function signature="initFrom(const QWidget *)">
         <modify-argument index="1">
             <no-null-pointer/>
         </modify-argument>
-    </modify-function>            
+    </modify-function>
     <modify-function signature="setRedirected(const QPaintDevice *, QPaintDevice *, const QPoint &amp;)">
         <modify-argument index="1">
             <no-null-pointer />
@@ -4561,28 +4707,28 @@
             <no-null-pointer />
         </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="drawText(QRect,int,QString,QRect*)">
         <access modifier="private"/>
         <modify-argument index="4">
             <remove-default-expression/>
-        </modify-argument>        
+        </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="drawText(QRectF,int,QString,QRectF*)">
         <access modifier="private"/>
         <modify-argument index="4">
             <remove-default-expression/>
-        </modify-argument>            
+        </modify-argument>
     </modify-function>
-   
+
     <modify-function signature="drawText(int,int,int,int,int,QString,QRect*)">
         <access modifier="private"/>
         <modify-argument index="7">
             <remove-default-expression/>
         </modify-argument>
     </modify-function>
-   
+
     <modify-function signature="redirected(const QPaintDevice*,QPoint*)">
         <access modifier="private"/>
         <modify-argument index="2">
@@ -4593,8 +4739,8 @@
     <modify-function signature="matrixEnabled()const" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="setMatrixEnabled(bool)" remove="all"/> <!--### Obsolete in 4.3-->
-  </object-type>  
-    
+  </object-type>
+
   <object-type name="QApplication">
     <extra-includes>
       <include file-name="QBasicTimer" location="global"/>
@@ -4603,18 +4749,18 @@
       <include file-name="QPalette" location="global"/>
       <include file-name="QIcon" location="global"/>
       <include file-name="QLocale" location="global"/>
-    </extra-includes>  
-    
+    </extra-includes>
+
     <modify-function signature="QApplication(int &amp;, char  **, int)">
         <access modifier="private"/>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="QApplication(int &amp;, char **, QApplication::Type, int)">
-	    <remove/>
+        <remove/>
     </modify-function>
     <modify-function signature="QApplication(int &amp;, char **, bool, int)">
-	    <remove/>
+        <remove/>
     </modify-function>
-    
+
     <modify-function signature="font(const char*)">
         <remove/>
     </modify-function>
@@ -4624,7 +4770,7 @@
             <remove-default-expression/>
         </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="palette(const char*)">
         <remove/>
     </modify-function>
@@ -4634,12 +4780,12 @@
             <remove-default-expression/>
         </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="overrideCursor()">
         <access modifier="private"/>
         <rename to="overrideCursor_private"/>
     </modify-function>
-          
+
     <modify-function signature="setInputContext(QInputContext*)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
@@ -4656,7 +4802,11 @@
         </modify-argument>
     </modify-function>
   </object-type>
-  
+
+  <object-type name="QMouseEventTransition" />
+  <object-type name="QKeyEventTransition" />
+  <value-type name="QQuaternion" />
+
   <object-type name="QCommandLinkButton" />
   <object-type name="QFileSystemModel">
     <modify-function signature="setIconProvider(QFileIconProvider*)">
@@ -4664,7 +4814,7 @@
             <reference-count action="set" variable-name="__rcIconProvider"/>
         </modify-argument>
     </modify-function>
-  </object-type>  
+  </object-type>
   <object-type name="QFormLayout">
     <modify-function signature="addRow(QWidget*,QWidget*)">
         <modify-argument index="1">
@@ -4681,11 +4831,11 @@
     </modify-function>
     <modify-function signature="addRow(QWidget*,QLayout*)">
         <modify-argument index="1">
-            <reference-count action="ignore" />            
+            <reference-count action="ignore" />
         </modify-argument>
         <modify-argument index="2">
-            <reference-count action="ignore" />            
-        </modify-argument>                
+            <reference-count action="ignore" />
+        </modify-argument>
     </modify-function>
 
     <modify-function signature="addRow(QWidget*)">
@@ -4714,7 +4864,7 @@
         </modify-argument>
         <modify-argument index="3">
             <reference-count action="ignore" />
-        </modify-argument>            
+        </modify-argument>
     </modify-function>
     <modify-function signature="insertRow(int,QWidget*,QWidget*)">
         <modify-argument index="2">
@@ -4722,32 +4872,32 @@
         </modify-argument>
         <modify-argument index="3">
             <reference-count action="ignore" />
-        </modify-argument>            
+        </modify-argument>
     </modify-function>
     <modify-function signature="insertRow(int,QWidget*)">
         <modify-argument index="2">
             <reference-count action="ignore" />
-        </modify-argument>    
+        </modify-argument>
     </modify-function>
     <modify-function signature="insertRow(int,QString,QLayout*)">
         <modify-argument index="3">
             <reference-count action="ignore" />
-        </modify-argument>    
+        </modify-argument>
     </modify-function>
     <modify-function signature="insertRow(int,QString,QWidget*)">
         <modify-argument index="3">
             <reference-count action="ignore" />
-        </modify-argument>    
-    </modify-function>    
+        </modify-argument>
+    </modify-function>
     <modify-function signature="setLayout(int,QFormLayout::ItemRole,QLayout*)">
         <modify-argument index="3">
             <reference-count action="ignore" />
-        </modify-argument>    
+        </modify-argument>
     </modify-function>
     <modify-function signature="setWidget(int,QFormLayout::ItemRole,QWidget*)">
         <modify-argument index="3">
             <reference-count action="ignore" />
-        </modify-argument>    
+        </modify-argument>
     </modify-function>
     <modify-function signature="setItem(int,QFormLayout::ItemRole,QLayoutItem*)" access="private" rename="setItem_private">
         <modify-argument index="3">
@@ -4757,7 +4907,7 @@
     <modify-function signature="addItem(QLayoutItem*)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
-        </modify-argument>    
+        </modify-argument>
     </modify-function>
   </object-type>
   <object-type name="QGraphicsGridLayout" delete-in-main-thread="yes">
@@ -4776,9 +4926,9 @@
             <reference-count action="ignore" />
         </modify-argument>
     </modify-function>
-  </object-type>  
+  </object-type>
   <object-type name="QGraphicsLayout" delete-in-main-thread="yes">
-  
+
     <modify-function signature="widgetEvent(QEvent*)">
         <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
@@ -4787,13 +4937,23 @@
             <reference-count action="set" variable-name="__rcParentLayoutItem" />
         </modify-argument>
     </modify-function>
-  </object-type>  
+    <modify-function signature="setGraphicsItem(QGraphicsItem*)">
+        <modify-argument index="1">
+            <reference-count action="set" variable-name="__rcItem" />
+        </modify-argument>
+    </modify-function>
+  </object-type>
   <interface-type name="QGraphicsLayoutItem" delete-in-main-thread="yes">
     <modify-function signature="setParentLayoutItem(QGraphicsLayoutItem*)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcParentLayoutItem" />
         </modify-argument>
-    </modify-function>  
+    </modify-function>
+    <modify-function signature="setGraphicsItem(QGraphicsItem*)">
+        <modify-argument index="1">
+            <reference-count action="set" variable-name="__rcItem" />
+        </modify-argument>
+    </modify-function>
   </interface-type>
   <object-type name="QGraphicsLinearLayout" delete-in-main-thread="yes">
     <modify-function signature="addItem(QGraphicsLayoutItem*)">
@@ -4821,7 +4981,7 @@
             <reference-count action="ignore" />
         </modify-argument>
     </modify-function>
-  </object-type>  
+  </object-type>
   <object-type name="QGraphicsProxyWidget"/> <!-- a QObject so main-thread delete redundant -->
   <object-type name="QGraphicsWidget">  <!-- a QObject so main-thread delete redundant -->
     <!-- Duplicate function to QObject::children() to override accidental shadowing which is not present in Jambi -->
@@ -4831,7 +4991,29 @@
             <reference-count action="set" variable-name="__rcLayout" />
         </modify-argument>
     </modify-function>
-    
+
+    <modify-function signature="addAction(QAction*)">
+        <modify-argument index="1">
+            <reference-count action="add" variable-name="__rcActions" />
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="insertAction(QAction*,QAction*)">
+        <modify-argument index="2">
+            <reference-count action="add" variable-name="__rcActions" />
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="insertActions(QAction*,QList&lt;QAction*&gt;)">
+        <modify-argument index="2">
+            <reference-count action="add" variable-name="__rcActions" />
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="removeAction(QAction*)">
+        <modify-argument index="1">
+            <reference-count action="remove" variable-name="__rcActions" />
+        </modify-argument>
+    </modify-function>
+
+
     <modify-function signature="changeEvent(QEvent*)">
         <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
@@ -4868,7 +5050,7 @@
     <modify-function signature="windowFrameEvent(QEvent*)">
         <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
-        
+
     <modify-function signature="setStyle(QStyle*)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcStyle" />
@@ -4880,14 +5062,14 @@
         </modify-argument>
         <modify-argument index="2">
             <reference-count action="ignore" />
-        </modify-argument>        
+        </modify-argument>
     </modify-function>
   </object-type>
   <object-type name="QPlainTextDocumentLayout" />
   <object-type name="QPlainTextEdit">
     <modify-function signature="setDocument(QTextDocument*)">
         <modify-argument index="1">
-            <reference-count action="set" variable-name="__rcDocument" />           
+            <reference-count action="set" variable-name="__rcDocument" />
         </modify-argument>
     </modify-function>
     <modify-function signature="insertFromMimeData(const QMimeData*)">
@@ -4896,7 +5078,8 @@
         </modify-argument>
     </modify-function>
   </object-type>
-  <object-type name="QPrintPreviewDialog" />
+  <object-type name="QPrintPreviewDialog" >
+  </object-type>
   <object-type name="QPrintPreviewWidget" />
   <object-type name="QStyledItemDelegate">
     <modify-function signature="setItemEditorFactory(QItemEditorFactory*)">
@@ -4913,42 +5096,101 @@
         <modify-argument index="1">
             <reference-count action="ignore"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
   </object-type>
 
   <interface-type name="QAccessibleFactoryInterface" java-name="QAbstractAccessibleFactory" />
   <interface-type name="QIconEngineFactoryInterfaceV2" java-name="QAbstractIconEngineFactoryV2" />
-  <interface-type name="QImageIOHandlerFactoryInterface" java-name="QAbstractImageIOHandlerFactory" />  
+  <interface-type name="QImageIOHandlerFactoryInterface" java-name="QAbstractImageIOHandlerFactory" />
   <interface-type name="QInputContextFactoryInterface" java-name="QAbstractInputContextFactory" />
   <interface-type name="QStyleFactoryInterface" java-name="QAbstractStyleFactory" />
+  <interface-type name="QTextCodecFactoryInterface" java-name="QAbstractTextCodecFactory" />
   <interface-type name="QPictureFormatInterface" java-name="QAbstractPictureFormat" />
-  
+
   <object-type name="QIconEnginePluginV2"/>
-  <object-type name="QAccessiblePlugin"/>  
+  <object-type name="QAccessiblePlugin"/>
   <object-type name="QImageIOPlugin" />
   <object-type name="QInputContextPlugin" />
   <object-type name="QPictureFormatPlugin" />
   <object-type name="QStylePlugin" />
-     
+  <object-type name="QTextCodecPlugin" />
+  <object-type name="QGesture" />
+  <object-type name="QGraphicsAnchorLayout" />
+  <object-type name="QGraphicsAnchor" />
+  <object-type name="QGraphicsEffect" />
+  <object-type name="QGraphicsObject">
+    <!-- Duplicate function to QObject::children() to override accidental shadowing which is not present in Jambi -->
+    <modify-function signature="children()const" remove="all" />
+  </object-type>
+  <object-type name="QGraphicsOpacityEffect" />
+  <object-type name="QGraphicsPixelizeEffect" />
+  <object-type name="QGraphicsRotation" />
+  <object-type name="QGraphicsScale" />
+  <object-type name="QGraphicsTransform" />
+  <object-type name="QPanGesture" />
+  <object-type name="QPinchGesture" />
+  <object-type name="QProxyStyle" />
+  <object-type name="QSwipeGesture" />
+  <object-type name="QTouchEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::TouchBegin || %1-&gt;type() == QEvent::TouchUpdate || %1-&gt;type() == QEvent::TouchEnd" />
+  
+  <!-- Inefficient hash codes -->
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextFrame_iterator' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextTableCell' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextOption_Tab' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextLength' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextBlock_iterator' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextBlock' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextCursor' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPainterPath_Element' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPainterPath' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QItemSelection' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QKeySequence' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSizePolicy' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextFragment' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFontMetrics' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QGradient' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFontMetricsF' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextFormat' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />  
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QEasingCurve' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QGenericMatrix' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QMatrix4x4' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QMargins' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPixmapCache_Key' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QVector4D' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QQuaternion' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QVector2D' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QVector3D' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: private virtual function 'eventFilter(QObject * receiver, QEvent * event)' in 'QPanGesture'" />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: private virtual function 'event(QEvent * event)' in 'QPanGesture'" />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: private virtual function 'eventFilter(QObject * receiver, QEvent * event)' in 'QSwipeGesture'" />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: private virtual function 'eventFilter(QObject * receiver, QEvent * event)' in 'QPinchGesture'" />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: private virtual function 'event(QEvent * event)' in 'QPinchGesture'" />
+  
+  <!-- Intentional omissions. See explanation for QtJambiTextObjectInterface class in typesystem and headers. -->
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: class 'QTextObjectInterface' inherits from unknown base class 'QTextObjectInterface'" />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: unknown interface for 'QTextObjectInterface': 'QTextObjectInterfaceInterface'" />
+
+  <suppress-warning text="WARNING(MetaInfoGenerator) :: class 'QPixmapFilter' inherits from polymorphic class 'QPixmapFilter', but has no polymorphic id set"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QPixmap::QPixmap', unmatched parameter type 'QPixmapData*'" />
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private&amp;'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private\*'"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private const\*'"/>  
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private const\*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QTextEngine\*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QFontEngine\*'"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QPixmap::Type'"/>  
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QInputDialog::Type'"/>  
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QTextFrameLayoutData\*'"/>  
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QPixmap::Type'"/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QInputDialog::Type'"/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QTextFrameLayoutData\*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QAbstractUndoItem\*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*QImageTextKeyLang*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: non-public function '*' in interface '*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: hiding of function '*' in class '*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value 'QVector&lt;FormatRange&gt;()' of argument in function '*', class '*'"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value 'QVariantList()' of argument in function '*', class '*'"/>  
-  <suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'"/>  
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QTextLayout::QTextLayout', unmatched parameter type 'QTextEngine*'"/>    
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value of argument in function 'doAction', class 'QAccessibleInterface'"/>  
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value 'QVariantList()' of argument in function '*', class '*'"/>
+  <suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'"/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QTextLayout::QTextLayout', unmatched parameter type 'QTextEngine*'"/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value of argument in function 'doAction', class 'QAccessibleInterface'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFileDialog::QFileDialog', unmatched parameter type 'QFileDialogArgs const&amp;'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value '0., 0., 1000000000., 1000000000.' of argument in function 'update', class 'QAbstractTextDocumentLayout'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWidget::windowSurface', unmatched return type 'QWindowSurface*'"/>
@@ -4960,40 +5202,12 @@
   <suppress-warning text="WARNING(MetaInfoGenerator) :: class 'QInputEvent' inherits from polymorphic class 'QEvent', but has no polymorphic id set"/>
   <suppress-warning text="WARNING(JavaGenerator) :: either add or remove specified for reference count variable '__rcMenus' in 'com.trolltech.qt.gui.QMenu' but not both"/>
   <suppress-warning text="WARNING(JavaGenerator) :: either add or remove specified for reference count variable '__rcMenus' in 'com.trolltech.qt.gui.QMenuBar' but not both"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QBrush' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextFrame_iterator' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QRegion' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPolygon' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextTableCell' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextLength' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPalette' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextBlock_iterator' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextBlock' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextCursor' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFont' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QMatrix' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPen' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QColor' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTransform' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPainterPath_Element' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPainterPath' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QItemSelection' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QKeySequence' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QLine' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPolygonF' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSizePolicy' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextFragment' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFontMetrics' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QGradient' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFontMetricsF' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextFormat' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QLineF' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QImage' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkCookie' has equals operators but no qHash() function" />
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkRequest' has equals operators but no qHash() function" />
+
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QPixmap::pixmapData', unmatched return type 'QPixmapData*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: object type 'QAccessible' extended by interface type 'QAbstractAccessibleFactory'. The resulting API will be less expressive than the original." />
 
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextOption_Tab' has equals operators but no qHash() function"/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Rejected enum has no alternative...: QPalette::NColorRoles" />
+
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'QtSharedPointer' does not have a type entry" />
 
 </typesystem>
diff --git a/generator/typesystem_gui.xml b/generator/typesystem_gui.xml
index 48fd016..a7083dd 100644
--- a/generator/typesystem_gui.xml
+++ b/generator/typesystem_gui.xml
@@ -1,13 +1,18 @@
 <?xml version="1.0"?>
 <typesystem package="com.trolltech.qt.gui"><rejection class="QAbstractTextDocumentLayout"/><rejection class="QColormap"/><rejection class="QFontDatabase"/><rejection class="QIconEngineV2"/><rejection class="QInputMethodEvent"/><rejection class="QPainterPath::Element"/><rejection class="QTextBlock::iterator"/><rejection class="QTextEdit::ExtraSelection"/><rejection class="QTextFrame::iterator"/><rejection class="QTextLayout::FormatRange"/><rejection class="QTreeWidgetItemIterator"/><rejection class="QAccessibleFactoryInterface"/><rejection class="QIconEngineFactoryInterfaceV2"/><rejection class="QImageIOHandlerFactoryInterface"/><rejection class="QInputContextFactoryInterface"/><rejection class="QStyleFactoryInterface"/><rejection class="QPictureFormatInterface"/><rejection class="QAbstractProxyModel"/><rejection class="QSortFilterProxyModel"/><rejection class="QDirModel"/><rejection class="QFileSystemModel"/><rejection class="QPrinterInfo"/><rejection class="QProxyModel"/><rejection class="QPrinterInfo"/><rejection class="QTextOption"/><suppress-warning text="WARNING(MetaJavaBuilder) :: Rejected enum has no alternative...: QPalette::NColorRoles"/><suppress-warning text="WARNING(MetaJavaBuilder) :: Cannot find enum constant for value 'DragMove' in 'QDragMoveEvent' or any of its super classes"/>
+
   <rejection class="*" function-name="d_func"/>
 
   <rejection class="*" field-name="d_ptr"/>
   <rejection class="*" field-name="d"/>
 
+  <rejection class="QGenericMatrix"/>  
+  <rejection class="QPixmapFilterPrivate"/>
+  <rejection class="QPenPrivate"/>
+  <rejection class="QGtkStyle"/>
   <rejection class="QWindowsCEStyle"/>
   <rejection class="QWindowsMobileStyle"/>
-  <rejection class="QAbstractUndoItem"/>    
+  <rejection class="QAbstractUndoItem"/>
   <rejection class="QAccessibleApplication"/>
   <rejection class="QBrushData"/>
   <rejection class="QImageTextKeyLang"/>
@@ -37,8 +42,8 @@
   <rejection class="QAccessibleEditableTextInterface"/>
   <rejection class="QAccessibleSimpleEditableTextInterface"/>
   <rejection class="QAccessibleTextInterface"/>
-  <rejection class="QAccessibleValueInterface"/>        
-  <rejection class="QIconEngineFactoryInterface"/>    
+  <rejection class="QAccessibleValueInterface"/>
+  <rejection class="QIconEngineFactoryInterface"/>
   <rejection class="QIconEnginePlugin"/>
   <rejection class="QWidgetItemV2"/>
   <rejection class="QAbstractItemDelegate" function-name="operator="/>
@@ -46,7 +51,7 @@
   <rejection class="QAccessible" function-name="installRootObjectHandler"/>
   <rejection class="QAccessible" function-name="installUpdateHandler"/>
   <rejection class="QAccessible" function-name="removeFactory"/>
-  <rejection class="QApplication" function-name="compressEvent"/>  
+  <rejection class="QApplication" function-name="compressEvent"/>
   <rejection class="QBrush" function-name="cleanUp"/>
   <rejection class="QPictureIO" function-name="defineIOHandler"/>
   <rejection class="QPolygon" function-name="putPoints"/>
@@ -61,27 +66,43 @@
   <rejection class="QWidget" function-name="handle"/>
   <rejection class="QWidget" function-name="styleChange"/>
   <rejection class="QWidget" function-name="internalWinId"/>
-  <rejection class="QActionGroup" function-name="selected"/> 
-  <rejection class="QPaintEngine" function-name="fix_neg_rect"/>           
+  <rejection class="QActionGroup" function-name="selected"/>
+  <rejection class="QPaintEngine" function-name="fix_neg_rect"/>
   <rejection class="QTreeModel" function-name="node"/>
   <rejection class="QTreeModel" function-name="initializeNode"/>
   <rejection class="QTreeModel" function-name="queryChildren"/>
+  <rejection class="QTextObjectInterface"/>
   <rejection class="QAccessible" function-name="cast_helper"/>
   <rejection class="QAccessible2"/>
   <rejection class="QAccessibleInterface" function-name="backgroundColor"/>
   <rejection class="QAccessibleInterface" function-name="foregroundColor"/>
   <rejection class="QAccessibleInterface" function-name="textInterface"/>
-  <rejection class="QAccessibleInterface" function-name="valueInterface"/>    
+  <rejection class="QAccessibleInterface" function-name="valueInterface"/>
   <rejection class="QAccessibleInterface" function-name="tableInterface"/>
   <rejection class="QAccessibleInterface" function-name="editableTextInterface"/>
   <rejection class="QAccessibleInterface" function-name="cast_helper"/>
   <rejection class="QAccessibleInterfaceEx" function-name="interface_cast"/>
   <rejection class="QAccessibleBridgePlugin"/>
-  <rejection class="QAccessibleBridgeFactoryInterface"/>  
-  <rejection class="QTabletEvent" field-name="mExtra"/>  
+  <rejection class="QAccessibleBridgeFactoryInterface"/>
+  <rejection class="QTabletEvent" field-name="mExtra"/>
   <rejection class="QWidgetItem" field-name="wid"/>
   <rejection class="QFont" enum-name="ResolveProperties"/>
+  <rejection class="QGradient" enum-name="InterpolationMode"/>
+  <rejection class="QIconEngineV2::AvailableSizesArgument"/>
+  <rejection class="QIconEngineV2" enum-name="IconEngineHook"/>
+  <rejection class="QGradient" enum-name="InterpolationMode"/>
+  <rejection class="QGradient" function-name="setInterpolationMode"/>
+  <rejection class="QGradient" function-name="interpolationMode"/>
+  <rejection class="QAbstractTextDocumentLayout" function-name="handlerForObject"/>
+  
 
+  <enum-type name="QStyleOptionTabBarBaseV2::StyleOptionVersion"/>
+  <enum-type name="QTabBar::SelectionBehavior"/>
+  <enum-type name="QTabBar::ButtonPosition"/>
+  <enum-type name="QInputDialog::InputMode"/>
+  <enum-type name="QInputDialog::InputDialogOption" flags="QInputDialog::InputDialogOptions"/>
+  <enum-type name="QFontDialog::FontDialogOption" flags="QFontDialog::FontDialogOptions"/>
+  <enum-type name="QColorDialog::ColorDialogOption" flags="QColorDialog::ColorDialogOptions"/>
   <enum-type name="QAbstractItemDelegate::EndEditHint"/>
   <enum-type name="QAbstractItemView::CursorAction"/>
   <enum-type name="QAbstractItemView::DragDropMode"/>
@@ -106,7 +127,7 @@
   <enum-type name="QAccessible::StateFlag" flags="QAccessible::State"/>
   <enum-type name="QAccessible::Text"/>
   <enum-type name="QDesktopServices::StandardLocation"/>
-  <enum-type name="QDirModel::Roles"/>  
+  <enum-type name="QDirModel::Roles"/>
   <enum-type name="QFont::Capitalization"/>
   <enum-type name="QFont::SpacingType"/>
   <enum-type name="QGraphicsItem::CacheMode"/>
@@ -116,18 +137,20 @@
   <enum-type name="QFileSystemModel::Roles"/>
   <enum-type name="QFormLayout::FieldGrowthPolicy"/>
   <enum-type name="QFormLayout::FormStyle"/>
-  <enum-type name="QFormLayout::ItemRole"/>    
+  <enum-type name="QFormLayout::ItemRole"/>
   <enum-type name="QFormLayout::RowWrapPolicy"/>
   <enum-type name="QGraphicsProxyWidget::enum_1"/>
   <enum-type name="QGraphicsWidget::enum_1"/>
   <enum-type name="QPlainTextEdit::LineWrapMode"/>
   <enum-type name="QPrintPreviewWidget::ViewMode"/>
   <enum-type name="QPrintPreviewWidget::ZoomMode"/>
+  <enum-type name="QStyleOptionTabV3::StyleOptionVersion"/>
+  <enum-type name="QStyleOptionFrameV3::StyleOptionVersion"/>
   <enum-type name="QStyleOptionViewItemV4::StyleOptionVersion"/>
   <enum-type name="QStyleOptionViewItemV4::ViewItemPosition"/>
 
   <enum-type name="QMdiSubWindow::SubWindowOption" flags="QMdiSubWindow::SubWindowOptions"/>
- 
+
   <enum-type name="QAction::ActionEvent"/>
   <enum-type name="QAction::MenuRole"/>
   <enum-type name="QApplication::ColorSpec"/>
@@ -136,7 +159,6 @@
   <enum-type name="QCalendarWidget::SelectionMode"/>
   <enum-type name="QCalendarWidget::VerticalHeaderFormat"/>
   <enum-type name="QColor::Spec"/>
-  <enum-type name="QColorDialog::ColorDialogOption" flags="QColorDialog::ColorDialogOptions"/>
   <enum-type name="QColormap::Mode"/>
   <enum-type name="QComboBox::InsertPolicy"/>
   <enum-type name="QComboBox::SizeAdjustPolicy"/>
@@ -159,7 +181,6 @@
   <enum-type name="QFont::StyleStrategy"/>
   <enum-type name="QFont::Weight"/>
   <enum-type name="QFontComboBox::FontFilter" flags="QFontComboBox::FontFilters"/>
-  <enum-type name="QFontDialog::FontDialogOption" flags="QFontDialog::FontDialogOptions"/>
   <enum-type name="QFrame::Shadow" extensible="yes"/>
   <enum-type name="QFrame::Shape"/>
   <enum-type name="QFrame::StyleMask"/>
@@ -186,7 +207,7 @@
   <enum-type name="QGraphicsView::DragMode"/>
   <enum-type name="QGraphicsView::OptimizationFlag" flags="QGraphicsView::OptimizationFlags"/>
   <enum-type name="QGraphicsView::ViewportAnchor"/>
-  <enum-type name="QGraphicsView::ViewportUpdateMode"/>  
+  <enum-type name="QGraphicsView::ViewportUpdateMode"/>
   <enum-type name="QIcon::Mode"/>
   <enum-type name="QIcon::State"/>
   <enum-type name="QImage::Format"/>
@@ -195,8 +216,6 @@
   <enum-type name="QImageReader::ImageReaderError"/>
   <enum-type name="QImageWriter::ImageWriterError"/>
   <enum-type name="QInputContext::StandardFormat"/>
-  <enum-type name="QInputDialog::InputDialogOption" flags="QInputDialog::InputDialogOptions"/>
-  <enum-type name="QInputDialog::InputMode"/>
   <enum-type name="QInputMethodEvent::AttributeType"/>
   <enum-type name="QItemSelectionModel::SelectionFlag" flags="QItemSelectionModel::SelectionFlags"/>
   <enum-type name="QKeySequence::SequenceFormat"/>
@@ -241,8 +260,7 @@
   <enum-type name="QPrinter::Unit"/>
   <enum-type name="QPrinter::DuplexMode"/>
   <enum-type name="QProgressBar::Direction"/>
-  <enum-type name="QReadWriteLock::RecursionMode"/>  
-  <enum-type name="QRegion::RegionType"/>  
+  <enum-type name="QRegion::RegionType"/>
   <enum-type name="QRubberBand::Shape"/>
   <enum-type name="QSessionManager::RestartHint"/>
   <enum-type name="QSizePolicy::Policy"/>
@@ -348,8 +366,6 @@
   <enum-type name="QStyleOptionViewItemV2::ViewItemFeature" flags="QStyleOptionViewItemV2::ViewItemFeatures"/>
   <enum-type name="QSystemTrayIcon::ActivationReason"/>
   <enum-type name="QSystemTrayIcon::MessageIcon"/>
-  <enum-type name="QTabBar::ButtonPosition"/>
-  <enum-type name="QTabBar::SelectionBehavior"/>
   <enum-type name="QTabBar::Shape"/>
   <enum-type name="QTabWidget::TabPosition"/>
   <enum-type name="QTabWidget::TabShape"/>
@@ -391,7 +407,7 @@
   <enum-type name="QStyleOptionToolBoxV2::StyleOptionVersion"/>
   <enum-type name="QStyleOptionToolBoxV2::TabPosition"/>
   <enum-type name="QStyleOptionViewItemV3::StyleOptionVersion"/>
-  <enum-type name="QTransform::TransformationType"/>  
+  <enum-type name="QTransform::TransformationType"/>
   <enum-type name="QTreeWidgetItem::ChildIndicatorPolicy"/>
   <enum-type name="QWizard::WizardOption" flags="QWizard::WizardOptions"/>
   <enum-type name="QWizard::WizardPixmap"/>
@@ -422,12 +438,12 @@
   <enum-type name="QDialogButtonBox::StandardButton" flags="QDialogButtonBox::StandardButtons">
     <reject-enum-value name="FirstButton"/>
     <reject-enum-value name="LastButton"/>
-    <reject-enum-value name="YesAll"/>             
+    <reject-enum-value name="YesAll"/>
     <reject-enum-value name="NoAll"/>
-    <reject-enum-value name="Default"/>        
+    <reject-enum-value name="Default"/>
     <reject-enum-value name="Escape"/>
     <reject-enum-value name="FlagMask"/>
-    <reject-enum-value name="ButtonMask"/>    
+    <reject-enum-value name="ButtonMask"/>
   </enum-type>
 
   <enum-type name="QDockWidget::DockWidgetFeature" flags="QDockWidget::DockWidgetFeatures"/>
@@ -487,16 +503,34 @@
     <reject-enum-value name="FirstFontProperty"/>
     <reject-enum-value name="LastFontProperty"/>
   </enum-type>
+
+ <enum-type name="QAction::Priority"/>
+ <enum-type name="QAction::SoftKeyRole"/>
+  <enum-type name="QGraphicsEffect::ChangeFlag" flags="QGraphicsEffect::ChangeFlags"/>
+  <enum-type name="QGraphicsItem::PanelModality"/>
+  <enum-type name="QPinchGesture::WhatChange" flags="QPinchGesture::WhatChanged"/>
+  <enum-type name="QStyle::RequestSoftwareInputPanel"/>
+  <enum-type name="QSwipeGesture::SwipeDirection"/>
+  <enum-type name="QTouchEvent::DeviceType"/>
   
+
+  <value-type name="QPixmapCache::Key"/>
+  <value-type name="QTileRules"/>
+  <value-type name="QVector2D"/>
+  <value-type name="QVector3D"/>
+  <value-type name="QVector4D"/>
+  <value-type name="QTouchEvent::TouchPoint"/>
+
+
   <value-type name="QTransform">
     <modify-function signature="operator=(QTransform)" remove="all"/>
     <modify-function signature="map(int,int,int*,int*)const" remove="all"/>
-    <modify-function signature="map(qreal,qreal,qreal*,qreal*)const" remove="all"/>
-    
-    <modify-function signature="operator*=(qreal)" access="private"/>    
-    <modify-function signature="operator+=(qreal)" access="private"/>
-    <modify-function signature="operator-=(qreal)" access="private"/>
-    <modify-function signature="operator/=(qreal)" access="private"/>
+    <modify-function signature="map(double,double,double*,double*)const" remove="all"/>
+
+    <modify-function signature="operator*=(double)" access="private"/>
+    <modify-function signature="operator+=(double)" access="private"/>
+    <modify-function signature="operator-=(double)" access="private"/>
+    <modify-function signature="operator/=(double)" access="private"/>
     <modify-function signature="operator*(QTransform)const" rename="multiplied"/>
     <modify-function signature="operator*=(QTransform)" access="private"/>
   
@@ -505,8 +539,8 @@
             <remove-argument/>
         </modify-argument>
       </modify-function>
-  </value-type>  
-  
+  </value-type>
+
   <value-type name="QStyleOption" delete-in-main-thread="yes" polymorphic-base="yes" polymorphic-id-expression="%1-&gt;type == QStyleOption::SO_Default">
       <modify-function signature="operator=(QStyleOption)" remove="all"/>
       <modify-function signature="init(const QWidget*)" remove="all"/> <!--### Obsolete in 4.3-->
@@ -517,62 +551,71 @@
   <value-type name="QStyleOptionComboBox" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionComboBox::Type &amp;&amp; %1-&gt;version == QStyleOptionComboBox::Version"/>
   <value-type name="QStyleOptionComplex" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionComplex::Type &amp;&amp; %1-&gt;version == QStyleOptionComplex::Version"/>
   <value-type name="QStyleOptionDockWidget" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionDockWidget::Type &amp;&amp; %1-&gt;version == QStyleOptionDockWidget::Version"/>
-  <value-type name="QStyleOptionDockWidgetV2" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionDockWidgetV2::Type &amp;&amp; %1-&gt;version == QStyleOptionDockWidgetV2::Version"> 
+  <value-type name="QStyleOptionDockWidgetV2" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionDockWidgetV2::Type &amp;&amp; %1-&gt;version == QStyleOptionDockWidgetV2::Version">
       <modify-function signature="operator=(QStyleOptionDockWidget)" remove="all"/>
   </value-type>
   <value-type name="QStyleOptionFocusRect" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionFocusRect::Type &amp;&amp; %1-&gt;version == QStyleOptionFocusRect::Version"/>
   <value-type name="QStyleOptionFrame" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionFrame::Type &amp;&amp; %1-&gt;version == QStyleOptionFrame::Version"/>
-              
+
   <value-type name="QStyleOptionFrameV2" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionFrameV2::Type &amp;&amp; %1-&gt;version == QStyleOptionFrameV2::Version">
     <modify-function signature="operator=(QStyleOptionFrame)" remove="all"/>
-  </value-type>              
-              
+  </value-type>
+  <value-type name="QStyleOptionFrameV3" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionFrameV3::Type &amp;&amp; %1-&gt;version == QStyleOptionFrameV3::Version">
+    <modify-function signature="operator=(QStyleOptionFrame)" remove="all"/>
+  </value-type>
+
   <value-type name="QStyleOptionGroupBox" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionGroupBox::Type &amp;&amp; %1-&gt;version == QStyleOptionGroupBox::Version"/>
   <value-type name="QStyleOptionHeader" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionHeader::Type &amp;&amp; %1-&gt;version == QStyleOptionHeader::Version"/>
   <value-type name="QStyleOptionMenuItem" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionMenuItem::Type &amp;&amp; %1-&gt;version == QStyleOptionMenuItem::Version"/>
   <value-type name="QStyleOptionProgressBar" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionProgressBar::Type &amp;&amp; %1-&gt;version == QStyleOptionProgressBar::Version"/>
-              
+
   <value-type name="QStyleOptionProgressBarV2" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionProgressBarV2::Type &amp;&amp; %1-&gt;version == QStyleOptionProgressBarV2::Version">
     <modify-function signature="operator=(QStyleOptionProgressBar)" remove="all"/>
-  </value-type>              
-  
+  </value-type>
+
   <value-type name="QStyleOptionRubberBand" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionRubberBand::Type &amp;&amp; %1-&gt;version == QStyleOptionRubberBand::Version"/>
   <value-type name="QStyleOptionSlider" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionSlider::Type &amp;&amp; %1-&gt;version == QStyleOptionSlider::Version"/>
   <value-type name="QStyleOptionSpinBox" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionSpinBox::Type &amp;&amp; %1-&gt;version == QStyleOptionSpinBox::Version"/>
   <value-type name="QStyleOptionTab" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTab::Type &amp;&amp; %1-&gt;version == QStyleOptionTab::Version"/>
   <value-type name="QStyleOptionTabV2" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabV2::Type &amp;&amp; %1-&gt;version == QStyleOptionTabV2::Version">
     <modify-function signature="operator=(const QStyleOptionTab &amp;)" remove="all"/>
-  </value-type>             
-  <value-type name="QStyleOptionTabBarBase" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabBarBase::Type &amp;&amp; %1-&gt;version == QStyleOptionTabBarBase::Version"/> 
+  </value-type>
+  <value-type name="QStyleOptionTabV3" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabV3::Type &amp;&amp; %1-&gt;version == QStyleOptionTabV3::Version">
+    <modify-function signature="operator=(QStyleOptionTab)" remove="all"/>
+  </value-type>
+  <value-type name="QStyleOptionTabBarBase" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabBarBase::Type &amp;&amp; %1-&gt;version == QStyleOptionTabBarBase::Version"/>
+  <value-type name="QStyleOptionTabBarBaseV2" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabBarBaseV2::Type &amp;&amp; %1-&gt;version == QStyleOptionTabBarBaseV2::Version">
+    <modify-function signature="operator=(QStyleOptionTabBarBase)" remove="all"/>
+  </value-type>
   <value-type name="QStyleOptionTabWidgetFrame" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabWidgetFrame::Type &amp;&amp; %1-&gt;version == QStyleOptionTabWidgetFrame::Version"/>
   <value-type name="QStyleOptionTitleBar" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTitleBar::Type &amp;&amp; %1-&gt;version == QStyleOptionTitleBar::Version"/>
   <value-type name="QStyleOptionToolBar" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionToolBar::Type &amp;&amp; %1-&gt;version == QStyleOptionToolBar::Version"/>
   <value-type name="QStyleOptionToolBox" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionToolBox::Type &amp;&amp; %1-&gt;version == QStyleOptionToolBox::Version"/>
   <value-type name="QStyleOptionToolBoxV2" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionToolBoxV2::Type &amp;&amp; %1-&gt;version == QStyleOptionToolBoxV2::Version">
     <modify-function signature="operator=(QStyleOptionToolBox)" remove="all"/>
-  </value-type>              
+  </value-type>
   <value-type name="QStyleOptionToolButton" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionToolButton::Type &amp;&amp; %1-&gt;version == QStyleOptionToolButton::Version"/>
-  <value-type name="QStyleOptionViewItem" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionViewItem::Type &amp;&amp; %1-&gt;version == QStyleOptionViewItem::Version"/>  
-  <value-type name="QStyleOptionViewItemV2" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionViewItemV2::Type &amp;&amp; %1-&gt;version == QStyleOptionViewItemV2::Version">                
+  <value-type name="QStyleOptionViewItem" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionViewItem::Type &amp;&amp; %1-&gt;version == QStyleOptionViewItem::Version"/>
+  <value-type name="QStyleOptionViewItemV2" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionViewItemV2::Type &amp;&amp; %1-&gt;version == QStyleOptionViewItemV2::Version">
     <modify-function signature="operator=(QStyleOptionViewItem)" remove="all"/>
-  </value-type>              
+  </value-type>
   <value-type name="QStyleOptionViewItemV3" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionViewItemV3::Type &amp;&amp; %1-&gt;version == QStyleOptionViewItemV3::Version">
     <modify-function signature="operator=(QStyleOptionViewItem)" remove="all"/>
-  </value-type>              
+  </value-type>
   <value-type name="QStyleOptionViewItemV4" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionViewItemV4::Type &amp;&amp; %1-&gt;version == QStyleOptionViewItemV4::Version">
     <modify-function signature="operator=(QStyleOptionViewItem)" remove="all"/>
   </value-type>
-  <value-type name="QTextFragment" delete-in-main-thread="yes">  
+  <value-type name="QTextFragment" delete-in-main-thread="yes">
     <modify-function signature="operator=(QTextFragment)" remove="all"/>
   </value-type>
-  <value-type name="QBitmap" delete-in-main-thread="yes">  
+  <value-type name="QBitmap" delete-in-main-thread="yes">
     <modify-function signature="operator=(const QPixmap &amp;)" remove="all"/>
     <modify-function signature="QBitmap(QString,const char*)" access="private">
         <modify-argument index="2"> <remove-default-expression/> </modify-argument>
     </modify-function>
 
-    <modify-function signature="fromData(QSize,const uchar*,QImage::Format)">
-        <access modifier="private"/>        
+    <modify-function signature="fromData(QSize,const unsigned char*,QImage::Format)">
+        <access modifier="private"/>
         <modify-argument index="3">
             <remove-default-expression/>
         </modify-argument>
@@ -615,12 +658,12 @@
   <value-type name="QLine"/>
   <value-type name="QLineF"/>
 
-  <value-type name="QPainterPath">  
+  <value-type name="QPainterPath">
     <modify-function signature="operator=(QPainterPath)" remove="all"/>
   </value-type>
   <value-type name="QPalette">
     <modify-function signature="operator=(const QPalette&amp;)" remove="all"/>
-  
+
       <modify-function signature="QPalette(QColor, QColor, QColor, QColor, QColor, QColor, QColor)" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="background()const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="foreground()const" remove="all"/> <!--### Obsolete in 4.3-->
@@ -637,7 +680,7 @@
     <modify-function signature="pictureFormat(QString)">
         <remove/>
     </modify-function>
-    
+
     <modify-function signature="inputFormatList()" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="inputFormats()" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="outputFormatList()" remove="all"/> <!--### Obsolete in 4.3-->
@@ -715,14 +758,14 @@
   <value-type name="QTextTableCellFormat" delete-in-main-thread="yes"/>
   <value-type name="QTextCharFormat" delete-in-main-thread="yes">
     <modify-function signature="isValid()const" access="non-final"/>
-  
+
       <modify-function signature="anchorName()const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="setAnchorName(QString)" remove="all"/> <!--### Obsolete in 4.3-->
   </value-type>
   <value-type name="QTextFormat" delete-in-main-thread="yes">
     <modify-function signature="operator=(QTextFormat)" remove="all"/>
     <modify-function signature="isValid()const" access="non-final"/>
-    
+
   
     <modify-function signature="setProperty(int,QVector&lt;QTextLength&gt;)" rename="setLengthVectorProperty"/>
     <inject-code class="native" position="constructor">
@@ -734,7 +777,7 @@
     }
     </inject-code>
   </value-type>
-  
+
   <value-type name="QTextListFormat" delete-in-main-thread="yes"/>
   <value-type name="QPolygon">
     <modify-function signature="QPolygon(int, const int *)" remove="all"/>
@@ -751,7 +794,7 @@
     <modify-function signature="operator&lt;&lt;(QVector&lt;QPointF&gt;)" remove="all"/>
   </value-type>
 
-  <value-type name="QIcon" delete-in-main-thread="yes">    
+  <value-type name="QIcon" delete-in-main-thread="yes">
     <modify-function signature="operator=(QIcon)" remove="all"/>
     <modify-function signature="serialNumber()const" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="QIcon(QIconEngineV2 *)">
@@ -763,8 +806,8 @@
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>    
-  </value-type>  
+    </modify-function>
+  </value-type>
 
   <value-type name="QTextFrame::iterator" delete-in-main-thread="yes">
     <include file-name="QTextFrame" location="global"/>
@@ -775,7 +818,7 @@
     <modify-function signature="operator--()" access="private"/>
   </value-type>
 
-  <value-type name="QTreeWidgetItemIterator" delete-in-main-thread="yes">  
+  <value-type name="QTreeWidgetItemIterator" delete-in-main-thread="yes">
     <custom-constructor>
     return new QTreeWidgetItemIterator(*copy);
     </custom-constructor>
@@ -791,10 +834,10 @@
     <modify-function signature="operator--()" access="private"/>
     <modify-function signature="operator*()const" access="private"/>
    </value-type>
-   
+
   <value-type name="QTextBlock::iterator" delete-in-main-thread="yes">
     <include file-name="QTextBlock" location="global"/>
-    
+
     <modify-function signature="operator++()" access="private"/>
     <modify-function signature="operator--()" access="private"/>
     <modify-function signature="operator++(int)" remove="all"/>
@@ -810,7 +853,7 @@
     <modify-function signature="operator=(QPixmap)" remove="all"/>
     <modify-function signature="operator!()const" remove="all"/>
     <modify-function signature="QPixmap(const char **)" access="private"/>
-    <modify-function signature="serialNumber()const" remove="all"/> <!--### Obsolete in 4.3-->    
+    <modify-function signature="serialNumber()const" remove="all"/> <!--### Obsolete in 4.3-->
   
     <modify-function signature="loadFromData(const uchar *,uint,const char *,QFlags&lt;Qt::ImageConversionFlag&gt;)" remove="all"/>
 
@@ -864,11 +907,11 @@
     <extra-includes>
         <include file-name="QTextBlock" location="global"/>
         <include file-name="QTextDocumentFragment" location="global"/>
-    </extra-includes>  
+    </extra-includes>
     <modify-function signature="operator=(QTextCursor)" remove="all"/>
     <modify-function signature="selectedTableCells(int*,int*,int*,int*)const">
         <access modifier="private"/>
-    </modify-function>    
+    </modify-function>
   </value-type>
 
   <value-type name="QTextLayout::FormatRange">
@@ -884,8 +927,8 @@
     delete copy;
     </custom-destructor>
   </value-type>
-  
-  <value-type name="QItemSelection" delete-in-main-thread="yes"> 
+
+  <value-type name="QItemSelection" delete-in-main-thread="yes">
 
     <modify-function signature="operator+(const QList&lt;QItemSelectionRange&gt;&amp;)const" remove="all"/>
     <modify-function signature="operator+=(const QList&lt;QItemSelectionRange&gt;&amp;)" remove="all"/>
@@ -894,26 +937,30 @@
     <modify-function signature="operator&lt;&lt;(QItemSelectionRange)" remove="all"/>
   </value-type>
 
+  <value-type name="QMatrix4x4">
+    <modify-function signature="data()const" remove="all"/>
+    <modify-function signature="operator()(int, int)const" remove="all"/>
+  </value-type>
   <value-type name="QMatrix">
       <extra-includes>
         <include file-name="QPainterPath" location="global"/>
       </extra-includes>
 
       <modify-function signature="map(int,int,int*,int*)const" remove="all"/>
-      <modify-function signature="map(qreal,qreal,qreal*,qreal*)const" remove="all"/>
+      <modify-function signature="map(double,double,double*,double*)const" remove="all"/>
       <modify-function signature="operator=(QMatrix)" remove="all"/>
-    
+
       <modify-function signature="operator*(QMatrix)const" access="private"/>
       <modify-function signature="operator*=(QMatrix)" access="private"/>
-      <modify-function signature="rotate(qreal)" access="private" rename="rotate_private"/>
-      <modify-function signature="scale(qreal,qreal)" access="private" rename="scale_private"/>
-      <modify-function signature="shear(qreal,qreal)" access="private" rename="shear_private"/>
-      <modify-function signature="translate(qreal,qreal)" access="private" rename="translate_private"/>
+      <modify-function signature="rotate(double)" access="private" rename="rotate_private"/>
+      <modify-function signature="scale(double,double)" access="private" rename="scale_private"/>
+      <modify-function signature="shear(double,double)" access="private" rename="shear_private"/>
+      <modify-function signature="translate(double,double)" access="private" rename="translate_private"/>
 
       <modify-function signature="inverted(bool*)const">
         <access modifier="private"/>
         <modify-argument index="1">
-            <!-- <remove-default-expression/> -->
+            <remove-default-expression/>
         </modify-argument>
       </modify-function>
 
@@ -922,21 +969,21 @@
         <replace from="%FUNCTION_NAME" to="rotate"/>
         <replace from="%OUT_TYPE" to="QMatrix"/>
         <replace from="%IN_TYPE" to="double"/>
-      </insert-template>    
+      </insert-template>
 
       <insert-template name="core.private_function_return_self">
         <replace from="%RETURN_TYPE" to="QMatrix"/>
         <replace from="%FUNCTION_NAME" to="scale"/>
         <replace from="%ARGUMENTS" to="double sx, double sy"/>
         <replace from="%ARGUMENT_NAMES" to="sx, sy"/>
-      </insert-template>        
+      </insert-template>
 
       <insert-template name="core.private_function_return_self">
         <replace from="%RETURN_TYPE" to="QMatrix"/>
         <replace from="%FUNCTION_NAME" to="shear"/>
         <replace from="%ARGUMENTS" to="double sh, double sv"/>
         <replace from="%ARGUMENT_NAMES" to="sh, sv"/>
-      </insert-template>            
+      </insert-template>
 
       <insert-template name="core.private_function_return_self">
         <replace from="%RETURN_TYPE" to="QMatrix"/>
@@ -959,10 +1006,10 @@
     </custom-constructor>
     <custom-destructor>
     delete copy;
-    </custom-destructor>  
+    </custom-destructor>
   </value-type>
 
-  <value-type name="QFontInfo" delete-in-main-thread="yes">
+  <value-type name="QFontInfo" delete-in-main-thread="yes" expense-cost="1" expense-limit="1000">
     <custom-constructor>
     return new QFontInfo(*copy);
     </custom-constructor>
@@ -970,7 +1017,7 @@
     delete copy;
     </custom-destructor>
     <modify-function signature="operator=(QFontInfo)" remove="all"/>
-    
+
   
     <modify-function signature="QFontInfo(QFontInfo)">
       <modify-argument index="1">
@@ -990,7 +1037,7 @@
     delete copy;
     </custom-destructor>
   </value-type>
-    
+
   <value-type name="QPainterPath::Element">
     <modify-field name="x" write="false"/>
     <modify-field name="y" write="false"/>
@@ -1003,10 +1050,10 @@
     <include file-name="QTextEdit" location="global"/>
   </value-type>
 
-  <value-type name="QFont" delete-in-main-thread="yes">
+  <value-type name="QFont" delete-in-main-thread="yes" expense-cost="1" expense-limit="1000">
     <extra-includes>
         <include file-name="QStringList" location="global"/>
-    </extra-includes>    
+    </extra-includes>
     <modify-function signature="operator=(QFont)" remove="all"/>
   </value-type>
 
@@ -1016,7 +1063,7 @@
     </extra-includes>
     <modify-function signature="operator=(QTextTableCell)" remove="all"/>
   </value-type>
-  
+
   <value-type name="QImage" expense-limit="67108864" expense-cost="height()*bytesPerLine()">
     <modify-function signature="QImage(const char *, const char *)">
         <remove/>
@@ -1024,8 +1071,8 @@
     <modify-function signature="QImage(const char **)">
         <access modifier="private"/>
     </modify-function>
-    <modify-function signature="QImage(const uchar*,int,int,int,QImage::Format)">
-	    <remove/>
+    <modify-function signature="QImage(const unsigned char*,int,int,int,QImage::Format)">
+        <remove/>
     </modify-function>
     <modify-function signature="bits()const">
         <remove/>
@@ -1033,77 +1080,85 @@
     <modify-function signature="scanLine(int)const">
         <remove/>
     </modify-function>
-    <modify-function signature="QImage(const uchar *, int, int, QImage::Format)">
+    <modify-function signature="QImage(const unsigned char *, int, int, QImage::Format)">
         <remove/>
     </modify-function>
-  
+
     <extra-includes>
         <include file-name="QStringList" location="global"/>
         <include file-name="QMatrix" location="global"/>
     </extra-includes>
-    
-    <modify-function signature="QImage(uchar*,int,int,QImage::Format)">
+    <modify-function signature="save(const QString &amp;, const char *, int) const">
+        <access modifier="private"/>
+        <rename to="private_save"/>
+        <modify-argument index="2">
+            <remove-default-expression/>
+        </modify-argument>
+        <modify-argument index="3">
+            <remove-default-expression/>
+        </modify-argument>
+    </modify-function>
+
+    <modify-function signature="QImage(unsigned char*,int,int,QImage::Format)">
         <access modifier="private"/>
     </modify-function>
 
-    <!--     
     <modify-function signature="QImage(QString,const char*)">
         <access modifier="private"/>
         <modify-argument index="2">
             <remove-default-expression/>
         </modify-argument>
     </modify-function>
-    -->
-    
+
     <modify-function signature="load(QString,const char*)">
         <access modifier="private"/>
         <modify-argument index="2">
             <remove-default-expression/>
         </modify-argument>
     </modify-function>
-        
+
     <modify-function signature="load(QIODevice*,const char*)">
         <access modifier="private"/>
     </modify-function>
-       
-    <modify-function signature="loadFromData(const uchar*,int,const char*)">
+
+    <modify-function signature="loadFromData(const unsigned char*,int,const char*)">
         <access modifier="private"/>
         <modify-argument index="2">
             <remove-default-expression/>
         </modify-argument>
         <modify-argument index="3">
             <remove-default-expression/>
-        </modify-argument>        
+        </modify-argument>
     </modify-function>
-        
+
     <modify-function signature="loadFromData(QByteArray,const char*)">
         <access modifier="private"/>
         <modify-argument index="2">
             <remove-default-expression/>
         </modify-argument>
     </modify-function>
-        
+
     <modify-function signature="operator=(QImage)" remove="all"/>
-    
+
     <modify-function signature="setText(const char*,const char*,QString)">
         <remove/>
     </modify-function>
-    
+
     <modify-function signature="text(const char*,const char*)const">
         <remove/>
     </modify-function>
-    
+
     <modify-function signature="fromData(QByteArray,const char*)">
         <access modifier="private"/>
         <modify-argument index="2">
             <remove-default-expression/>
         </modify-argument>
     </modify-function>
-      
-    <modify-function signature="fromData(const uchar*,int,const char*)">
+
+    <modify-function signature="fromData(const unsigned char*,int,const char*)">
         <remove/>
-    </modify-function>        
-  
+    </modify-function>
+
       <modify-function signature="serialNumber()const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="textLanguages()const" remove="all"/> <!--### Obsolete in 4.3-->
   
@@ -1187,27 +1242,27 @@
     <modify-function signature="operator=(QColormap)" remove="all"/>
     <extra-includes>
         <include file-name="QColor" location="global"/>
-    </extra-includes>               
+    </extra-includes>
     <custom-constructor>
     return new QColormap(*copy);
     </custom-constructor>
     <custom-destructor>
     delete copy;
-    </custom-destructor>    
+    </custom-destructor>
   </value-type>
 
-  <value-type name="QCursor" delete-in-main-thread="yes">  
+  <value-type name="QCursor" delete-in-main-thread="yes">
      <extra-includes>
         <include file-name="QPixmap" location="global"/>
     </extra-includes>
     <modify-function signature="operator=(QCursor)" remove="all"/>
   </value-type>
-      
+
   <value-type name="QFontDatabase" delete-in-main-thread="yes">
       <extra-includes>
         <include file-name="QStringList" location="global"/>
     </extra-includes>
-  </value-type>  
+  </value-type>
 
   <value-type name="QPen">
       <extra-includes>
@@ -1215,15 +1270,15 @@
     </extra-includes>
 
     <modify-function signature="operator=(QPen)" remove="all"/>
-  </value-type>  
-  
+  </value-type>
+
   <value-type name="QBrush">
     <modify-function signature="QBrush(Qt::GlobalColor, Qt::BrushStyle)" remove="all"/>
     <modify-function signature="operator=(const QBrush &amp;)" remove="all"/>
 
     <extra-includes>
         <include file-name="QPixmap" location="global"/>
-    </extra-includes>  
+    </extra-includes>
   
     <modify-function signature="QBrush(QGradient)">
       <modify-argument index="1">
@@ -1243,36 +1298,36 @@
     <modify-function signature="QColor(const char*)">
         <remove/>
     </modify-function>
-        
+
     <modify-function signature="getCmyk(int*,int*,int*,int*,int*)">
         <remove/>
     </modify-function>
-    
-    <modify-function signature="getCmykF(qreal*,qreal*,qreal*,qreal*,qreal*)">
+
+    <modify-function signature="getCmykF(double*,double*,double*,double*,double*)">
         <remove/>
     </modify-function>
-    
+
     <modify-function signature="getHsv(int*,int*,int*,int*)const">
         <remove/>
     </modify-function>
-    
-    <modify-function signature="getHsvF(qreal*,qreal*,qreal*,qreal*)const">
+
+    <modify-function signature="getHsvF(double*,double*,double*,double*)const">
         <remove/>
     </modify-function>
-    
+
     <modify-function signature="getRgb(int*,int*,int*,int*)const">
         <remove/>
     </modify-function>
-    
-    <modify-function signature="getRgbF(qreal*,qreal*,qreal*,qreal*)const">
+
+    <modify-function signature="getRgbF(double*,double*,double*,double*)const">
         <remove/>
     </modify-function>
-      
+
       <modify-function signature="dark(int)const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="light(int)const" remove="all"/> <!--### Obsolete in 4.3-->
   </value-type>
- 
-  <value-type name="QFontMetricsF" delete-in-main-thread="yes">
+
+  <value-type name="QFontMetricsF" delete-in-main-thread="yes" expense-cost="1" expense-limit="1000">
     <custom-constructor>
         return new QFontMetricsF(*copy);
     </custom-constructor>
@@ -1284,8 +1339,8 @@
     </modify-function>
     <modify-function signature="operator==(const QFontMetricsF &amp;)">
         <remove/>
-    </modify-function>        
-        
+    </modify-function>
+
     <modify-function signature="boundingRect(QRectF,int,QString,int,int*)const">
         <access modifier="private"/>
         <modify-argument index="4">
@@ -1293,20 +1348,20 @@
         </modify-argument>
         <modify-argument index="5">
             <remove-default-expression/>
-        </modify-argument>                
+        </modify-argument>
     </modify-function>
-   
+
     <modify-function signature="operator=(QFontMetrics)" remove="all"/>
     <modify-function signature="operator=(QFontMetricsF)" remove="all"/>
-    
+
     <modify-function signature="size(int,QString,int,int*)const">
         <access modifier="private"/>
         <modify-argument index="3">
             <remove-default-expression/>
-        </modify-argument>        
+        </modify-argument>
         <modify-argument index="4">
             <remove-default-expression/>
-        </modify-argument>                
+        </modify-argument>
     </modify-function>
    
     <modify-function signature="QFontMetricsF(QFontMetricsF)" remove="all"/>
@@ -1316,7 +1371,7 @@
   </value-type>
    <value-type name="QTextOption::Tab"/>
 
-  <value-type name="QFontMetrics" delete-in-main-thread="yes">
+  <value-type name="QFontMetrics" delete-in-main-thread="yes" expense-cost="1" expense-limit="1000">
     <custom-constructor>
         return new QFontMetrics(*copy);
     </custom-constructor>
@@ -1328,7 +1383,7 @@
     </modify-function>
     <modify-function signature="operator==(const QFontMetrics &amp;)">
         <remove/>
-    </modify-function>    
+    </modify-function>
 
     <modify-function signature="boundingRect(int,int,int,int,int,QString,int,int*)const">
         <access modifier="private"/>
@@ -1337,9 +1392,9 @@
         </modify-argument>
         <modify-argument index="8">
             <remove-default-expression/>
-        </modify-argument>        
+        </modify-argument>
     </modify-function>
-            
+
     <modify-function signature="boundingRect(QRect,int,QString,int,int*)const">
         <access modifier="private"/>
         <modify-argument index="4">
@@ -1347,21 +1402,21 @@
         </modify-argument>
         <modify-argument index="5">
             <remove-default-expression/>
-        </modify-argument>                
+        </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="operator=(QFontMetrics)" remove="all"/>
-    
+
     <modify-function signature="size(int,QString,int,int*)const">
         <access modifier="private"/>
         <modify-argument index="3">
             <remove-default-expression/>
-        </modify-argument>        
+        </modify-argument>
         <modify-argument index="4">
             <remove-default-expression/>
-        </modify-argument>                
+        </modify-argument>
     </modify-function>
-       
+
   
     <modify-function signature="QFontMetrics(QFontMetrics)" remove="all"/>
     <modify-function signature="operator==(QFontMetrics)const" remove="all"/>
@@ -1379,7 +1434,7 @@
     </custom-destructor>
     <modify-function signature="operator==(const QGradient &amp;)">
         <remove/>
-    </modify-function>        
+    </modify-function>
   </value-type>
 
   <value-type name="QLinearGradient" polymorphic-id-expression="%1-&gt;type() == QGradient::LinearGradient">
@@ -1393,17 +1448,20 @@
     delete copy;
     </custom-destructor>
   </value-type>
-  
+
   <value-type name="QPrinterInfo">
     <modify-function signature="operator=(const QPrinterInfo &amp;)" remove="all"/>
   </value-type>
-     
+
+  <value-type name="QMargins"/>
+
   <interface-type name="QLayoutItem"/>
   <interface-type name="QPaintDevice"/>
 
   <interface-type name="QGraphicsItem" delete-in-main-thread="yes">
     <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/>
-    
+    <modify-function signature="toGraphicsObject() const" remove="all"/>
+
     <modify-function signature="paint(QPainter*,const QStyleOptionGraphicsItem*,QWidget*)">
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
@@ -1475,21 +1533,21 @@
     <modify-function signature="wheelEvent(QGraphicsSceneWheelEvent*)">
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
-   
-    <modify-function signature="children()const" remove="all"/>	
+
+    <modify-function signature="children()const" remove="all"/>
     <modify-function signature="installSceneEventFilter(QGraphicsItem *)">
         <modify-argument index="1">
-            <!-- Safe to ignore because items in a scene are memory managed by the scene --> 
-            <reference-count action="ignore"/> 
+            <!-- Safe to ignore because items in a scene are memory managed by the scene -->
+            <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
     <modify-function signature="removeSceneEventFilter(QGraphicsItem *)">
         <modify-argument index="1">
-            <!-- Safe to ignore because items in a scene are memory managed by the scene --> 
-            <reference-count action="ignore"/> 
+            <!-- Safe to ignore because items in a scene are memory managed by the scene -->
+            <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-   
+
     <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="sceneMatrix()const" remove="all"/> <!--### Obsolete in 4.3-->
@@ -1497,29 +1555,29 @@
   
     <modify-function signature="supportsExtension(QGraphicsItem::Extension)const" remove="all"/>
     <modify-function signature="setExtension(QGraphicsItem::Extension,QVariant)" remove="all"/>
-  </interface-type>  
-  
+  </interface-type>
+
   <object-type name="QAbstractGraphicsShapeItem" delete-in-main-thread="yes">
     <modify-function signature="QAbstractGraphicsShapeItem(QGraphicsItem*,QGraphicsScene*)">
         <inject-code position="end">
             <argument-map index="1" meta-name="%1"/>
             if (%1 != null) disableGarbageCollection();
         </inject-code>
-    </modify-function>    
-  
+    </modify-function>
+
     <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="sceneMatrix()const" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <!--### Obsolete in 4.3-->
   </object-type>
-    
+
   <object-type name="QAbstractItemView">
       <modify-function signature="update()" remove="all"/>
       <modify-function signature="horizontalStepsPerItem()const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="setHorizontalStepsPerItem(int)" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="setVerticalStepsPerItem(int)" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="verticalStepsPerItem()const" remove="all"/> <!--### Obsolete in 4.3-->
-      
+
       <modify-function signature="edit(QModelIndex,QAbstractItemView::EditTrigger,QEvent*)">
         <modify-argument index="3" invalidate-after-use="yes"/>
       </modify-function>
@@ -1534,18 +1592,18 @@
     QModelIndex moveCursor(QAbstractItemView::CursorAction, Qt::KeyboardModifiers)
     { return QModelIndex(); }
     </inject-code>
-  </object-type>  
+  </object-type>
 
   <object-type name="QAbstractPageSetupDialog"/>
   <object-type name="QAbstractPrintDialog"/>
   <object-type name="QAbstractSlider">
     <modify-function signature="sliderChange(QAbstractSlider::SliderChange)" remove="all"/>
-  </object-type>  
+  </object-type>
   <object-type name="QAbstractTextDocumentLayout">
     <modify-function signature="setPaintDevice(QPaintDevice*)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcPaintDevice"/>
-        </modify-argument>
+        </modify-argument>        
     </modify-function>
     
     <modify-function signature="draw(QPainter*,QAbstractTextDocumentLayout::PaintContext)">
@@ -1569,7 +1627,7 @@
             <define-ownership class="java" owner="java"/>
         </modify-argument>
     </modify-function>
-  </object-type>      
+  </object-type>
   <object-type name="QAccessibleBridge">
     <modify-function signature="setRootObject(QAccessibleInterface *)">
         <modify-argument index="1">
@@ -1579,25 +1637,25 @@
     <modify-function signature="notifyAccessibilityUpdate(int,QAccessibleInterface*,int)">
         <modify-argument invalidate-after-use="yes" index="2"/>
     </modify-function>
-  </object-type>  
+  </object-type>
   <object-type name="QAccessible2Interface"/>
   <object-type name="QAccessibleTableInterface">
     <modify-function signature="qAccessibleTableCastHelper()" remove="all"/>
   </object-type>
-  
+
   <object-type name="QAccessibleInterface">
     <modify-function signature="indexOfChild(const QAccessibleInterface*)const">
         <modify-argument invalidate-after-use="yes" index="1"/>
     </modify-function>
     <modify-function signature="relationTo(int,const QAccessibleInterface*,int)const">
         <modify-argument invalidate-after-use="yes" index="2"/>
-    </modify-function>  
+    </modify-function>
   </object-type>
   <object-type name="QAccessibleInterfaceEx"/>
   <object-type name="QAccessibleObject"/>
   <object-type name="QAccessibleObjectEx"/>
   <object-type name="QAccessibleWidget"/>
-  <object-type name="QAccessibleWidgetEx"/>  
+  <object-type name="QAccessibleWidgetEx"/>
   <object-type name="QActionGroup"/>
   <object-type name="QCDEStyle">
       <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/>
@@ -1607,14 +1665,14 @@
         <access modifier="private"/>
     </modify-function>
   </object-type>
-  <object-type name="QCleanlooksStyle">  
+  <object-type name="QCleanlooksStyle">
     <modify-function signature="standardPixmap(QStyle::StandardPixmap,const QStyleOption*,const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/>
-  </object-type>  
+  </object-type>
   <object-type name="QCommonStyle">
       <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*,const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/>
-  </object-type>  
+  </object-type>
   <object-type name="QDataWidgetMapper">
     <modify-function signature="addMapping(QWidget*,int)">
         <modify-argument index="1">
@@ -1655,9 +1713,11 @@
     <modify-function signature="exec()" access="non-final"/>
     <modify-function signature="extension()const" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="orientation()const" remove="all"/> <!--### Obsolete in 4.3-->
+    <modify-function signature="open()" virtual-slot="yes"/>
     <modify-function signature="setOrientation(Qt::Orientation)" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="showExtension(bool)" remove="all"/> <!--### Obsolete in 4.3-->
-  </object-type>  
+    <modify-function signature="setVisible(bool)" allow-as-slot="yes"/>
+  </object-type>
   <object-type name="QDialogButtonBox">
     <modify-function signature="addButton(QAbstractButton*,QDialogButtonBox::ButtonRole)">
         <modify-argument index="1">
@@ -1713,7 +1773,7 @@
             <remove-default-expression/>
         </modify-argument>
     </modify-function>
-   
+
   </object-type>
   <object-type name="QFocusFrame">
     <modify-function signature="initStyleOption(QStyleOption*)const">
@@ -1728,7 +1788,7 @@
         <insert-template name="gui.init_style_option">
             <replace from="%TYPE" to="QStyleOption"/>
         </insert-template>
-    </inject-code>  
+    </inject-code>
   </object-type>
   <object-type name="QFontComboBox"/>
   <object-type name="QFontDialog">
@@ -1777,6 +1837,7 @@
         </modify-argument>
     </modify-function>
   </object-type>
+
   <object-type name="QGraphicsEllipseItem" delete-in-main-thread="yes"/>
   <object-type name="QGraphicsItemAnimation">
     <modify-function signature="setItem(QGraphicsItem*)">
@@ -1788,13 +1849,13 @@
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcTimeLine"/>
         </modify-argument>
-    </modify-function>  
+    </modify-function>
   
     <extra-includes>
         <include file-name="QPair" location="global"/>
     </extra-includes>
   </object-type>
-  <object-type name="QGraphicsItemGroup" delete-in-main-thread="yes"> 
+  <object-type name="QGraphicsItemGroup" delete-in-main-thread="yes">
       <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="sceneMatrix()const" remove="all"/> <!--### Obsolete in 4.3-->
@@ -1807,7 +1868,7 @@
       <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <!--### Obsolete in 4.3-->
   </object-type>
   <object-type name="QGraphicsPathItem" delete-in-main-thread="yes"/>
-   
+
   <object-type name="QGraphicsPixmapItem" delete-in-main-thread="yes">
       <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3-->
@@ -1822,16 +1883,16 @@
     <modify-function signature="initStyleOption(QStyleOptionHeader*)const">
         <access modifier="private"/>
     </modify-function>
-    
+
     <modify-function signature="paintSection(QPainter*,QRect,int)const">
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
-    
+
     <inject-code>
         <insert-template name="gui.init_style_option">
             <replace from="%TYPE" to="QStyleOptionHeader"/>
         </insert-template>
-    </inject-code>  
+    </inject-code>
     <modify-function signature="setModel(QAbstractItemModel*)">
         <modify-argument index="1">
             <reference-count declare-variable="QAbstractItemView" action="set" variable-name="__rcModel"/>
@@ -1841,7 +1902,7 @@
   <object-type name="QIconEngine">
     <modify-function signature="paint(QPainter*,QRect,QIcon::Mode,QIcon::State)">
         <modify-argument index="1" invalidate-after-use="yes"/>
-    </modify-function>  
+    </modify-function>
   </object-type>
   <object-type name="QIconEngineV2">
     <modify-function signature="read(QDataStream&amp;)">
@@ -1850,13 +1911,13 @@
     <modify-function signature="write(QDataStream&amp;)const">
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
-  
+
     <modify-function signature="virtual_hook(int,void*)" remove="all"/>
     <modify-function signature="clone()const">
         <modify-argument index="return">
             <define-ownership class="shell" owner="c++"/>
-        </modify-argument>    
-    </modify-function>    
+        </modify-argument>
+    </modify-function>
   </object-type>
   <object-type name="QImageWriter">
   <modify-function signature="setDevice(QIODevice*)">
@@ -1869,11 +1930,11 @@
   </object-type>
   <object-type name="QInputContextFactory"/>
   <object-type name="QIntValidator"/>
-  <object-type name="QItemDelegate">  
+  <object-type name="QItemDelegate">
     <modify-function signature="doLayout(QStyleOptionViewItem,QRect*,QRect*,QRect*,bool)const">
         <remove/>
     </modify-function>
-    
+
     <modify-function signature="drawCheck(QPainter*,QStyleOptionViewItem,QRect,Qt::CheckState)const">
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
@@ -1887,7 +1948,7 @@
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
 
-    
+
     <modify-function signature="selected(QPixmap,QPalette,bool)const">
         <remove/>
     </modify-function>
@@ -1906,7 +1967,7 @@
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-    
+
   </object-type>
   <object-type name="QItemEditorCreatorBase"/>
   <object-type name="QItemEditorFactory">
@@ -1940,7 +2001,7 @@
             <no-null-pointer/>
             <reference-count declare-variable="QAbstractItemView" action="set" variable-name="__rcItemSelectionModel"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
   </object-type>
   <object-type name="QMainWindow">
     <modify-function signature="addDockWidget(Qt::DockWidgetArea,QDockWidget*,Qt::Orientation)">
@@ -2019,25 +2080,25 @@
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-   
+
     <modify-function signature="removeSubWindow(QWidget*)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-   
+
     <modify-function signature="setActiveSubWindow(QMdiSubWindow*)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-   
+
     <modify-function signature="setupViewport(QWidget*)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-  
+
   </object-type>
   <object-type name="QMdiSubWindow">
     <modify-function signature="setSystemMenu(QMenu*)">
@@ -2084,26 +2145,26 @@
     <modify-function signature="initStyleOption(QStyleOptionMenuItem*,const QAction*)const">
         <access modifier="private"/>
     </modify-function>
-    
+
     <modify-function signature="addAction(QString,const QObject*,const char*,QKeySequence)">
-        <remove/>        
+        <remove/>
     </modify-function>
-        
+
     <modify-function signature="addAction(QIcon,QString,const QObject*,const char*,QKeySequence)">
         <remove/>
     </modify-function>
   </object-type>
-  
-  <object-type name="QMenuBar">  
+
+  <object-type name="QMenuBar">
     <modify-function signature="addAction(QAction *)" remove="all"/>
     <modify-function signature="addAction(QString,const QObject*,const char*)">
         <remove/>
     </modify-function>
-        
+
     <modify-function signature="initStyleOption(QStyleOptionMenuItem*,const QAction*)const">
         <access modifier="private"/>
     </modify-function>
-         
+
     <modify-function signature="addMenu(QMenu*)">
         <modify-argument index="1">
             <reference-count action="add" variable-name="__rcMenus"/>
@@ -2112,7 +2173,7 @@
     <modify-function signature="insertMenu(QAction*,QMenu*)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
-        </modify-argument>        
+        </modify-argument>
         <modify-argument index="2">
             <reference-count action="add" variable-name="__rcMenus"/>
         </modify-argument>
@@ -2136,9 +2197,9 @@
   <object-type name="QMotifStyle">
     <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*, const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/>
-  </object-type>  
+  </object-type>
   <object-type name="QPainterPathStroker"/>
- 
+
   <object-type name="QPictureIO">
       <modify-function signature="QPictureIO(QIODevice*,const char*)">
         <access modifier="private"/>
@@ -2146,35 +2207,35 @@
             <reference-count action="set" variable-name="__rcDevice"/>
         </modify-argument>
     </modify-function>
-   
+
     <modify-function signature="setIODevice(QIODevice*)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcDevice"/>
         </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="QPictureIO(QString,const char*)">
         <access modifier="private"/>
     </modify-function>
-                  
+
     <modify-function signature="format()const">
         <access modifier="private"/>
         <rename to="format_private"/>
     </modify-function>
-        
+
     <modify-function signature="parameters()const">
         <access modifier="private"/>
         <rename to="parameters_private"/>
     </modify-function>
-      
+
     <modify-function signature="setFormat(const char*)">
         <access modifier="private"/>
     </modify-function>
-       
+
     <modify-function signature="setParameters(const char*)">
         <access modifier="private"/>
     </modify-function>
-   
+
   
     <modify-function signature="QPictureIO(QIODevice*,const char*)">
       <modify-argument index="2">
@@ -2212,12 +2273,13 @@
       </modify-argument>
     </modify-function>
   </object-type>
-  
+
   <object-type name="QPixmapCache">
     <modify-function signature="find(QString)">
         <remove/>
     </modify-function>
-    
+    <modify-function signature="find(QString,QPixmap*)" remove="all"/>
+
     <modify-function signature="find(QString,QPixmap&amp;)">
         <access modifier="private"/>
     </modify-function>
@@ -2225,9 +2287,10 @@
   <object-type name="QPlastiqueStyle">
     <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*, const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/>
-    <modify-function signature="layoutSpacingImplementation(QSizePolicy::ControlType, QSizePolicy::ControlType, Qt::Orientation, const QStyleOption *, const QWidget *) const" virtual-slot="yes"/>    
+    <modify-function signature="layoutSpacingImplementation(QSizePolicy::ControlType, QSizePolicy::ControlType, Qt::Orientation, const QStyleOption *, const QWidget *) const" virtual-slot="yes"/>
+  </object-type>
+  <object-type name="QPrintDialog">
   </object-type>
-  <object-type name="QPrintDialog"/>
   <object-type name="QPrintEngine"/>
   <object-type name="QProgressBar">
     <modify-function signature="initStyleOption(QStyleOptionProgressBar*)const">
@@ -2238,21 +2301,20 @@
     <modify-function signature="initStyleOption(QStyleOptionButton*)const">
         <access modifier="private"/>
     </modify-function>
-    
+
     <modify-function signature="setMenu(QMenu*)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcMenu"/>
         </modify-argument>
     </modify-function>
   </object-type>
-  <object-type name="QReadWriteLock"/>
   <object-type name="QRegExpValidator"/>
   <object-type name="QScrollArea">
     <modify-function signature="setWidget(QWidget*)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
   </object-type>
   <object-type name="QSessionManager"/>
   <object-type name="QShortcut">
@@ -2266,11 +2328,11 @@
         </modify-argument>
         <modify-argument index="5">
             <remove-default-expression/>
-        </modify-argument>        
-    </modify-function>     
-  </object-type>
+        </modify-argument>
+    </modify-function>
+  </object-type>
   <object-type name="QSizeGrip"/>
-  <object-type name="QSound"/>  
+  <object-type name="QSound"/>
   <object-type name="QSpacerItem"/>
   <object-type name="QStandardItem">
     <modify-function signature="operator=(QStandardItem)" remove="all"/>
@@ -2290,7 +2352,7 @@
     <modify-function signature="operator=(QStandardItem)" remove="all"/>
     <modify-function signature="operator&lt;(QStandardItem)const" remove="all"/>
   </object-type>
-  <object-type name="QStatusBar">   
+  <object-type name="QStatusBar">
     <modify-function signature="addPermanentWidget(QWidget *, int)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
@@ -2334,7 +2396,7 @@
             <reference-count action="set" variable-name="__rcDocument"/>
         </modify-argument>
     </modify-function>
-    
+
   </object-type>
   <object-type name="QSystemTrayIcon">
     <modify-function signature="setContextMenu(QMenu*)">
@@ -2364,8 +2426,8 @@
             <no-null-pointer/>
             <reference-count declare-variable="QAbstractItemView" action="set" variable-name="__rcItemSelectionModel"/>
         </modify-argument>
-    </modify-function>  
-  
+    </modify-function>
+
       <modify-function signature="sortByColumn(int)" remove="all"/> <!--### Obsolete in 4.3-->
   </object-type>
   <object-type name="QTextBlockGroup" delete-in-main-thread="yes"/>
@@ -2373,15 +2435,22 @@
   <object-type name="QTextItem" delete-in-main-thread="yes"/>
   <object-type name="QTextList" delete-in-main-thread="yes">
     <modify-function signature="format()const" rename="textListFormat"/>
-  
+
       <modify-function signature="isEmpty()const" remove="all"/> <!--### Obsolete in 4.3-->
   </object-type>
   <object-type name="QTextObject" delete-in-main-thread="yes"/>
-  <object-type name="QTextObjectInterface" delete-in-main-thread="yes">
+
+  <!-- The original QTextObjectInterface has been rejected and replaced by this, since the original
+       usage is based on an interface pattern we can't mimic in Java (our users can't implement our
+       interfaces.) The new class inherits both QObject and QTextObjectInterface, and can be extended
+       in Java to get a type that can properly be used with registerHandler() in 
+       QAbstractTextDocumentLayout. -->
+  <object-type name="QtJambiTextObjectInterface" delete-in-main-thread="yes" java-name="QTextObjectInterface">
     <modify-function signature="drawObject(QPainter*,QRectF,QTextDocument*,int,QTextFormat)">
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
   </object-type>
+    
   <object-type name="QTimeEdit"/>
   <object-type name="QToolBox">
     <modify-function signature="addItem(QWidget*,QString)">
@@ -2414,7 +2483,7 @@
     <modify-function signature="initStyleOption(QStyleOptionToolButton*)const">
         <access modifier="private"/>
     </modify-function>
-    
+
     <modify-function signature="setDefaultAction(QAction *)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcDefaultAction"/>
@@ -2428,7 +2497,7 @@
   </object-type>
   <object-type name="QToolTip"/>
   <object-type name="QTreeView">
-  
+
     <modify-function signature="drawBranches(QPainter*,QRect,QModelIndex)const">
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
@@ -2451,8 +2520,8 @@
             <no-null-pointer/>
             <reference-count declare-variable="QAbstractItemView" action="set" variable-name="__rcItemSelectionModel"/>
         </modify-argument>
-    </modify-function>  
-  
+    </modify-function>
+
       <modify-function signature="sortByColumn(int)" remove="all"/> <!--### Obsolete in 4.3-->
   </object-type>
   <object-type name="QUndoCommand">
@@ -2479,7 +2548,7 @@
   </object-type>
 
   <object-type name="QUndoStack"/>
- 
+
   <object-type name="QUndoView">
     <modify-function signature="setGroup(QUndoGroup *)">
         <modify-argument index="1">
@@ -2512,11 +2581,11 @@
         </modify-argument>
     </modify-function>
   </object-type>
-  <object-type name="QWidgetItem"/> 
+  <object-type name="QWidgetItem"/>
   <object-type name="QWindowsStyle">
       <modify-function signature="standardPixmap(QStyle::StandardPixmap, const QStyleOption*, const QWidget*)const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/>
-  </object-type>  
+  </object-type>
   <object-type name="QWorkspace">
     <modify-function signature="addWindow(QWidget*,QFlags&lt;Qt::WindowType&gt;)">
         <modify-argument index="1">
@@ -2529,39 +2598,39 @@
         </modify-argument>
     </modify-function>
   </object-type>
-  
+
   <object-type name="QActionEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::ActionAdded || %1-&gt;type() == QEvent::ActionRemoved || %1-&gt;type() == QEvent::ActionChanged"/>
   <object-type name="QClipboardEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Clipboard"/>
-  <object-type name="QCloseEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Close"/>  
+  <object-type name="QCloseEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Close"/>
   <object-type name="QContextMenuEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::ContextMenu"/>
   <object-type name="QDragEnterEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::DragEnter"/>
   <object-type name="QDragLeaveEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::DragLeave"/>
   <object-type name="QDragMoveEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::DragMove">
     <modify-function signature="accept()" remove="all"/>
-    <modify-function signature="ignore()" remove="all"/>           
-  </object-type>           
+    <modify-function signature="ignore()" remove="all"/>
+  </object-type>
   <object-type name="QDropEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Drop">
     <modify-function signature="encodedData(const char*)const">
         <remove/>
     </modify-function>
-    
+
     <modify-function signature="format(int)const">
         <remove/>
     </modify-function>
-    
+
     <modify-function signature="provides(const char*)const">
         <remove/>
     </modify-function>
-    
-               
+
+
   </object-type>
   <object-type name="QFileOpenEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::FileOpen"/>
   <object-type name="QFocusEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::FocusIn || %1-&gt;type() == QEvent::FocusOut">
         <modify-function signature="reason()const">
             <remove/>
-        </modify-function>                   
+        </modify-function>
   </object-type>
-           
+
   <object-type name="QGraphicsSceneContextMenuEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::GraphicsSceneContextMenu"/>
   <object-type name="QGraphicsSceneDragDropEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::GraphicsSceneDragEnter || %1-&gt;type() == QEvent::GraphicsSceneDragLeave || %1-&gt;type() == QEvent::GraphicsSceneDragMove || %1-&gt;type() == QEvent::GraphicsSceneDrop">
     <modify-function signature="setMimeData(const QMimeData *)">
@@ -2593,13 +2662,13 @@
         <!-- All these have const overloads that are used instead -->
         <modify-function signature="isAmbiguous()">
             <remove/>
-        </modify-function>               
+        </modify-function>
         <modify-function signature="shortcutId()">
             <remove/>
-        </modify-function>                    
+        </modify-function>
         <modify-function signature="key()">
             <remove/>
-        </modify-function>                          
+        </modify-function>
   </object-type>
   <object-type name="QShowEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Show"/>
   <object-type name="QStatusTipEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::StatusTip"/>
@@ -2609,20 +2678,20 @@
   <object-type name="QWheelEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Wheel"/>
   <object-type name="QWindowStateChangeEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::WindowStateChange"/>
   <object-type name="QDragResponseEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::DragResponse"/>
-  <object-type name="QInputEvent">  
+  <object-type name="QInputEvent">
     <modify-function signature="modifiers()const" access="non-final"/>
   </object-type>
   <object-type name="QKeyEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::KeyPress || %1-&gt;type() == QEvent::KeyRelease"/>
   <object-type name="QMouseEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::MouseButtonDblClick || %1-&gt;type() == QEvent::MouseButtonPress || %1-&gt;type() == QEvent::MouseButtonRelease || %1-&gt;type() == QEvent::MouseMove"/>
   <object-type name="QPaintEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Paint"/>
   <object-type name="QAccessibleEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::AccessibilityDescription || %1-&gt;type() == QEvent::AccessibilityHelp"/>
-  
+
   <object-type name="QAbstractButton"/>
 
   <object-type name="QStyle">
       <modify-function signature="standardIconImplementation(QStyle::StandardPixmap, const QStyleOption *, const QWidget *)const" virtual-slot="yes"/>
       <modify-function signature="layoutSpacingImplementation(QSizePolicy::ControlType, QSizePolicy::ControlType, Qt::Orientation, const QStyleOption *, const QWidget *) const" virtual-slot="yes"/>
-      
+
       <modify-function signature="drawComplexControl(QStyle::ComplexControl,const QStyleOptionComplex*,QPainter*,const QWidget*)const">
         <modify-argument index="3" invalidate-after-use="yes"/>
       </modify-function>
@@ -2647,21 +2716,32 @@
   </object-type>
 
   <object-type name="QColorDialog">
+
     <modify-function signature="getColor(const QColor &amp;, QWidget *)">
       <modify-argument index="1">
-        <replace-default-expression with="QColor.white"/>      
+        <replace-default-expression with="QColor.white"/>
       </modify-argument>
     </modify-function>
     <modify-function signature="getRgba(uint,bool*,QWidget*)">
-        <remove/>
-    </modify-function>    
+        <rename to="getRgba_internal"/>
+        <access modifier="private"/>
+        <modify-argument index="1">
+            <remove-default-expression/>
+        </modify-argument>
+        <modify-argument index="2">
+            <remove-default-expression/>
+        </modify-argument>
+        <modify-argument index="3">
+            <remove-default-expression/>
+        </modify-argument>
+    </modify-function>
   </object-type>
-  
-  <object-type name="QLayout">  
+
+  <object-type name="QLayout">
     <modify-function signature="addItem(QLayoutItem*)">
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
-  
+
     <modify-function signature="setSpacing(int)" rename="setWidgetSpacing"/>
     <modify-function signature="spacing()const" rename="widgetSpacing"/>
     <modify-function signature="addWidget(QWidget *)">
@@ -2675,14 +2755,14 @@
             <no-null-pointer/>
             <reference-count variable-name="__rcWidgets" action="add"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="removeWidget(QWidget *)">
         <modify-argument index="1">
             <no-null-pointer/>
             <reference-count variable-name="__rcWidgets" action="remove"/>
         </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="setAlignment(QWidget*,QFlags&lt;Qt::AlignmentFlag&gt;)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
@@ -2701,12 +2781,12 @@
     <modify-function signature="getContentsMargins(int*,int*,int*,int*)const">
         <access modifier="private"/>
     </modify-function>
-      
+
     <modify-function signature="margin()const" remove="all"/> <!--### Obsolete in 4.3-->
     <!-- <modify-function signature="setMargin(int)" remove="all"/> --> <!--### Obsolete in 4.3-->
   </object-type>
 
-  <object-type name="QStackedLayout">  
+  <object-type name="QStackedLayout">
     <modify-function signature="addItem(QLayoutItem *)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
@@ -2723,7 +2803,7 @@
             <no-null-pointer/>
             <reference-count action="add" declare-variable="QLayout" variable-name="__rcWidgets"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="insertWidget(int,QWidget*)">
         <modify-argument index="2">
             <no-null-pointer/>
@@ -2737,13 +2817,13 @@
         </modify-argument>
     </modify-function>
   </object-type>
-  
-  <object-type name="QBoxLayout">  
+
+  <object-type name="QBoxLayout">
     <modify-function signature="addWidget(QWidget *, int, QFlags&lt;Qt::AlignmentFlag&gt;)">
         <modify-argument index="1">
             <no-null-pointer/>
         </modify-argument>
-    </modify-function>  
+    </modify-function>
     <modify-function signature="addItem(QLayoutItem *)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
@@ -2753,12 +2833,12 @@
         <modify-argument index="2">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="insertItem(int, QLayoutItem *)">
         <modify-argument index="2">
             <define-ownership class="java" owner="c++"/>
-        </modify-argument>            
-    </modify-function>    
+        </modify-argument>
+    </modify-function>
     <modify-function signature="addSpacerItem(QSpacerItem*)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
@@ -2769,7 +2849,7 @@
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="addLayout(QLayout *, int)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
@@ -2797,7 +2877,7 @@
     </modify-function>
   </object-type>
 
-  <object-type name="QGridLayout">  
+  <object-type name="QGridLayout">
     <modify-function signature="addWidget(QWidget *)" remove="all"/>
     <modify-function signature="addItem(QLayoutItem *)">
         <modify-argument index="1">
@@ -2808,7 +2888,7 @@
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="addLayout(QLayout *, int, int, QFlags&lt;Qt::AlignmentFlag&gt;)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
@@ -2818,7 +2898,7 @@
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>            
+    </modify-function>
         <modify-function signature="addWidget(QWidget*,int,int,QFlags&lt;Qt::AlignmentFlag&gt;)">
             <modify-argument index="1">
                 <reference-count declare-variable="QLayout" action="add" variable-name="__rcWidgets"/>
@@ -2838,12 +2918,17 @@
         <access modifier="private"/>
     </modify-function>
   </object-type>
-  
+
   <object-type name="QGraphicsView">
     <extra-includes>
       <include file-name="QPainterPath" location="global"/>
-      <include file-name="QVarLengthArray" location="global"/>      
-    </extra-includes>    
+      <include file-name="QVarLengthArray" location="global"/>
+    </extra-includes>
+    <modify-function signature="fitInView(const QGraphicsItem *, Qt::AspectRatioMode)">
+        <modify-argument index="1">
+            <no-null-pointer/>
+        </modify-argument>
+    </modify-function>
     <modify-function signature="setupViewport(QWidget *)" access="non-final"/>
     <modify-function signature="setScene(QGraphicsScene*)">
         <modify-argument index="1">
@@ -2855,7 +2940,7 @@
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="drawBackground(QPainter*,QRectF)">
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
@@ -2865,8 +2950,7 @@
     <modify-function signature="drawItems(QPainter*,int,QGraphicsItem**,const QStyleOptionGraphicsItem*)">
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
-    
-    <!--
+
     <modify-function signature="drawItems(QPainter*,int,QGraphicsItem**,const QStyleOptionGraphicsItem*)">
         <modify-argument index="2">
             <remove-argument/>
@@ -2878,8 +2962,8 @@
                     <replace from="%ARRAY" to="%3"/>
                 </insert-template>
                 int __length = %out;
-            </conversion-rule>            
-        </modify-argument>    
+            </conversion-rule>
+        </modify-argument>
 
         <modify-argument index="3">
             <replace-type modified-type="com.trolltech.qt.gui.QGraphicsItemInterface[]"/>
@@ -2887,33 +2971,64 @@
                 <insert-template name="gui.convert_graphicsitem_array_to_java">
                     <replace from="%LENGTH" to="%2"/>
                 </insert-template>
+                jobjectArray graphicsItemArrayHolder = %out;
             </conversion-rule>
             <conversion-rule class="native">
-                <insert-template name="gui.convert_graphicsitem_array_from_java"/>              
-            </conversion-rule>            
-        </modify-argument>        
-        
+                <insert-template name="gui.convert_graphicsitem_array_from_java"/>
+            </conversion-rule>
+        </modify-argument>
+
         <modify-argument index="4">
             <replace-type modified-type="com.trolltech.qt.gui.QStyleOptionGraphicsItem[]"/>
             <conversion-rule class="shell">
                 <insert-template name="gui.convert_styleoptiongraphicsitem_array_to_java">
                     <replace from="%LENGTH" to="%2"/>
                 </insert-template>
+                jobjectArray styleOptionArrayHolder = %out;
             </conversion-rule>
             <conversion-rule class="native">
                 <insert-template name="gui.convert_styleoptiongraphicsitem_array_from_java"/>
-            </conversion-rule>                    
+            </conversion-rule>
+        </modify-argument>
+
+        <modify-argument index="return">
+            <conversion-rule class="shell">
+                qtjambi_invalidate_array(__jni_env, styleOptionArrayHolder);
+                qtjambi_invalidate_array(__jni_env, graphicsItemArrayHolder);
+            </conversion-rule>
         </modify-argument>
+
     </modify-function>
-    -->
   </object-type>
-  
+
   <object-type name="QInputDialog">
+
+    <modify-function signature="getInt(QWidget*,QString,QString,int,int,int,int,bool*,QFlags&lt;Qt::WindowType&gt;)">
+        <rename to="getInt_private"/>
+        <access modifier="private"/>
+        <modify-argument index="4">
+            <remove-default-expression/>
+        </modify-argument>
+        <modify-argument index="5">
+            <remove-default-expression/>
+        </modify-argument>
+        <modify-argument index="6">
+            <remove-default-expression/>
+        </modify-argument>
+        <modify-argument index="7">
+            <remove-default-expression/>
+        </modify-argument>
+        <modify-argument index="8">
+            <remove-default-expression/>
+        </modify-argument>
+        <modify-argument index="9">
+            <remove-default-expression/>
+        </modify-argument>
+    </modify-function>
+
     <modify-function signature="getDouble(QWidget *, const QString &amp;, const QString &amp;, double, double, double, int, bool *, QFlags&lt;Qt::WindowType&gt;)">
-        <!--
         <rename to="getDouble_internal"/>
         <access modifier="private"/>
-        -->
         <modify-argument index="4">
             <remove-default-expression/>
         </modify-argument>
@@ -2931,14 +3046,12 @@
         </modify-argument>
         <modify-argument index="9">
             <remove-default-expression/>
-        </modify-argument>        
+        </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="getInteger(QWidget *, const QString &amp;, const QString &amp;, int, int, int, int, bool *, QFlags&lt;Qt::WindowType&gt;)">
-        <!--
         <rename to="getInteger_internal"/>
         <access modifier="private"/>
-        -->
         <modify-argument index="4">
             <remove-default-expression/>
         </modify-argument>
@@ -2956,14 +3069,12 @@
         </modify-argument>
         <modify-argument index="9">
             <remove-default-expression/>
-        </modify-argument>                
+        </modify-argument>
     </modify-function>
-      
+
     <modify-function signature="getItem(QWidget *, const QString &amp;, const QString &amp;, const QStringList&lt;QString&gt; &amp;, int, bool, bool *, QFlags&lt;Qt::WindowType&gt;)">
-        <!--
         <rename to="getItem_internal"/>
         <access modifier="private"/>
-        -->
         <modify-argument index="4">
             <remove-default-expression/>
         </modify-argument>
@@ -2980,12 +3091,10 @@
             <remove-default-expression/>
         </modify-argument>
     </modify-function>
-   
+
     <modify-function signature="getText(QWidget *, const QString &amp;, const QString &amp;, QLineEdit::EchoMode, const QString &amp;, bool *, QFlags&lt;Qt::WindowType&gt;)">
-        <!--
         <rename to="getText_internal"/>
         <access modifier="private"/>
-        -->
         <modify-argument index="4">
             <remove-default-expression/>
         </modify-argument>
@@ -3059,13 +3168,13 @@
         </modify-argument>
     </modify-function>
   </object-type>
-  
+
 
   <object-type name="QGraphicsScene">
     <extra-includes>
         <include file-name="QVarLengthArray" location="global"/>
     </extra-includes>
-        
+
     <modify-function signature="contextMenuEvent(QGraphicsSceneContextMenuEvent*)">
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
@@ -3123,7 +3232,7 @@
     <modify-function signature="wheelEvent(QGraphicsSceneWheelEvent*)">
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
-    
+
     <modify-function signature="setActiveWindow(QGraphicsWidget*)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
@@ -3139,7 +3248,7 @@
       <modify-argument index="1">
         <define-ownership class="java" owner="c++"/>
       </modify-argument>
-    </modify-function>   
+    </modify-function>
     <modify-function signature="addEllipse(const QRectF &amp;, const QPen &amp;, const QBrush &amp;)">
       <modify-argument index="return">
         <define-ownership class="java" owner="c++"/>
@@ -3173,7 +3282,7 @@
     <modify-function signature="addText(const QString &amp;, const QFont &amp;)">
         <modify-argument index="return">
             <define-ownership class="java" owner="c++"/>
-        </modify-argument>        
+        </modify-argument>
     </modify-function>
     <modify-function signature="addWidget(QWidget*,QFlags&lt;Qt::WindowType&gt;)">
         <modify-argument index="return">
@@ -3200,10 +3309,10 @@
     <extra-includes>
       <include file-name="QTextCharFormat" location="global"/>
     </extra-includes>
-  
+
       <modify-function signature="isHeaderVisible()const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="setHeaderVisible(bool)" remove="all"/> <!--### Obsolete in 4.3-->
-      
+
       <modify-function signature="paintCell(QPainter*,QRect,QDate)const">
         <modify-argument invalidate-after-use="yes" index="1"/>
       </modify-function>
@@ -3213,6 +3322,20 @@
   </object-type>
 
   <object-type name="QTreeWidget">
+    <modify-function signature="setSelectionModel(QItemSelectionModel*)">
+        <modify-argument index="1">
+            <no-null-pointer/>
+            <reference-count declare-variable="QAbstractItemView" action="set" variable-name="__rcItemSelectionModel"/>
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="removeItemWidget(QTreeWidgetItem*,int)">
+        <modify-argument index="1">
+            <reference-count action="ignore"/>
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="mimeData(const QList&lt;QTreeWidgetItem*&gt;)const">
+        <modify-argument index="1" invalidate-after-use="yes"/>
+    </modify-function>
     <modify-function signature="dropMimeData(QTreeWidgetItem*,int,const QMimeData*,Qt::DropAction)">
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
@@ -3234,8 +3357,8 @@
     <modify-function signature="addTopLevelItems(const QList&lt;QTreeWidgetItem*&gt; &amp;)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
-        </modify-argument>    
-    </modify-function>    
+        </modify-argument>
+    </modify-function>
     <modify-function signature="insertTopLevelItem(int, QTreeWidgetItem *)">
         <modify-argument index="2">
             <define-ownership class="java" owner="c++"/>
@@ -3245,7 +3368,7 @@
         <modify-argument index="2">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>        
+    </modify-function>
     <modify-function signature="setHeaderItem(QTreeWidgetItem *)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
@@ -3256,11 +3379,6 @@
             <define-ownership class="java" owner="default"/>
         </modify-argument>
     </modify-function>
-    <modify-function signature="removeItemWidget(QTreeWidgetItem*,int)">
-        <modify-argument index="1">
-            <define-ownership class="java" owner="default"/>
-        </modify-argument>
-    </modify-function>
     <modify-function signature="setCurrentItem(QTreeWidgetItem*,int,QFlags&lt;QItemSelectionModel::SelectionFlag&gt;)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
@@ -3296,8 +3414,8 @@
     <modify-function signature="isItemSelected(const QTreeWidgetItem*)const">
         <remove/>
     </modify-function>
-    <modify-function signature="setItemSelected(const QTreeWidgetItem*,bool)">  
-        <remove/>    
+    <modify-function signature="setItemSelected(const QTreeWidgetItem*,bool)">
+        <remove/>
     </modify-function>
     <modify-function signature="setItemWidget(QTreeWidgetItem*,int,QWidget*)">
         <modify-argument index="1">
@@ -3305,19 +3423,19 @@
         </modify-argument>
         <modify-argument index="3">
             <reference-count action="ignore"/>
-        </modify-argument>        
+        </modify-argument>
     </modify-function>
     <modify-function signature="setModel(QAbstractItemModel*)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
         </modify-argument>
-    </modify-function>    
-  
+    </modify-function>
+
       <modify-function signature="items(const QMimeData*)const" remove="all"/> <!--### Obsolete in 4.3-->
   
     <modify-function signature="mimeData(const QList&lt;QTreeWidgetItem*&gt;)const" remove="all"/>
   </object-type>
-  
+
   <object-type name="QAbstractItemDelegate">
     <modify-function signature="setEditorData(QWidget*,QModelIndex)const">
         <modify-argument index="1">
@@ -3333,14 +3451,14 @@
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="paint(QPainter*,QStyleOptionViewItem,QModelIndex)const">
-        <modify-argument index="1" invalidate-after-use="yes"/>        
+        <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
     <modify-function signature="editorEvent(QEvent*,QAbstractItemModel*,QStyleOptionViewItem,QModelIndex)">
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
-  
+
       <modify-function signature="elidedText(QFontMetrics, int, Qt::TextElideMode, QString)" remove="all"/> <!--### Obsolete in 4.3-->
   </object-type>
 
@@ -3350,13 +3468,13 @@
         <modify-argument index="return">
             <define-ownership class="shell" owner="c++"/>
         </modify-argument>
-    </modify-function>    
-  
+    </modify-function>
+
       <modify-function signature="backgroundColor()const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="setBackgroundColor(QColor)" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="setTextColor(QColor)" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="textColor()const" remove="all"/> <!--### Obsolete in 4.3-->
-      
+
     <modify-function signature="operator&lt;(QTableWidgetItem)const">
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
@@ -3376,7 +3494,7 @@
   </object-type>
 
   <object-type name="QListWidgetItem" delete-in-main-thread="yes">
-  
+
     <modify-function signature="operator&lt;(QListWidgetItem)const">
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
@@ -3387,7 +3505,7 @@
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
 
-  
+
     <modify-function signature="operator=(const QListWidgetItem&amp;)" remove="all"/>
     <modify-function signature="QListWidgetItem(QListWidget *, int)">
         <modify-argument index="this">
@@ -3398,18 +3516,18 @@
         <modify-argument index="this">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="QListWidgetItem(const QIcon &amp;, const QString &amp;, QListWidget *, int)">
         <modify-argument index="this">
             <define-ownership class="java" owner="c++"/>
-        </modify-argument>    
-    </modify-function>    
+        </modify-argument>
+    </modify-function>
     <modify-function signature="clone() const">
         <modify-argument index="return">
             <define-ownership class="shell" owner="c++"/>
         </modify-argument>
     </modify-function>
-  
+
       <modify-function signature="backgroundColor()const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="setBackgroundColor(QColor)" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="setTextColor(QColor)" remove="all"/> <!--### Obsolete in 4.3-->
@@ -3431,24 +3549,24 @@
             <argument-map index="1" meta-name="%1"/>
             if (%1 != null) disableGarbageCollection();
         </inject-code>
-    </modify-function>  
+    </modify-function>
     <modify-function signature="QGraphicsTextItem(const QString &amp;,QGraphicsItem*,QGraphicsScene*)">
         <inject-code position="end">
             <argument-map index="2" meta-name="%2"/>
             if (%2 != null) disableGarbageCollection();
         </inject-code>
-    </modify-function>  
+    </modify-function>
     <modify-function signature="setDocument(QTextDocument*)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcDocument"/>
         </modify-argument>
     </modify-function>
-  
+
       <modify-function signature="matrix()const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="resetMatrix()" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="sceneMatrix()const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <!--### Obsolete in 4.3-->
-  </object-type>
+ </object-type>
 
   <object-type name="QCompleter">
     <modify-function signature="activated(const QModelIndex &amp;)">
@@ -3500,12 +3618,12 @@
         <modify-argument index="this">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="QTreeWidgetItem(QTreeWidget *,QTreeWidgetItem *,int)">
         <modify-argument index="this">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>        
+    </modify-function>
     <modify-function signature="QTreeWidgetItem(QTreeWidgetItem *,int)">
         <modify-argument index="this">
             <define-ownership class="java" owner="c++"/>
@@ -3515,12 +3633,12 @@
         <modify-argument index="this">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="QTreeWidgetItem(QTreeWidgetItem *,QTreeWidgetItem *,int)">
         <modify-argument index="this">
             <define-ownership class="java" owner="c++"/>
-        </modify-argument>    
-    </modify-function>            
+        </modify-argument>
+    </modify-function>
     <modify-function signature="clone() const">
         <modify-argument index="return">
             <define-ownership class="shell" owner="c++"/>
@@ -3535,7 +3653,7 @@
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="insertChild(int, QTreeWidgetItem *)">
         <modify-argument index="2">
             <define-ownership class="java" owner="c++"/>
@@ -3545,7 +3663,7 @@
         <modify-argument index="2">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>        
+    </modify-function>
     <modify-function signature="removeChild(QTreeWidgetItem*)">
         <modify-argument index="1">
             <define-ownership class="java" owner="default"/>
@@ -3561,7 +3679,7 @@
             <define-ownership class="java" owner="default"/>
         </modify-argument>
     </modify-function>
-  
+
       <modify-function signature="backgroundColor(int)const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="setBackgroundColor(int, QColor)" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="setTextColor(int, QColor)" remove="all"/> <!--### Obsolete in 4.3-->
@@ -3575,6 +3693,9 @@
   </object-type>
 
   <object-type name="QListWidget">
+    <modify-function signature="mimeData(const QList&lt;QListWidgetItem *&gt;)const">
+        <modify-argument index="1" invalidate-after-use="yes"/>
+    </modify-function>
     <modify-function signature="addItem(QListWidgetItem *)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
@@ -3583,11 +3704,6 @@
     <modify-function signature="insertItem(int, QListWidgetItem *)">
         <modify-argument index="2">
             <define-ownership class="java" owner="c++"/>
-        </modify-argument>            
-    </modify-function>
-    <modify-function signature="removeItemWidget(QListWidgetItem*)">
-        <modify-argument index="1">
-            <define-ownership class="java" owner="default"/>
         </modify-argument>
     </modify-function>
     <modify-function signature="setCurrentItem(QListWidgetItem*)">
@@ -3599,7 +3715,7 @@
         <modify-argument index="1">
             <reference-count action="ignore"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="setItemHidden(const QListWidgetItem*,bool)">
         <remove/>
     </modify-function>
@@ -3624,7 +3740,12 @@
         <modify-argument index="2">
             <reference-count action="ignore"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
+    <modify-function signature="removeItemWidget(QListWidgetItem*)">
+        <modify-argument index="1">
+            <reference-count action="ignore"/>
+        </modify-argument>
+    </modify-function>
     <modify-function signature="setModel(QAbstractItemModel*)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
@@ -3639,8 +3760,8 @@
     <extra-includes>
         <include file-name="QIcon" location="global"/>
         <include file-name="QMessageBox" location="global"/>
-    </extra-includes> 
-    
+    </extra-includes>
+
     <modify-function signature="actionEvent(QActionEvent*)">
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
@@ -3726,8 +3847,7 @@
             <remove-default-expression/>
         </modify-argument>
     </modify-function>
-    
-    <!--
+
     <inject-code class="native">
         extern "C" JNIEXPORT void JNICALL QTJAMBI_FUNCTION_PREFIX(Java_com_trolltech_qt_gui_QWidget__1_1qt_1QMessageBox_1setWindowTitle)
         (JNIEnv *__jni_env,
@@ -3743,7 +3863,7 @@
             Q_ASSERT(__qt_this);
             __qt_this-&gt;setWindowTitle((const QString&amp; )__qt_title0);
             QTJAMBI_DEBUG_TRACE("(native) -&gt; leaving: QMessageBox::setWindowTitle(const QString &amp; title)");
-        }    
+        }
     </inject-code>
 
     <inject-code class="native">
@@ -3764,18 +3884,17 @@
             QTJAMBI_DEBUG_TRACE("(native) -&gt; leaving: QMessageBox::setWindowModality(Qt::WindowModality modality)");
         }
     </inject-code>
-    -->
-    
+
     <modify-function signature="render(QPaintDevice *, const QPoint &amp;, const QRegion &amp;, QFlags&lt;QWidget::RenderFlag&gt;)">
         <modify-argument index="4">
             <replace-default-expression with="RenderFlag.DrawWindowBackground, RenderFlag.DrawChildren"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="render(QPainter *, const QPoint &amp;, const QRegion &amp;, QFlags&lt;QWidget::RenderFlag&gt;)">
         <modify-argument index="4">
             <replace-default-expression with="RenderFlag.DrawWindowBackground, RenderFlag.DrawChildren"/>
         </modify-argument>
-    </modify-function>       
+    </modify-function>
     <modify-function signature="setFocusProxy(QWidget*)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcFocusProxy"/>
@@ -3813,12 +3932,12 @@
         </modify-argument>
         <modify-argument index="2">
             <reference-count action="ignore"/>
-        </modify-argument>        
-    </modify-function>           
+        </modify-argument>
+    </modify-function>
     <modify-function signature="getContentsMargins(int*,int*,int*,int*)const">
         <access modifier="private"/>
     </modify-function>
-        
+
     <modify-function signature="addAction(QAction *)">
         <modify-argument index="1">
             <reference-count action="add" variable-name="__rcActions"/>
@@ -3865,8 +3984,10 @@
   </object-type>
 
   <object-type name="QMessageBox">
+
+
     <modify-function signature="setWindowTitle(const QString &amp;)" remove="all"/>
-    <modify-function signature="setWindowModality(Qt::WindowModality)" remove="all"/> 
+    <modify-function signature="setWindowModality(Qt::WindowModality)" remove="all"/>
     <extra-includes>
         <include file-name="QPixmap" location="global"/>
     </extra-includes>
@@ -3890,7 +4011,7 @@
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-  
+
       <modify-function signature="QMessageBox(QString,QString,QMessageBox::Icon,int,int,int,QWidget*,QFlags&lt;Qt::WindowType&gt;)" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="buttonText(int)const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="setButtonText(int, QString)" remove="all"/> <!--### Obsolete in 4.3-->
@@ -3922,13 +4043,13 @@
   <object-type name="QTextFrame" delete-in-main-thread="yes">
     <extra-includes>
         <include file-name="QTextCursor" location="global"/>
-    </extra-includes>              
+    </extra-includes>
   </object-type>
 
   <object-type name="QImageIOHandler">
     <extra-includes>
         <include file-name="QRect" location="global"/>
-    </extra-includes>                
+    </extra-includes>
     <modify-function signature="setFormat(const QByteArray &amp;)const">
         <remove/>
     </modify-function>
@@ -3937,18 +4058,17 @@
             <reference-count action="set" variable-name="__rcDevice"/>
         </modify-argument>
     </modify-function>
-    <!--
     <modify-function signature="read(QImage*)">
         <modify-argument index="1">
             <replace-type modified-type="com.trolltech.qt.gui.QImage"/>
             <conversion-rule class="shell">
                 jobject %out = qtjambi_from_object(__jni_env, %in, "QImage", "com/trolltech/qt/gui/", false);
-                
-                QtJambiLink *__link = %out != 0 ? QtJambiLink::findLink(__jni_env, %out) : 0;                
-            </conversion-rule>                
+
+                QtJambiLink *__link = %out != 0 ? QtJambiLink::findLink(__jni_env, %out) : 0;
+            </conversion-rule>
             <conversion-rule class="native">
                 QImage *%out = (QImage *) qtjambi_to_object(__jni_env, %in);
-            </conversion-rule>                            
+            </conversion-rule>
         </modify-argument>
         <modify-argument index="0">
             <conversion-rule class="shell">
@@ -3956,20 +4076,19 @@
                 if (__link != 0) __link-&gt;resetObject(__jni_env);
                 bool %out = (bool) %in;
             </conversion-rule>
-        </modify-argument>        
-    </modify-function>    
-    -->
-  
+        </modify-argument>
+    </modify-function>
+
       <modify-function signature="name()const" remove="all"/> <!--### Obsolete in 4.3-->
   </object-type>
-    
+
   <object-type name="QProxyModel">
     <modify-function signature="parent()const" remove="all"/>
     <extra-includes>
         <include file-name="QPixmap" location="global"/>
         <include file-name="QStringList" location="global"/>
         <include file-name="QSize" location="global"/>
-    </extra-includes>            
+    </extra-includes>
     <modify-function signature="setModel(QAbstractItemModel*)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcModel"/>
@@ -3977,14 +4096,14 @@
     </modify-function>
   </object-type>
 
-  <object-type name="QImageReader">  
+  <object-type name="QImageReader">
     <extra-includes>
         <include file-name="QColor" location="global"/>
         <include file-name="QRect" location="global"/>
         <include file-name="QSize" location="global"/>
         <include file-name="QStringList" location="global"/>
         <include file-name="QImage" location="global"/>
-    </extra-includes>             
+    </extra-includes>
     <modify-function signature="read(QImage*) ">
         <remove/>
     </modify-function>
@@ -3992,9 +4111,9 @@
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcDevice"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
   </object-type>
-  
+
   <object-type name="QMovie">
     <extra-includes>
         <include file-name="QColor" location="global"/>
@@ -4002,7 +4121,7 @@
         <include file-name="QPixmap" location="global"/>
         <include file-name="QRect" location="global"/>
         <include file-name="QSize" location="global"/>
-    </extra-includes>   
+    </extra-includes>
     <modify-function signature="cacheMode()">
         <remove/>
     </modify-function>
@@ -4012,9 +4131,8 @@
         </modify-argument>
     </modify-function>
   </object-type>
-    
-  <object-type name="QPageSetupDialog">
-  </object-type>
+
+  <object-type name="QPageSetupDialog"/>
 
   <object-type name="QTabWidget">
     <modify-function signature="initStyleOption(QStyleOptionTabWidgetFrame*)const">
@@ -4024,7 +4142,7 @@
         <insert-template name="gui.init_style_option">
             <replace from="%TYPE" to="QStyleOptionTabWidgetFrame"/>
         </insert-template>
-    </inject-code>  
+    </inject-code>
     <modify-function signature="addTab(QWidget*,QIcon,QString)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
@@ -4065,25 +4183,25 @@
     <extra-includes>
         <include file-name="QPoint" location="global"/>
         <include file-name="QPixmap" location="global"/>
-    </extra-includes>  
+    </extra-includes>
     <modify-function signature="setMimeData(QMimeData*)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>                
-  
+    </modify-function>
+
     <modify-function signature="start(QFlags&lt;Qt::DropAction&gt;)" remove="all"/> <!--### Obsolete in 4.3-->
   </object-type>
-  
+
   <object-type name="QDateTimeEdit">
     <modify-function signature="initStyleOption(QStyleOptionSpinBox*)const" access="private" rename="initDateTimeEditStyleOption"/>
     <modify-function signature="setCalendarWidget(QCalendarWidget*)">
         <modify-argument index="1">
-            <!-- Safe to ignore because widget is reparented --> 
-            <reference-count action="ignore"/> 
+            <!-- Safe to ignore because widget is reparented -->
+            <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-    
+
   </object-type>
 
   <object-type name="QSortFilterProxyModel">
@@ -4092,14 +4210,14 @@
         <include file-name="QItemSelection" location="global"/>
         <include file-name="QStringList" location="global"/>
         <include file-name="QSize" location="global"/>
-    </extra-includes>            
-    
+    </extra-includes>
+
     <modify-function signature="setSourceModel(QAbstractItemModel *)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcSourceModel"/>
         </modify-argument>
     </modify-function>
-      
+
       <modify-function signature="clear()" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="filterChanged()" remove="all"/> <!--### Obsolete in 4.3-->
   </object-type>
@@ -4113,7 +4231,7 @@
   <object-type name="QInputContext">
     <extra-includes>
         <include file-name="QTextFormat" location="global"/>
-    </extra-includes> 
+    </extra-includes>
     <modify-function signature="setFocusWidget(QWidget*)">
         <remove/>
     </modify-function>
@@ -4125,8 +4243,9 @@
     </modify-function>
 
   </object-type>
-      
+
   <object-type name="QProgressDialog">
+
     <modify-function signature="setBar(QProgressBar*)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
@@ -4144,7 +4263,7 @@
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-   
+
   </object-type>
 
   <object-type name="QLabel">
@@ -4152,7 +4271,7 @@
         <access modifier="private"/>
         <rename to="picture_private"/>
     </modify-function>
-    
+
     <modify-function signature="setBuddy(QWidget *)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcBuddy"/>
@@ -4165,7 +4284,7 @@
     </modify-function>
     <modify-function signature="pixmap()const">
         <access modifier="private"/>
-        <rename to="pixmap_private"/>    
+        <rename to="pixmap_private"/>
     </modify-function>
   </object-type>
 
@@ -4173,7 +4292,7 @@
     <extra-includes>
         <include file-name="QUrl" location="global"/>
     </extra-includes>
-<!--
+
     <modify-function signature="getOpenFileName(QWidget*,QString,QString,QString,QString*,QFlags&lt;QFileDialog::Option&gt;)">
         <access modifier="private"/>
         <modify-argument index="1">
@@ -4193,9 +4312,9 @@
         </modify-argument>
         <modify-argument index="6">
             <remove-default-expression/>
-        </modify-argument>        
+        </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="getOpenFileNames(QWidget*,QString,QString,QString,QString*,QFlags&lt;QFileDialog::Option&gt;)">
         <access modifier="private"/>
         <modify-argument index="1">
@@ -4215,9 +4334,9 @@
         </modify-argument>
         <modify-argument index="6">
             <remove-default-expression/>
-        </modify-argument>    
+        </modify-argument>
     </modify-function>
-       
+
     <modify-function signature="getSaveFileName(QWidget*,QString,QString,QString,QString*,QFlags&lt;QFileDialog::Option&gt;)">
         <access modifier="private"/>
         <modify-argument index="1">
@@ -4237,29 +4356,28 @@
         </modify-argument>
         <modify-argument index="6">
             <remove-default-expression/>
-        </modify-argument>    
+        </modify-argument>
     </modify-function>
--->
-     
+
     <modify-function signature="setIconProvider(QFileIconProvider*)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcIconProvider"/>
         </modify-argument>
     </modify-function>
-   
+
     <modify-function signature="setItemDelegate(QAbstractItemDelegate*)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcItemDelegate"/>
         </modify-argument>
     </modify-function>
-   
+
     <modify-function signature="setProxyModel(QAbstractProxyModel*)">
         <modify-argument index="1">
             <!-- Reparented -->
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-       
+
   </object-type>
 
   <object-type name="QErrorMessage"/>
@@ -4267,10 +4385,15 @@
   <object-type name="QTabBar">
     <extra-includes>
         <include file-name="QIcon" location="global"/>
-    </extra-includes>        
+    </extra-includes>
     <modify-function signature="initStyleOption(QStyleOptionTab*,int)const">
         <access modifier="private"/>
     </modify-function>
+    <modify-function signature="setTabButton(int,QTabBar::ButtonPosition,QWidget*)">
+        <modify-argument index="3">
+            <reference-count action="ignore"/>
+        </modify-argument>
+    </modify-function>
   </object-type>
 
   <object-type name="QStandardItemModel">
@@ -4280,8 +4403,8 @@
     <extra-includes>
         <include file-name="QStringList" location="global"/>
         <include file-name="QSize" location="global"/>
-    </extra-includes>        
-    
+    </extra-includes>
+
     <modify-function signature="appendColumn(const QList&lt;QStandardItem *&gt;&amp;)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
@@ -4296,22 +4419,22 @@
         <modify-argument index="return">
             <define-ownership class="java" owner="default"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="takeHorizontalHeaderItem(int)">
         <modify-argument index="return">
             <define-ownership class="java" owner="default"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="takeVerticalHeaderItem(int)">
         <modify-argument index="return">
             <define-ownership class="java" owner="default"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="takeItem(int,int)">
         <modify-argument index="return">
             <define-ownership class="java" owner="default"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="appendRow(const QList&lt;QStandardItem *&gt;&amp;)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
@@ -4320,7 +4443,7 @@
     <modify-function signature="appendRow(QStandardItem *)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
-        </modify-argument>        
+        </modify-argument>
     </modify-function>
     <modify-function signature="insertColumn(int, const QList&lt;QStandardItem *&gt;&amp;)">
         <modify-argument index="2">
@@ -4335,7 +4458,7 @@
     <modify-function signature="insertRow(int, QStandardItem *)">
         <modify-argument index="2">
             <define-ownership class="java" owner="c++"/>
-        </modify-argument>        
+        </modify-argument>
     </modify-function>
     <modify-function signature="setHorizontalHeaderItem(int, QStandardItem *)">
         <modify-argument index="2">
@@ -4356,12 +4479,12 @@
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="setVerticalHeaderItem(int, QStandardItem *)">
         <modify-argument index="2">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
   </object-type>
 
   <object-type name="QRadioButton">
@@ -4380,7 +4503,7 @@
     <extra-includes>
         <include file-name="QImage" location="global"/>
         <include file-name="QPixmap" location="global"/>
-    </extra-includes>      
+    </extra-includes>
     <modify-function signature="setMimeData(QMimeData *, QClipboard::Mode)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
@@ -4392,11 +4515,11 @@
             <remove-default-expression/>
         </modify-argument>
     </modify-function>
-   
+
   </object-type>
 
   <object-type name="QAbstractScrollArea">
-    <modify-function signature="setupViewport(QWidget *)" access="non-final"/>    
+    <modify-function signature="setupViewport(QWidget *)" access="non-final"/>
     <modify-function signature="addScrollBarWidget(QWidget*,QFlags&lt;Qt::AlignmentFlag&gt;)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
@@ -4412,35 +4535,35 @@
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-   
+
     <modify-function signature="setVerticalScrollBar(QScrollBar*)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-   
+
     <modify-function signature="setViewport(QWidget*)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-   
+
     <modify-function signature="setupViewport(QWidget*)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="viewportEvent(QEvent*)">
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
-    
+
   </object-type>
 
   <object-type name="QPaintEngineState">
     <extra-includes>
         <include file-name="QPainterPath" location="global"/>
-    </extra-includes>        
+    </extra-includes>
   </object-type>
 
   <object-type name="QRubberBand">
@@ -4458,12 +4581,15 @@
   <object-type name="QTextLayout">
     <extra-includes>
         <include file-name="QTextOption" location="global"/>
-    </extra-includes>          
-  </object-type>  
+    </extra-includes>
+  </object-type>
 
   <object-type name="QTableWidget">
+    <modify-function signature="mimeData(const QList&lt;QTableWidgetItem*&gt;)const">
+        <modify-argument index="1" invalidate-after-use="yes"/>
+    </modify-function>
     <modify-function signature="isSortingEnabled()const" remove="all"/>
-    <modify-function signature="setSortingEnabled(bool)" remove="all"/>  
+    <modify-function signature="setSortingEnabled(bool)" remove="all"/>
     <modify-function signature="setHorizontalHeaderItem(int, QTableWidgetItem *)">
         <modify-argument index="2">
             <define-ownership class="java" owner="c++"/>
@@ -4473,7 +4599,7 @@
         <modify-argument index="3">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="takeHorizontalHeaderItem(int)">
         <modify-argument index="return">
             <define-ownership class="java" owner="default"/>
@@ -4483,22 +4609,22 @@
         <modify-argument index="return">
             <define-ownership class="java" owner="default"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="takeItem(int,int)">
         <modify-argument index="return">
             <define-ownership class="java" owner="default"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="setItemPrototype(const QTableWidgetItem *)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="setVerticalHeaderItem(int, QTableWidgetItem *)">
         <modify-argument index="2">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function> 
+    </modify-function>
     <modify-function signature="setCellWidget(int,int,QWidget*)">
         <modify-argument index="3">
             <reference-count action="ignore"/>
@@ -4533,23 +4659,36 @@
         <include file-name="QTextBlock" location="global"/>
         <include file-name="QTextFormat" location="global"/>
         <include file-name="QTextCursor" location="global"/>
-    </extra-includes>  
+    </extra-includes>
     <modify-function signature="redo(QTextCursor*)">
-        <access modifier="private"/>        
+        <access modifier="private"/>
     </modify-function>
     <modify-function signature="setDocumentLayout(QAbstractTextDocumentLayout*)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="undo(QTextCursor*)">
-        <access modifier="private"/>        
+        <access modifier="private"/>
+    </modify-function>
+  </object-type>
+
+  <object-type name="QTextDocumentWriter">
+    <modify-function signature="setCodec(QTextCodec*)">
+        <modify-argument index="1">
+            <reference-count action="set" variable-name="__rcCodec"/>
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="setDevice(QIODevice*)">
+        <modify-argument index="1">
+            <reference-count action="set" variable-name="__rcDevice"/>
+        </modify-argument>
     </modify-function>
   </object-type>
 
   <object-type name="QSplitter">
-   
+
     <modify-function signature="getRange(int,int*,int*)const">
         <access modifier="private"/>
     </modify-function>
@@ -4564,7 +4703,7 @@
         </modify-argument>
     </modify-function>
   </object-type>
-  
+
   <object-type name="QGroupBox">
     <modify-function signature="initStyleOption(QStyleOptionGroupBox*)const">
         <access modifier="private"/>
@@ -4618,9 +4757,9 @@
         </modify-argument>
     </modify-function>
   </object-type>
-  
+
   <object-type name="QLCDNumber"/>
-  
+
   <object-type name="QSplashScreen">
     <modify-function signature="showMessage(const QString &amp;, int, const QColor &amp;)">
       <modify-argument index="3">
@@ -4632,7 +4771,7 @@
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
   </object-type>
-    
+
   <object-type name="QDockWidget">
     <modify-function signature="initStyleOption(QStyleOptionDockWidget*)const">
         <access modifier="private"/>
@@ -4641,7 +4780,7 @@
         <insert-template name="gui.init_style_option">
             <replace from="%TYPE" to="QStyleOptionDockWidget"/>
         </insert-template>
-    </inject-code>        
+    </inject-code>
     <modify-function signature="setTitleBarWidget(QWidget*)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
@@ -4660,13 +4799,13 @@
         <include file-name="QStringList" location="global"/>
         <include file-name="QSize" location="global"/>
     </extra-includes>
-    
+
     <modify-function signature="setSourceModel(QAbstractItemModel *)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcSourceModel"/>
         </modify-argument>
     </modify-function>
-    
+
   </object-type>
 
   <object-type name="QDesktopWidget">
@@ -4687,20 +4826,20 @@
   <object-type name="QSpinBox">
     <modify-function signature="valueChanged(const QString &amp;)">
         <rename to="valueStringChanged"/>
-    </modify-function>    
-  </object-type>  
-  
+    </modify-function>
+  </object-type>
+
   <object-type name="QTextBrowser">
     <modify-function signature="highlighted(const QString &amp;)">
         <rename to="highlightedString"/>
     </modify-function>
   </object-type>
-  
+
   <object-type name="QDoubleSpinBox">
     <modify-function signature="valueChanged(const QString &amp;)">
         <rename to="valueStringChanged"/>
     </modify-function>
-  </object-type>  
+  </object-type>
 
   <object-type name="QButtonGroup">
     <modify-function signature="buttonClicked(int)">
@@ -4723,21 +4862,21 @@
             <reference-count action="add" variable-name="__rcButtons"/>
             <no-null-pointer/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="removeButton(QAbstractButton *)">
         <modify-argument index="1">
             <reference-count action="remove" variable-name="__rcButtons"/>
             <no-null-pointer/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="setId(QAbstractButton *,int)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
   </object-type>
-    
-  <object-type name="QToolBar">  
+
+  <object-type name="QToolBar">
     <modify-function signature="addAction(QAction *)" remove="all"/>
     <modify-function signature="initStyleOption(QStyleOptionToolBar*)const">
         <access modifier="private"/>
@@ -4752,11 +4891,11 @@
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
-    </modify-function>  
+    </modify-function>
     <modify-function signature="insertWidget(QAction*,QWidget*)">
         <modify-argument index="1">
             <reference-count action="ignore"/>
-        </modify-argument>           
+        </modify-argument>
         <modify-argument index="2">
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
@@ -4767,9 +4906,9 @@
         </modify-argument>
     </modify-function>
   </object-type>
-  
+
   <object-type name="QPaintEngine">
-  
+
     <modify-function signature="begin(QPaintDevice*)">
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
@@ -4784,13 +4923,20 @@
         <include file-name="QVarLengthArray" location="global"/>
     </extra-includes>
     <modify-function signature="setPaintDevice(QPaintDevice*)">
-        <remove/>    
+        <remove/>
     </modify-function>
     <modify-field name="state" read="false" write="false"/>
   </object-type>
-  
-  <object-type name="QGuiSignalMapper"/>  
-      
+
+  <object-type name="QAbstractTableModel">
+    <extra-includes>
+        <include file-name="QStringList" location="global"/>
+        <include file-name="QSize" location="global"/>
+    </extra-includes>
+  </object-type>
+
+  <object-type name="QGuiSignalMapper"/>
+
   <object-type name="QComboBox">
     <modify-function signature="initStyleOption(QStyleOptionComboBox*)const">
         <access modifier="private"/>
@@ -4816,7 +4962,7 @@
             <no-null-pointer/>
             <!-- Safe to ignore because combo box reparents view -->
             <reference-count action="ignore"/>
-        </modify-argument> 
+        </modify-argument>
     </modify-function>
     <modify-function signature="setLineEdit(QLineEdit *)">
         <modify-argument index="1">
@@ -4835,9 +4981,9 @@
         <insert-template name="gui.init_style_option">
             <replace from="%TYPE" to="QStyleOptionComboBox"/>
         </insert-template>
-    </inject-code>  
+    </inject-code>
     <modify-function signature="activated(int)">&gt;
-        <rename to="activatedIndex"/>        
+        <rename to="activatedIndex"/>
     </modify-function>
     <modify-function signature="currentIndexChanged(const QString &amp;)">
         <rename to="currentStringChanged"/>
@@ -4845,13 +4991,13 @@
     <modify-function signature="highlighted(int)">
         <rename to="highlightedIndex"/>
     </modify-function>
-  
+
       <modify-function signature="autoCompletion()const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="autoCompletionCaseSensitivity()const" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="setAutoCompletion(bool)" remove="all"/> <!--### Obsolete in 4.3-->
       <modify-function signature="setAutoCompletionCaseSensitivity(Qt::CaseSensitivity)" remove="all"/> <!--### Obsolete in 4.3-->
-  </object-type>  
- 
+  </object-type>
+
   <object-type name="QTextEdit">
     <extra-includes>
         <include file-name="QTextCursor" location="global"/>
@@ -4889,7 +5035,7 @@
             <reference-count action="set" variable-name="__rcMenu"/>
         </modify-argument>
     </modify-function>
-    
+
   </object-type>
 
   <object-type name="QPainter">
@@ -4898,18 +5044,18 @@
       <include file-name="QPainterPath" location="global"/>
       <include file-name="QPixmap" location="global"/>
     </extra-includes>
-    
+
     <modify-function signature="drawText(const QPointF &amp;, const QString &amp;, int, int)" remove="all"/>
-    
+
     <modify-function signature="drawConvexPolygon(const QPoint *, int)">
         <remove/>
     </modify-function>
     <modify-function signature="drawConvexPolygon(const QPointF *, int)">
         <remove/>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="drawLines(const QLine *, int)">
         <remove/>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="drawLines(const QLineF *, int)">
         <remove/>
     </modify-function>
@@ -4924,28 +5070,28 @@
     </modify-function>
     <modify-function signature="drawPoints(const QPointF *, int)">
         <remove/>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="drawPolygon(const QPoint *, int, Qt::FillRule)">
         <remove/>
     </modify-function>
     <modify-function signature="drawPolygon(const QPointF *, int, Qt::FillRule)">
         <remove/>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="drawPolyline(const QPoint *, int)">
         <remove/>
     </modify-function>
     <modify-function signature="drawPolyline(const QPointF *, int)">
         <remove/>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="drawRects(const QRect *, int)">
         <remove/>
     </modify-function>
     <modify-function signature="drawRects(const QRectF *, int)">
         <remove/>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="drawLines(const QVector&lt;QPoint&gt; &amp;)">
         <rename to="drawLinesFromPoints"/>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="drawLines(const QVector&lt;QPointF&gt; &amp;)">
         <rename to="drawLinesFromPointsF"/>
     </modify-function>
@@ -4954,23 +5100,23 @@
     </modify-function>
     <modify-function signature="drawRects(const QVector&lt;QRectF&gt; &amp;)">
         <rename to="drawRectsF"/>
-    </modify-function>    
-    
+    </modify-function>
+
     <modify-function signature="QPainter(QPaintDevice *)">
         <modify-argument index="1">
             <no-null-pointer/>
         </modify-argument>
-    </modify-function>        
+    </modify-function>
     <modify-function signature="begin(QPaintDevice *)">
         <modify-argument index="1">
             <no-null-pointer/>
         </modify-argument>
-    </modify-function>        
+    </modify-function>
     <modify-function signature="initFrom(const QWidget *)">
         <modify-argument index="1">
             <no-null-pointer/>
         </modify-argument>
-    </modify-function>            
+    </modify-function>
     <modify-function signature="setRedirected(const QPaintDevice *, QPaintDevice *, const QPoint &amp;)">
         <modify-argument index="1">
             <no-null-pointer/>
@@ -4981,28 +5127,28 @@
             <no-null-pointer/>
         </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="drawText(QRect,int,QString,QRect*)">
         <access modifier="private"/>
         <modify-argument index="4">
             <remove-default-expression/>
-        </modify-argument>        
+        </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="drawText(QRectF,int,QString,QRectF*)">
         <access modifier="private"/>
         <modify-argument index="4">
             <remove-default-expression/>
-        </modify-argument>            
+        </modify-argument>
     </modify-function>
-   
+
     <modify-function signature="drawText(int,int,int,int,int,QString,QRect*)">
         <access modifier="private"/>
         <modify-argument index="7">
             <remove-default-expression/>
         </modify-argument>
     </modify-function>
-   
+
     <modify-function signature="redirected(const QPaintDevice*,QPoint*)">
         <access modifier="private"/>
         <modify-argument index="2">
@@ -5029,8 +5175,8 @@
         </conversion-rule>            
       </modify-argument>
     </modify-function>
-  </object-type>  
-    
+  </object-type>
+
   <object-type name="QApplication">
     <extra-includes>
       <include file-name="QBasicTimer" location="global"/>
@@ -5039,18 +5185,18 @@
       <include file-name="QPalette" location="global"/>
       <include file-name="QIcon" location="global"/>
       <include file-name="QLocale" location="global"/>
-    </extra-includes>  
-    
+    </extra-includes>
+
     <modify-function signature="QApplication(int &amp;, char  **, int)">
         <access modifier="private"/>
-    </modify-function>    
+    </modify-function>
     <modify-function signature="QApplication(int &amp;, char **, QApplication::Type, int)">
-	    <remove/>
+        <remove/>
     </modify-function>
     <modify-function signature="QApplication(int &amp;, char **, bool, int)">
-	    <remove/>
+        <remove/>
     </modify-function>
-    
+
     <modify-function signature="font(const char*)">
         <remove/>
     </modify-function>
@@ -5060,7 +5206,7 @@
             <remove-default-expression/>
         </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="palette(const char*)">
         <remove/>
     </modify-function>
@@ -5070,12 +5216,12 @@
             <remove-default-expression/>
         </modify-argument>
     </modify-function>
-    
+
     <modify-function signature="overrideCursor()">
         <access modifier="private"/>
         <rename to="overrideCursor_private"/>
     </modify-function>
-          
+
     <modify-function signature="setInputContext(QInputContext*)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
@@ -5115,7 +5261,11 @@
       </modify-argument>
     </modify-function>
   </object-type>
-  
+
+  <object-type name="QMouseEventTransition"/>
+  <object-type name="QKeyEventTransition"/>
+  <value-type name="QQuaternion"/>
+
   <object-type name="QCommandLinkButton"/>
   <object-type name="QFileSystemModel">
     <modify-function signature="setIconProvider(QFileIconProvider*)">
@@ -5123,7 +5273,7 @@
             <reference-count action="set" variable-name="__rcIconProvider"/>
         </modify-argument>
     </modify-function>
-  </object-type>  
+  </object-type>
   <object-type name="QFormLayout">
     <modify-function signature="addRow(QWidget*,QWidget*)">
         <modify-argument index="1">
@@ -5140,11 +5290,11 @@
     </modify-function>
     <modify-function signature="addRow(QWidget*,QLayout*)">
         <modify-argument index="1">
-            <reference-count action="ignore"/>            
+            <reference-count action="ignore"/>
         </modify-argument>
         <modify-argument index="2">
-            <reference-count action="ignore"/>            
-        </modify-argument>                
+            <reference-count action="ignore"/>
+        </modify-argument>
     </modify-function>
 
     <modify-function signature="addRow(QWidget*)">
@@ -5173,7 +5323,7 @@
         </modify-argument>
         <modify-argument index="3">
             <reference-count action="ignore"/>
-        </modify-argument>            
+        </modify-argument>
     </modify-function>
     <modify-function signature="insertRow(int,QWidget*,QWidget*)">
         <modify-argument index="2">
@@ -5181,32 +5331,32 @@
         </modify-argument>
         <modify-argument index="3">
             <reference-count action="ignore"/>
-        </modify-argument>            
+        </modify-argument>
     </modify-function>
     <modify-function signature="insertRow(int,QWidget*)">
         <modify-argument index="2">
             <reference-count action="ignore"/>
-        </modify-argument>    
+        </modify-argument>
     </modify-function>
     <modify-function signature="insertRow(int,QString,QLayout*)">
         <modify-argument index="3">
             <reference-count action="ignore"/>
-        </modify-argument>    
+        </modify-argument>
     </modify-function>
     <modify-function signature="insertRow(int,QString,QWidget*)">
         <modify-argument index="3">
             <reference-count action="ignore"/>
-        </modify-argument>    
-    </modify-function>    
+        </modify-argument>
+    </modify-function>
     <modify-function signature="setLayout(int,QFormLayout::ItemRole,QLayout*)">
         <modify-argument index="3">
             <reference-count action="ignore"/>
-        </modify-argument>    
+        </modify-argument>
     </modify-function>
     <modify-function signature="setWidget(int,QFormLayout::ItemRole,QWidget*)">
         <modify-argument index="3">
             <reference-count action="ignore"/>
-        </modify-argument>    
+        </modify-argument>
     </modify-function>
     <modify-function signature="setItem(int,QFormLayout::ItemRole,QLayoutItem*)" access="private" rename="setItem_private">
         <modify-argument index="3">
@@ -5216,7 +5366,7 @@
     <modify-function signature="addItem(QLayoutItem*)">
         <modify-argument index="1">
             <define-ownership class="java" owner="c++"/>
-        </modify-argument>    
+        </modify-argument>
     </modify-function>
   </object-type>
   <object-type name="QGraphicsGridLayout" delete-in-main-thread="yes">
@@ -5235,9 +5385,9 @@
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-  </object-type>  
+  </object-type>
   <object-type name="QGraphicsLayout" delete-in-main-thread="yes">
-  
+
     <modify-function signature="widgetEvent(QEvent*)">
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
@@ -5246,13 +5396,23 @@
             <reference-count action="set" variable-name="__rcParentLayoutItem"/>
         </modify-argument>
     </modify-function>
-  </object-type>  
+    <modify-function signature="setGraphicsItem(QGraphicsItem*)">
+        <modify-argument index="1">
+            <reference-count action="set" variable-name="__rcItem"/>
+        </modify-argument>
+    </modify-function>
+  </object-type>
   <interface-type name="QGraphicsLayoutItem" delete-in-main-thread="yes">
     <modify-function signature="setParentLayoutItem(QGraphicsLayoutItem*)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcParentLayoutItem"/>
         </modify-argument>
-    </modify-function>  
+    </modify-function>
+    <modify-function signature="setGraphicsItem(QGraphicsItem*)">
+        <modify-argument index="1">
+            <reference-count action="set" variable-name="__rcItem"/>
+        </modify-argument>
+    </modify-function>
   </interface-type>
   <object-type name="QGraphicsLinearLayout" delete-in-main-thread="yes">
     <modify-function signature="addItem(QGraphicsLayoutItem*)">
@@ -5280,7 +5440,7 @@
             <reference-count action="ignore"/>
         </modify-argument>
     </modify-function>
-  </object-type>  
+  </object-type>
   <object-type name="QGraphicsProxyWidget"/> <!-- a QObject so main-thread delete redundant -->
   <object-type name="QGraphicsWidget">  <!-- a QObject so main-thread delete redundant -->
     <!-- Duplicate function to QObject::children() to override accidental shadowing which is not present in Jambi -->
@@ -5290,7 +5450,29 @@
             <reference-count action="set" variable-name="__rcLayout"/>
         </modify-argument>
     </modify-function>
-    
+
+    <modify-function signature="addAction(QAction*)">
+        <modify-argument index="1">
+            <reference-count action="add" variable-name="__rcActions"/>
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="insertAction(QAction*,QAction*)">
+        <modify-argument index="2">
+            <reference-count action="add" variable-name="__rcActions"/>
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="insertActions(QAction*,QList&lt;QAction*&gt;)">
+        <modify-argument index="2">
+            <reference-count action="add" variable-name="__rcActions"/>
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="removeAction(QAction*)">
+        <modify-argument index="1">
+            <reference-count action="remove" variable-name="__rcActions"/>
+        </modify-argument>
+    </modify-function>
+
+
     <modify-function signature="changeEvent(QEvent*)">
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
@@ -5327,7 +5509,7 @@
     <modify-function signature="windowFrameEvent(QEvent*)">
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
-        
+
     <modify-function signature="setStyle(QStyle*)">
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcStyle"/>
@@ -5339,14 +5521,14 @@
         </modify-argument>
         <modify-argument index="2">
             <reference-count action="ignore"/>
-        </modify-argument>        
+        </modify-argument>
     </modify-function>
   </object-type>
   <object-type name="QPlainTextDocumentLayout"/>
   <object-type name="QPlainTextEdit">
     <modify-function signature="setDocument(QTextDocument*)">
         <modify-argument index="1">
-            <reference-count action="set" variable-name="__rcDocument"/>           
+            <reference-count action="set" variable-name="__rcDocument"/>
         </modify-argument>
     </modify-function>
     <modify-function signature="insertFromMimeData(const QMimeData*)">
@@ -5355,7 +5537,8 @@
         </modify-argument>
     </modify-function>
   </object-type>
-  <object-type name="QPrintPreviewDialog"/>
+  <object-type name="QPrintPreviewDialog">
+  </object-type>
   <object-type name="QPrintPreviewWidget"/>
   <object-type name="QStyledItemDelegate">
     <modify-function signature="setItemEditorFactory(QItemEditorFactory*)">
@@ -5372,42 +5555,101 @@
         <modify-argument index="1">
             <reference-count action="ignore"/>
         </modify-argument>
-    </modify-function>    
+    </modify-function>
   </object-type>
 
   <interface-type name="QAccessibleFactoryInterface" java-name="QAbstractAccessibleFactory"/>
   <interface-type name="QIconEngineFactoryInterfaceV2" java-name="QAbstractIconEngineFactoryV2"/>
-  <interface-type name="QImageIOHandlerFactoryInterface" java-name="QAbstractImageIOHandlerFactory"/>  
+  <interface-type name="QImageIOHandlerFactoryInterface" java-name="QAbstractImageIOHandlerFactory"/>
   <interface-type name="QInputContextFactoryInterface" java-name="QAbstractInputContextFactory"/>
   <interface-type name="QStyleFactoryInterface" java-name="QAbstractStyleFactory"/>
+  <interface-type name="QTextCodecFactoryInterface" java-name="QAbstractTextCodecFactory"/>
   <interface-type name="QPictureFormatInterface" java-name="QAbstractPictureFormat"/>
-  
+
   <object-type name="QIconEnginePluginV2"/>
-  <object-type name="QAccessiblePlugin"/>  
+  <object-type name="QAccessiblePlugin"/>
   <object-type name="QImageIOPlugin"/>
   <object-type name="QInputContextPlugin"/>
   <object-type name="QPictureFormatPlugin"/>
   <object-type name="QStylePlugin"/>
-     
+  <object-type name="QTextCodecPlugin"/>
+  <object-type name="QGesture"/>
+  <object-type name="QGraphicsAnchorLayout"/>
+  <object-type name="QGraphicsAnchor"/>
+  <object-type name="QGraphicsEffect"/>
+  <object-type name="QGraphicsObject">
+    <!-- Duplicate function to QObject::children() to override accidental shadowing which is not present in Jambi -->
+    <modify-function signature="children()const" remove="all"/>
+  </object-type>
+  <object-type name="QGraphicsOpacityEffect"/>
+  <object-type name="QGraphicsPixelizeEffect"/>
+  <object-type name="QGraphicsRotation"/>
+  <object-type name="QGraphicsScale"/>
+  <object-type name="QGraphicsTransform"/>
+  <object-type name="QPanGesture"/>
+  <object-type name="QPinchGesture"/>
+  <object-type name="QProxyStyle"/>
+  <object-type name="QSwipeGesture"/>
+  <object-type name="QTouchEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::TouchBegin || %1-&gt;type() == QEvent::TouchUpdate || %1-&gt;type() == QEvent::TouchEnd"/>
+  
+  <!-- Inefficient hash codes -->
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextFrame_iterator' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextTableCell' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextOption_Tab' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextLength' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextBlock_iterator' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextBlock' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextCursor' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPainterPath_Element' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPainterPath' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QItemSelection' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QKeySequence' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSizePolicy' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextFragment' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFontMetrics' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QGradient' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFontMetricsF' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextFormat' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>  
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QEasingCurve' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QGenericMatrix' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QMatrix4x4' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QMargins' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPixmapCache_Key' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QVector4D' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QQuaternion' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QVector2D' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QVector3D' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: private virtual function 'eventFilter(QObject * receiver, QEvent * event)' in 'QPanGesture'"/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: private virtual function 'event(QEvent * event)' in 'QPanGesture'"/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: private virtual function 'eventFilter(QObject * receiver, QEvent * event)' in 'QSwipeGesture'"/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: private virtual function 'eventFilter(QObject * receiver, QEvent * event)' in 'QPinchGesture'"/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: private virtual function 'event(QEvent * event)' in 'QPinchGesture'"/>
+  
+  <!-- Intentional omissions. See explanation for QtJambiTextObjectInterface class in typesystem and headers. -->
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: class 'QTextObjectInterface' inherits from unknown base class 'QTextObjectInterface'"/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: unknown interface for 'QTextObjectInterface': 'QTextObjectInterfaceInterface'"/>
+
+  <suppress-warning text="WARNING(MetaInfoGenerator) :: class 'QPixmapFilter' inherits from polymorphic class 'QPixmapFilter', but has no polymorphic id set"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QPixmap::QPixmap', unmatched parameter type 'QPixmapData*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private&amp;'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private\*'"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private const\*'"/>  
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*Private const\*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QTextEngine\*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QFontEngine\*'"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QPixmap::Type'"/>  
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QInputDialog::Type'"/>  
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QTextFrameLayoutData\*'"/>  
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QPixmap::Type'"/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QInputDialog::Type'"/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QTextFrameLayoutData\*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QAbstractUndoItem\*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type '*QImageTextKeyLang*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: non-public function '*' in interface '*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: hiding of function '*' in class '*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value 'QVector&lt;FormatRange&gt;()' of argument in function '*', class '*'"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value 'QVariantList()' of argument in function '*', class '*'"/>  
-  <suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'"/>  
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QTextLayout::QTextLayout', unmatched parameter type 'QTextEngine*'"/>    
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value of argument in function 'doAction', class 'QAccessibleInterface'"/>  
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value 'QVariantList()' of argument in function '*', class '*'"/>
+  <suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'"/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QTextLayout::QTextLayout', unmatched parameter type 'QTextEngine*'"/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value of argument in function 'doAction', class 'QAccessibleInterface'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QFileDialog::QFileDialog', unmatched parameter type 'QFileDialogArgs const&amp;'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: unsupported default value '0., 0., 1000000000., 1000000000.' of argument in function 'update', class 'QAbstractTextDocumentLayout'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWidget::windowSurface', unmatched return type 'QWindowSurface*'"/>
@@ -5419,40 +5661,12 @@
   <suppress-warning text="WARNING(MetaInfoGenerator) :: class 'QInputEvent' inherits from polymorphic class 'QEvent', but has no polymorphic id set"/>
   <suppress-warning text="WARNING(JavaGenerator) :: either add or remove specified for reference count variable '__rcMenus' in 'com.trolltech.qt.gui.QMenu' but not both"/>
   <suppress-warning text="WARNING(JavaGenerator) :: either add or remove specified for reference count variable '__rcMenus' in 'com.trolltech.qt.gui.QMenuBar' but not both"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QBrush' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextFrame_iterator' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QRegion' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPolygon' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextTableCell' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextLength' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPalette' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextBlock_iterator' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextBlock' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextCursor' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFont' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QMatrix' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPen' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QColor' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTransform' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPainterPath_Element' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPainterPath' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QItemSelection' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QKeySequence' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QLine' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QPolygonF' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSizePolicy' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextFragment' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFontMetrics' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QGradient' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QFontMetricsF' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextFormat' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QLineF' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QImage' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkCookie' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkRequest' has equals operators but no qHash() function"/>
+
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QPixmap::pixmapData', unmatched return type 'QPixmapData*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: object type 'QAccessible' extended by interface type 'QAbstractAccessibleFactory'. The resulting API will be less expressive than the original."/>
 
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QTextOption_Tab' has equals operators but no qHash() function"/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Rejected enum has no alternative...: QPalette::NColorRoles"/>
+
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'QtSharedPointer' does not have a type entry"/>
 
 </typesystem>
diff --git a/generator/typesystem_network-common.xml b/generator/typesystem_network-common.xml
index e5f45b5..be475ba 100644
--- a/generator/typesystem_network-common.xml
+++ b/generator/typesystem_network-common.xml
@@ -2,11 +2,14 @@
   <namespace-type name="QSsl">
     <include file-name="qssl.h" location="global" />
   </namespace-type>
-  
+
+  <enum-type name="QNetworkProxy::Capability" flags="QNetworkProxy::Capabilities" />
   <enum-type name="QAbstractSocket::NetworkLayerProtocol" />
+  <enum-type name="QNetworkProxyQuery::QueryType" />
   <enum-type name="QAbstractSocket::SocketError" />
   <enum-type name="QAbstractSocket::SocketState" />
   <enum-type name="QAbstractSocket::SocketType" />
+  <enum-type name="QAbstractSocket::SocketOption" />
   <enum-type name="QFtp::Command" />
   <enum-type name="QFtp::Error" />
   <enum-type name="QFtp::State" />
@@ -17,12 +20,10 @@
   <enum-type name="QHttp::State" />
   <enum-type name="QHttp::ConnectionMode" />
   <enum-type name="QNetworkInterface::InterfaceFlag" flags="QNetworkInterface::InterfaceFlags" />
-  <enum-type name="QNetworkProxy::Capability" flags="QNetworkProxy::Capabilities" />
   <enum-type name="QNetworkProxy::ProxyType" />
-  <enum-type name="QNetworkProxyQuery::QueryType" />
   <enum-type name="QUdpSocket::BindFlag" flags="QUdpSocket::BindMode" />
   <enum-type name="QUrlInfo::PermissionSpec" />
-  <enum-type name="QHostInfo::HostInfoError" />    
+  <enum-type name="QHostInfo::HostInfoError" />
   <enum-type name="QSsl::KeyType" />
   <enum-type name="QSsl::EncodingFormat" />
   <enum-type name="QSsl::KeyAlgorithm"/>
@@ -37,19 +38,42 @@
   <enum-type name="QNetworkRequest::CacheLoadControl" />
   <enum-type name="QNetworkRequest::KnownHeaders" />
 
-  <object-type name="QAbstractNetworkCache">
+  <object-type name="QAbstractNetworkCache" />
+  <object-type name="QNetworkDiskCache">
+    <modify-function signature="insert(QIODevice*)">
+        <modify-argument index="1">
+            <reference-count action="ignore" /> <!-- function only has effect on devices retrieved using prepare() -->
+        </modify-argument>
+    </modify-function>
   </object-type>
+  <value-type name="QNetworkCacheMetaData">
+    <modify-function signature="operator=(QNetworkCacheMetaData)" remove="all" />
+  </value-type>
 
-  <object-type name="QAbstractSocket" />
+  <object-type name="QNetworkProxyFactory">
+    <modify-function signature="setApplicationProxyFactory(QNetworkProxyFactory*)">
+        <modify-argument index="1">
+            <define-ownership class="java" owner="c++" />
+        </modify-argument>
+    </modify-function>
+  </object-type>
+  <value-type name="QNetworkProxyQuery" >
+    <modify-function signature="operator=(QNetworkProxyQuery)" remove="all" />
+  </value-type>
+
+  <object-type name="QAbstractSocket">
+    <modify-function signature="setSocketOption(QAbstractSocket::SocketOption, const QVariant)" remove="all" />
+    <modify-function signature="socketOption(QAbstractSocket::SocketOption)" remove="all"/>
+  </object-type>
   <object-type name="QFtp" />
 
   <object-type name="QHttp">
       <modify-function signature="closeConnection()" remove="all"/>
   </object-type>
   <object-type name="QTcpServer" />
-  <object-type name="QTcpSocket" />  
+  <object-type name="QTcpSocket" />
   <object-type name="QUdpSocket" />
-    
+
   <object-type name="QHttpHeader">
     <modify-function signature="operator=(QHttpHeader)" remove="all"/>
   </object-type>
@@ -61,6 +85,16 @@
             <define-ownership class="java" owner="c++" />
         </modify-argument>
     </modify-function>
+    <modify-function signature="setCache(QAbstractNetworkCache*)">
+        <modify-argument index="1">
+            <reference-count action="ignore" />
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="setProxyFactory(QNetworkProxyFactory*)">
+        <modify-argument index="1">
+            <define-ownership class="java" owner="c++" />
+        </modify-argument>
+    </modify-function>
   </object-type>
   <object-type name="QNetworkCookieJar" />
   <object-type name="QNetworkReply" />
@@ -70,11 +104,11 @@
     <modify-function signature="setAddress(unsigned char*)" remove="all"/>
     <modify-function signature="operator=(QString)" remove="all"/>
     <modify-function signature="operator=(QHostAddress)" remove="all"/>
-  </value-type>  
+  </value-type>
 
   <value-type name="QHostInfo">
         <modify-function signature="operator=(QHostInfo)" remove="all"/>
-        <modify-function signature="lookupHost(QString,QObject*,const char*)" access="private" />        
+        <modify-function signature="lookupHost(QString,QObject*,const char*)" access="private" />
   </value-type>
 
   <value-type name="QHttpRequestHeader">
@@ -88,29 +122,15 @@
   <value-type name="QNetworkAddressEntry">
     <modify-function signature="operator=(QNetworkAddressEntry)" remove="all"/>
   </value-type>
-  
-  <value-type name="QNetworkCacheMetaData">
-    <modify-function signature="operator=(QNetworkCacheMetaData)" remove="all"/>
-    <extra-includes>
-        <include file-name="QDateTime" location="global"/>
-    </extra-includes>  
-  </value-type>
 
   <value-type name="QNetworkInterface">
     <modify-function signature="operator=(QNetworkInterface)" remove="all"/>
   </value-type>
-  
+
   <value-type name="QNetworkProxy">
     <modify-function signature="operator=(QNetworkProxy)" remove="all"/>
   </value-type>
 
-  <object-type name="QNetworkProxyFactory">
-  </object-type>
-
-  <value-type name="QNetworkProxyQuery">
-    <modify-function signature="operator=(QNetworkProxyQuery)" remove="all"/>
-  </value-type>
-
   <value-type name="QUrlInfo">
     <modify-function signature="operator=(QUrlInfo)" remove="all"/>
   </value-type>
@@ -121,9 +141,9 @@
     </modify-function>
     <modify-function signature="operator[](int)">
         <remove/>
-    </modify-function>    
+    </modify-function>
   </value-type>
-  
+
   <value-type name="QAuthenticator">
     <modify-function signature="operator=(QAuthenticator)" remove="all"/>
   </value-type>
@@ -146,17 +166,18 @@
   <value-type name="QSslConfiguration" />
 
   <object-type name="QSslSocket" />
-  
+
   <suppress-warning text="*unmatched parameter type 'sockaddr const*" />
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUrlInfo' has equals operators but no qHash() function" />
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QAuthenticator' has equals operators but no qHash() function" />
-
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSslKey' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSslError' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSslCertificate' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSslCipher' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSslConfiguration' has equals operators but no qHash() function"/>
-  
+
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUrlInfo' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkCacheMetaData' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkProxyQuery' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkAddressEntry' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkCookie' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkProxy' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkRequest' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QAuthenticator' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+
   <!-- For people building without SSL support -->
   <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.network.QSslSocket' for enum 'SslMode' is not declared" />
   <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslError' is specified in typesystem, but not defined. This could potentially lead to compilation errors." />
@@ -168,6 +189,6 @@
   <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.network.QSslCertificate' for enum 'SubjectInfo' is not declared"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslConfiguration' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslSocket' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
-  <!-- -->    
-  
+  <!-- -->
+
 </typesystem>
diff --git a/generator/typesystem_network.xml b/generator/typesystem_network.xml
index 58973c7..c635547 100644
--- a/generator/typesystem_network.xml
+++ b/generator/typesystem_network.xml
@@ -3,11 +3,14 @@
   <namespace-type name="QSsl">
     <include file-name="qssl.h" location="global"/>
   </namespace-type>
-  
+
+  <enum-type name="QNetworkProxy::Capability" flags="QNetworkProxy::Capabilities"/>
   <enum-type name="QAbstractSocket::NetworkLayerProtocol"/>
+  <enum-type name="QNetworkProxyQuery::QueryType"/>
   <enum-type name="QAbstractSocket::SocketError"/>
   <enum-type name="QAbstractSocket::SocketState"/>
   <enum-type name="QAbstractSocket::SocketType"/>
+  <enum-type name="QAbstractSocket::SocketOption"/>
   <enum-type name="QFtp::Command"/>
   <enum-type name="QFtp::Error"/>
   <enum-type name="QFtp::State"/>
@@ -18,12 +21,10 @@
   <enum-type name="QHttp::State"/>
   <enum-type name="QHttp::ConnectionMode"/>
   <enum-type name="QNetworkInterface::InterfaceFlag" flags="QNetworkInterface::InterfaceFlags"/>
-  <enum-type name="QNetworkProxy::Capability" flags="QNetworkProxy::Capabilities"/>
   <enum-type name="QNetworkProxy::ProxyType"/>
-  <enum-type name="QNetworkProxyQuery::QueryType"/>
   <enum-type name="QUdpSocket::BindFlag" flags="QUdpSocket::BindMode"/>
   <enum-type name="QUrlInfo::PermissionSpec"/>
-  <enum-type name="QHostInfo::HostInfoError"/>    
+  <enum-type name="QHostInfo::HostInfoError"/>
   <enum-type name="QSsl::KeyType"/>
   <enum-type name="QSsl::EncodingFormat"/>
   <enum-type name="QSsl::KeyAlgorithm"/>
@@ -38,10 +39,33 @@
   <enum-type name="QNetworkRequest::CacheLoadControl"/>
   <enum-type name="QNetworkRequest::KnownHeaders"/>
 
-  <object-type name="QAbstractNetworkCache">
+  <object-type name="QAbstractNetworkCache"/>
+  <object-type name="QNetworkDiskCache">
+    <modify-function signature="insert(QIODevice*)">
+        <modify-argument index="1">
+            <reference-count action="ignore"/> <!-- function only has effect on devices retrieved using prepare() -->
+        </modify-argument>
+    </modify-function>
   </object-type>
+  <value-type name="QNetworkCacheMetaData">
+    <modify-function signature="operator=(QNetworkCacheMetaData)" remove="all"/>
+  </value-type>
 
-  <object-type name="QAbstractSocket"/>
+  <object-type name="QNetworkProxyFactory">
+    <modify-function signature="setApplicationProxyFactory(QNetworkProxyFactory*)">
+        <modify-argument index="1">
+            <define-ownership class="java" owner="c++"/>
+        </modify-argument>
+    </modify-function>
+  </object-type>
+  <value-type name="QNetworkProxyQuery">
+    <modify-function signature="operator=(QNetworkProxyQuery)" remove="all"/>
+  </value-type>
+
+  <object-type name="QAbstractSocket">
+    <modify-function signature="setSocketOption(QAbstractSocket::SocketOption, const QVariant)" remove="all"/>
+    <modify-function signature="socketOption(QAbstractSocket::SocketOption)" remove="all"/>
+  </object-type>
   <object-type name="QFtp"/>
 
   <object-type name="QHttp">
@@ -54,11 +78,11 @@
       </modify-argument>
     </modify-function>
   </object-type>
-  <object-type name="QTcpSocket"/>  
+  <object-type name="QTcpSocket"/>
   <object-type name="QUdpSocket">
     <modify-function signature="writeDatagram(const char*,qint64,QHostAddress,unsigned short)" remove="all"/>
   </object-type>
-    
+
   <object-type name="QHttpHeader">
     <modify-function signature="operator=(QHttpHeader)" remove="all"/>
   
@@ -78,6 +102,16 @@
             <define-ownership class="java" owner="c++"/>
         </modify-argument>
     </modify-function>
+    <modify-function signature="setCache(QAbstractNetworkCache*)">
+        <modify-argument index="1">
+            <reference-count action="ignore"/>
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="setProxyFactory(QNetworkProxyFactory*)">
+        <modify-argument index="1">
+            <define-ownership class="java" owner="c++"/>
+        </modify-argument>
+    </modify-function>
   </object-type>
   <object-type name="QNetworkCookieJar"/>
   <object-type name="QNetworkReply"/>
@@ -87,11 +121,11 @@
     <modify-function signature="setAddress(unsigned char*)" remove="all"/>
     <modify-function signature="operator=(QString)" remove="all"/>
     <modify-function signature="operator=(QHostAddress)" remove="all"/>
-  </value-type>  
+  </value-type>
 
   <value-type name="QHostInfo">
         <modify-function signature="operator=(QHostInfo)" remove="all"/>
-        <modify-function signature="lookupHost(QString,QObject*,const char*)" access="private"/>        
+        <modify-function signature="lookupHost(QString,QObject*,const char*)" access="private"/>
   
     <modify-function signature="lookupHost(QString,QObject*,const char*)">
       <modify-argument index="3">
@@ -114,29 +148,15 @@
   <value-type name="QNetworkAddressEntry">
     <modify-function signature="operator=(QNetworkAddressEntry)" remove="all"/>
   </value-type>
-  
-  <value-type name="QNetworkCacheMetaData">
-    <modify-function signature="operator=(QNetworkCacheMetaData)" remove="all"/>
-    <extra-includes>
-        <include file-name="QDateTime" location="global"/>
-    </extra-includes>  
-  </value-type>
 
   <value-type name="QNetworkInterface">
     <modify-function signature="operator=(QNetworkInterface)" remove="all"/>
   </value-type>
-  
+
   <value-type name="QNetworkProxy">
     <modify-function signature="operator=(QNetworkProxy)" remove="all"/>
   </value-type>
 
-  <object-type name="QNetworkProxyFactory">
-  </object-type>
-
-  <value-type name="QNetworkProxyQuery">
-    <modify-function signature="operator=(QNetworkProxyQuery)" remove="all"/>
-  </value-type>
-
   <value-type name="QUrlInfo">
     <modify-function signature="operator=(QUrlInfo)" remove="all"/>
   </value-type>
@@ -147,9 +167,9 @@
     </modify-function>
     <modify-function signature="operator[](int)">
         <remove/>
-    </modify-function>    
+    </modify-function>
   </value-type>
-  
+
   <value-type name="QAuthenticator">
     <modify-function signature="operator=(QAuthenticator)" remove="all"/>
   </value-type>
@@ -180,17 +200,18 @@
   <value-type name="QSslConfiguration"/>
 
   <object-type name="QSslSocket"/>
-  
+
   <suppress-warning text="*unmatched parameter type 'sockaddr const*"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUrlInfo' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QAuthenticator' has equals operators but no qHash() function"/>
-
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSslKey' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSslError' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSslCertificate' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSslCipher' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSslConfiguration' has equals operators but no qHash() function"/>
-  
+
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QUrlInfo' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkCacheMetaData' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkProxyQuery' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkAddressEntry' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkCookie' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkProxy' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QNetworkRequest' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QAuthenticator' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+
   <!-- For people building without SSL support -->
   <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.network.QSslSocket' for enum 'SslMode' is not declared"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslError' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
@@ -202,6 +223,6 @@
   <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.network.QSslCertificate' for enum 'SubjectInfo' is not declared"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslConfiguration' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSslSocket' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
-  <!-- -->    
-  
+  <!-- -->
+
 </typesystem>
diff --git a/generator/typesystem_opengl-common.xml b/generator/typesystem_opengl-common.xml
index 585938d..9a171ba 100644
--- a/generator/typesystem_opengl-common.xml
+++ b/generator/typesystem_opengl-common.xml
@@ -1,16 +1,19 @@
 <?xml-stylesheet type="text/xsl" href="merge.xsl"?>
 <typesystem>
   <rejection class="QGLColormap::QGLColormapData" />
-  <rejection class="QGLWidget" function-name="setMouseTracking"/>  
-  
+  <rejection class="QGLWidget" function-name="setMouseTracking"/>
+
   <enum-type name="QGL::FormatOption" flags="QGL::FormatOptions"/>
   <enum-type name="QGLFormat::OpenGLVersionFlag" flags="QGLFormat::OpenGLVersionFlags"/>
   <enum-type name="QGLFramebufferObject::Attachment" />
+  <enum-type name="QGLContext::BindOption" flags="QGLContext::BindOptions" />
+  <enum-type name="QGLShader::ShaderTypeBit" flags="QGLShader::ShaderType"/>
+
 
   <namespace-type name="QGL">
      <include file-name="qgl.h" location="global"/>
   </namespace-type>
-  
+
   <value-type name="QGLColormap">
     <modify-function signature="operator=(QGLColormap)" remove="all"/>
 
@@ -18,23 +21,49 @@
         <access modifier="private" />
     </modify-function>
   </value-type>
- 
+
   <value-type name="QGLFormat">
     <modify-function signature="operator=(QGLFormat)" remove="all"/>
   </value-type>
-  
-  <object-type name="QGLContext">  
-  
+
+  <value-type name="QGLFramebufferObjectFormat" />
+  <object-type name="QGLShader" />
+  <object-type name="QGLShaderProgram">
+    <!-- Should be disambiguated later by fixing the native pointer API -->
+    <modify-function signature="setAttributeArray(int, const QVector2D *, int)" rename="setAttributeArray_QVector2D" />
+    <modify-function signature="setAttributeArray(int, const QVector3D *, int)" rename="setAttributeArray_QVector3D" />
+    <modify-function signature="setAttributeArray(int, const QVector4D *, int)" rename="setAttributeArray_QVector4D" />
+    <modify-function signature="setAttributeArray(const char *, const QVector2D *, int)" rename="setAttributeArray_QVector2D" />
+    <modify-function signature="setAttributeArray(const char *, const QVector3D *, int)" rename="setAttributeArray_QVector3D" />
+    <modify-function signature="setAttributeArray(const char *, const QVector4D *, int)" rename="setAttributeArray_QVector4D" />
+    <modify-function signature="setUniformValueArray(int, const GLint *, int)" rename="setUniformValueArray_int" />
+    <modify-function signature="setUniformValueArray(int, const GLuint *, int)" rename="setUniformValueArray_uint" />
+    <modify-function signature="setUniformValueArray(int, const QVector2D *, int)" rename="setUniformValueArray_QVector2D" />
+    <modify-function signature="setUniformValueArray(int, const QVector3D *, int)" rename="setUniformValueArray_QVector3D" />
+    <modify-function signature="setUniformValueArray(int, const QVector4D *, int)" rename="setUniformValueArray_QVector4D" />
+    
+    <modify-function signature="setUniformValueArray(const char*, const GLint *, int)" rename="setUniformValueArray_int" />
+    <modify-function signature="setUniformValueArray(const char*, const GLuint *, int)" remove="all" />
+    <modify-function signature="setUniformValueArray(const char*, const QVector2D *, int)" rename="setUniformValueArray_QVector2D" />
+    <modify-function signature="setUniformValueArray(const char*, const QVector3D *, int)" rename="setUniformValueArray_QVector3D" />
+    <modify-function signature="setUniformValueArray(const char*, const QVector4D *, int)" rename="setUniformValueArray_QVector4D" />
+    <modify-function signature="setUniformValue(int, GLuint)" remove="all" />
+    <modify-function signature="setUniformValue(const char*, GLuint)" remove="all" />
+    <modify-function signature="setUniformValue(int, Array)" remove="all" />
+    <modify-function signature="setUniformValue(const char*, Array)" remove="all" />
+  </object-type>
+  <object-type name="QGLContext">
+
     <modify-function signature="chooseContext(const QGLContext*)">
         <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
     <modify-function signature="create(const QGLContext*)">
         <modify-argument index="1" invalidate-after-use="yes" />
     </modify-function>
-  
+
     <modify-function signature="getProcAddress(QString)const">
         <remove />
-    </modify-function>    
+    </modify-function>
     <modify-field name="currentCtx" read="false" write="false" />
     <modify-function signature="setDevice(QPaintDevice*)">
         <remove />
@@ -57,13 +86,14 @@
     </modify-function>
     <modify-function signature="fontDisplayListBase(QFont, int)" remove="all"/>
     <modify-function signature="setFormat(QGLFormat)" remove="all"/>
-  </object-type>  
- 
+  </object-type>
+
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QGLFormat' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QGLFramebufferObjectFormat' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
 
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QGLColormap::QGLColormapData\*'" />
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'" />  
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'" />
   <suppress-warning text="WARNING(MetaJavaBuilder) :: hiding of function '*' in class '*'" />
   <suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'" />
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QGLFormat' has equals operators but no qHash() function" />
-  
+
 </typesystem>
diff --git a/generator/typesystem_opengl.xml b/generator/typesystem_opengl.xml
index 82dd00b..73b9d42 100644
--- a/generator/typesystem_opengl.xml
+++ b/generator/typesystem_opengl.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0"?>
 <typesystem package="com.trolltech.qt.opengl"><rejection class="QGL"/><rejection class="QGLFormat"/>
   <rejection class="QGLColormap::QGLColormapData"/>
-  <rejection class="QGLWidget" function-name="setMouseTracking"/>  
-  
+  <rejection class="QGLWidget" function-name="setMouseTracking"/>
+
   <enum-type name="QGL::FormatOption" flags="QGL::FormatOptions"/>
   <enum-type name="QGLFormat::OpenGLVersionFlag" flags="QGLFormat::OpenGLVersionFlags"/>
   <enum-type name="QGLFramebufferObject::Attachment"/>
+  <enum-type name="QGLContext::BindOption" flags="QGLContext::BindOptions"/>
+  <enum-type name="QGLShader::ShaderTypeBit" flags="QGLShader::ShaderType"/>
+
 
   <namespace-type name="QGL">
      <include file-name="qgl.h" location="global"/>
   </namespace-type>
-  
+
   <value-type name="QGLColormap">
     <modify-function signature="operator=(QGLColormap)" remove="all"/>
 
@@ -18,23 +21,49 @@
         <access modifier="private"/>
     </modify-function>
   </value-type>
- 
+
   <value-type name="QGLFormat">
     <modify-function signature="operator=(QGLFormat)" remove="all"/>
   </value-type>
-  
-  <object-type name="QGLContext">  
-  
+
+  <value-type name="QGLFramebufferObjectFormat"/>
+  <object-type name="QGLShader"/>
+  <object-type name="QGLShaderProgram">
+    <!-- Should be disambiguated later by fixing the native pointer API -->
+    <modify-function signature="setAttributeArray(int, const QVector2D *, int)" rename="setAttributeArray_QVector2D"/>
+    <modify-function signature="setAttributeArray(int, const QVector3D *, int)" rename="setAttributeArray_QVector3D"/>
+    <modify-function signature="setAttributeArray(int, const QVector4D *, int)" rename="setAttributeArray_QVector4D"/>
+    <modify-function signature="setAttributeArray(const char *, const QVector2D *, int)" rename="setAttributeArray_QVector2D"/>
+    <modify-function signature="setAttributeArray(const char *, const QVector3D *, int)" rename="setAttributeArray_QVector3D"/>
+    <modify-function signature="setAttributeArray(const char *, const QVector4D *, int)" rename="setAttributeArray_QVector4D"/>
+    <modify-function signature="setUniformValueArray(int, const GLint *, int)" rename="setUniformValueArray_int"/>
+    <modify-function signature="setUniformValueArray(int, const GLuint *, int)" rename="setUniformValueArray_uint"/>
+    <modify-function signature="setUniformValueArray(int, const QVector2D *, int)" rename="setUniformValueArray_QVector2D"/>
+    <modify-function signature="setUniformValueArray(int, const QVector3D *, int)" rename="setUniformValueArray_QVector3D"/>
+    <modify-function signature="setUniformValueArray(int, const QVector4D *, int)" rename="setUniformValueArray_QVector4D"/>
+    
+    <modify-function signature="setUniformValueArray(const char*, const GLint *, int)" rename="setUniformValueArray_int"/>
+    <modify-function signature="setUniformValueArray(const char*, const GLuint *, int)" remove="all"/>
+    <modify-function signature="setUniformValueArray(const char*, const QVector2D *, int)" rename="setUniformValueArray_QVector2D"/>
+    <modify-function signature="setUniformValueArray(const char*, const QVector3D *, int)" rename="setUniformValueArray_QVector3D"/>
+    <modify-function signature="setUniformValueArray(const char*, const QVector4D *, int)" rename="setUniformValueArray_QVector4D"/>
+    <modify-function signature="setUniformValue(int, GLuint)" remove="all"/>
+    <modify-function signature="setUniformValue(const char*, GLuint)" remove="all"/>
+    <modify-function signature="setUniformValue(int, Array)" remove="all"/>
+    <modify-function signature="setUniformValue(const char*, Array)" remove="all"/>
+  </object-type>
+  <object-type name="QGLContext">
+
     <modify-function signature="chooseContext(const QGLContext*)">
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
     <modify-function signature="create(const QGLContext*)">
         <modify-argument index="1" invalidate-after-use="yes"/>
     </modify-function>
-  
+
     <modify-function signature="getProcAddress(QString)const">
         <remove/>
-    </modify-function>    
+    </modify-function>
     <modify-field name="currentCtx" read="false" write="false"/>
     <modify-function signature="setDevice(QPaintDevice*)">
         <remove/>
@@ -57,13 +86,14 @@
     </modify-function>
     <modify-function signature="fontDisplayListBase(QFont, int)" remove="all"/>
     <modify-function signature="setFormat(QGLFormat)" remove="all"/>
-  </object-type>  
- 
+  </object-type>
+
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QGLFormat' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QGLFramebufferObjectFormat' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
 
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QGLColormap::QGLColormapData\*'"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'"/>  
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: hiding of function '*' in class '*'"/>
   <suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QGLFormat' has equals operators but no qHash() function"/>
-  
+
 </typesystem>
diff --git a/generator/typesystem_phonon-common.xml b/generator/typesystem_phonon-common.xml
index 431b572..cd36be0 100644
--- a/generator/typesystem_phonon-common.xml
+++ b/generator/typesystem_phonon-common.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <typesystem>
-    
+
     <rejection class="Phonon::ObjectDescriptionData" />
     <rejection class="Phonon::ObjectDescriptionModelData" />
     <rejection class="Phonon::MediaNodeDestructionHandler" />
@@ -9,19 +9,15 @@
     <rejection class="Phonon::Factory" />
     <rejection class="Phonon::Experimental" />
     <rejection class="Phonon::ObjectDescriptionModel" />
-    <rejection class="AudioOutputAdaptor" />    
+    <rejection class="Phonon::BackendCapabilities::Notifier" />
+    <rejection class="AudioOutputAdaptor" />
     <rejection class="*" field-name="k_ptr" />
-    
     <rejection class="Phonon::AudioOutputInterface40" />
     <rejection class="Phonon::AudioOutputInterface42" />
-    <rejection class="Phonon::AudioOutputInterface" />
 
     <namespace-type name="Phonon" />
     <namespace-type name="Phonon::BackendCapabilities" java-name="BackendCapabilities" />
 
-    <!-- ### causes moc-related linker error -->
-    <!-- <object-type name="Phonon::BackendCapabilities::Notifier" java-name="Notifier" /> -->
-    
     <enum-type name="Phonon::Category">
         <reject-enum-value name="LastCategory" />
     </enum-type>
@@ -32,7 +28,7 @@
     <enum-type name="Phonon::MetaData" />
     <enum-type name="Phonon::ObjectDescriptionType" />
     <enum-type name="Phonon::State" />
-    
+
     <enum-type name="Phonon::AddonInterface::AngleCommand" />
     <enum-type name="Phonon::AddonInterface::ChapterCommand" />
     <enum-type name="Phonon::AddonInterface::Interface" />
@@ -44,16 +40,14 @@
     <enum-type name="Phonon::MediaSource::Type" />
     <enum-type name="Phonon::VideoWidget::AspectRatio" />
     <enum-type name="Phonon::VideoWidget::ScaleMode" />
-    <enum-type name="Phonon::VolumeFaderEffect::FadeCurve" />                         
+    <enum-type name="Phonon::VolumeFaderEffect::FadeCurve" />
 
     <interface-type name="Phonon::AbstractVideoOutput" java-name="AbstractVideoOutput" />
     <interface-type name="Phonon::AddonInterface" java-name="AbstractAddon" />
-    <!-- ### causes compile error with Qt 4.5, the functions in the class aren't picked up by the typesystem -->
-<!--    <interface-type name="Phonon::AudioOutputInterface" java-name="AudioOutputInterface" /> -->
     <interface-type name="Phonon::BackendInterface" java-name="AbstractBackend" />
     <interface-type name="Phonon::EffectInterface" java-name="AbstractEffect" />
     <interface-type name="Phonon::MediaNode" java-name="MediaNode" />
-    
+
     <interface-type name="Phonon::MediaObjectInterface" java-name="AbstractMediaObject" />
     <interface-type name="Phonon::PlatformPlugin" java-name="PlatformPlugin" />
     <interface-type name="Phonon::StreamInterface" java-name="AbstractStream" />
@@ -88,7 +82,7 @@
             <modify-argument index="2">
                 <reference-count action="ignore" />
             </modify-argument>
-        </modify-function>        
+        </modify-function>
         <modify-function signature="removeEffect(Phonon::Effect*)">
             <modify-argument index="1">
                 <reference-count action="remove" variable-name="__rcEffects" />
@@ -98,9 +92,6 @@
     <value-type name="Phonon::ObjectDescription" generate="no" />
     <value-type name="Phonon::EffectDescription" java-name="EffectDescription" />
     <value-type name="Phonon::AudioOutputDevice" java-name="AudioOutputDevice" />
-    <value-type name="Phonon::AudioChannelDescription" java-name="AudioChannelDescription" />
-    <value-type name="Phonon::SubtitleDescription" java-name="SubtitleDescription" />
-    <value-type name="Phonon::AudioCaptureDevice"  java-name="AudioCaptureDevice" />
 
     <object-type name="Phonon::AbstractAudioOutput" java-name="AbstractAudioOutput" />
     <object-type name="Phonon::AbstractMediaStream" java-name="AbstractMediaStream" />
@@ -108,7 +99,7 @@
     <object-type name="Phonon::Effect" java-name="Effect" />
     <object-type name="Phonon::EffectWidget" java-name="EffectWidget" />
     <object-type name="Phonon::MediaController" java-name="MediaController" />
-    <object-type name="Phonon::MediaObject" java-name="MediaObject">     
+    <object-type name="Phonon::MediaObject" java-name="MediaObject">
         <modify-function signature="enqueue(const QList&lt;QUrl&gt; &amp;)" rename="enqueueUrls" />
         <modify-function signature="setQueue(const QList&lt;QUrl&gt; &amp;)" rename="setQueueToUrls" />
     </object-type>
@@ -129,19 +120,28 @@
             </modify-argument>
         </modify-function>
     </object-type>
+    
+     <value-type name="Phonon::AudioChannelDescription" java-name="AudioChannelDescription" />
+     <value-type name="Phonon::SubtitleDescription" java-name="SubtitleDescription" />
+     <value-type name="Phonon::AudioCaptureDevice"  java-name="AudioCaptureDevice" />
 
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'MediaSource' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'Path' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'Phonon_ObjectDescription' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'EffectParameter' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'EffectDescription' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'SubtitleDescription' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'AudioCaptureDevice' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'AudioOutputDevice' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'AudioChannelDescription' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  
     <suppress-warning text="WARNING(MetaJavaBuilder) :: Final class 'AbstractAudioOutput' set to non-final, as it is extended by other classes" />
     <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'QDBus' does not have a type entry" />
     <suppress-warning text="WARNING(MetaJavaBuilder) :: private virtual function 'create(const QString &amp; name)' in 'QTextCodecPlugin'" />
     <suppress-warning text="WARNING(MetaJavaBuilder) :: private virtual function 'keys() const' in 'QTextCodecPlugin'" />
-    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'MediaSource' has equals operators but no qHash() function" />
-    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'Path' has equals operators but no qHash() function" />
-    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'EffectParameter' has equals operators but no qHash() function" />
-    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'Phonon_ObjectDescription' has equals operators but no qHash() function" />
-    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'EffectDescription' has equals operators but no qHash() function" />
-    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'AudioOutputDevice' has equals operators but no qHash() function" />
     <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'Phonon::operator&lt;&lt;', unmatched return type 'QDebug'" />
     <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'Phonon::ObjectDescription::ObjectDescription', unmatched parameter type 'QExplicitlySharedDataPointer&lt;ObjectDescriptionData&gt; const&amp;'" />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'Phonon::BackendCapabilities::notifier', unmatched return type 'Phonon::BackendCapabilities::Notifier*'" />
 
 
 
@@ -200,6 +200,8 @@
   <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'Phonon::AbstractVideoOutput' is specified in typesystem, but not defined. This could potentially lead to compilation errors." />
   <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'Phonon::EffectWidget' is specified in typesystem, but not defined. This could potentially lead to compilation errors." />
   <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'Phonon::VolumeFaderInterface' is specified in typesystem, but not defined. This could potentially lead to compilation errors." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.phonon.AbstractAddon' for enum 'AudioChannelCommand' is not declared"/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.phonon.AbstractAddon' for enum 'SubtitleCommand' is not declared"/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'Phonon::qHash', unmatched return type ''" />
 
-  
 </typesystem>
diff --git a/generator/typesystem_sql-common.xml b/generator/typesystem_sql-common.xml
index b88e123..63f8a54 100644
--- a/generator/typesystem_sql-common.xml
+++ b/generator/typesystem_sql-common.xml
@@ -6,7 +6,7 @@
   <namespace-type name="QSql">
      <include file-name="qsql.h" location="global" />
   </namespace-type>
-  
+
   <value-type name="QSqlDatabase">
     <extra-includes>
         <include file-name="QSqlQuery" location="global" />
@@ -15,9 +15,9 @@
         <include file-name="QSqlRecord" location="global" />
         <include file-name="QStringList" location="global" />
         <include file-name="QSize" location="global" />
-    </extra-includes>  
+    </extra-includes>
     <modify-function signature="operator=(QSqlDatabase)" remove="all"/>
-  </value-type>  
+  </value-type>
 
   <value-type name="QSqlQuery">
     <extra-includes>
@@ -25,9 +25,9 @@
         <include file-name="QSqlRecord" location="global" />
         <include file-name="QStringList" location="global" />
         <include file-name="QSize" location="global" />
-    </extra-includes>  
+    </extra-includes>
     <modify-function signature="operator=(QSqlQuery)" remove="all"/>
-  </value-type>  
+  </value-type>
 
   <value-type name="QSqlRecord">
     <extra-includes>
@@ -41,7 +41,7 @@
     <modify-function signature="operator=(QSqlError)" remove="all"/>
   </value-type>
 
-  <value-type name="QSqlIndex">  
+  <value-type name="QSqlIndex">
     <modify-function signature="operator=(QSqlIndex)" remove="all"/>
   </value-type>
 
@@ -49,9 +49,9 @@
 
   <value-type name="QSqlField">
     <modify-function signature="operator=(QSqlField)" remove="all"/>
-  </value-type>  
-  
-  <object-type name="QSqlDriver">  
+  </value-type>
+
+  <object-type name="QSqlDriver">
     <extra-includes>
         <include file-name="QSqlQuery" location="global" />
         <include file-name="QSqlError" location="global" />
@@ -59,10 +59,10 @@
         <include file-name="QSqlRecord" location="global" />
         <include file-name="QStringList" location="global" />
         <include file-name="QSize" location="global" />
-    </extra-includes>  
-  </object-type>  
-  
-  <object-type name="QSqlQueryModel">    
+    </extra-includes>
+  </object-type>
+
+  <object-type name="QSqlQueryModel">
     <modify-function signature="indexInQuery(QModelIndex)const" access="non-final"/>
     <modify-function signature="setQuery(QSqlQuery)" access="non-final"/>
     <extra-includes>
@@ -71,13 +71,13 @@
         <include file-name="QSqlRecord" location="global" />
         <include file-name="QStringList" location="global" />
         <include file-name="QSize" location="global" />
-    </extra-includes>  
-  </object-type>      
+    </extra-includes>
+  </object-type>
   <object-type name="QSqlRelationalTableModel">
     <extra-includes>
         <include file-name="QStringList" location="global" />
         <include file-name="QSize" location="global" />
-    </extra-includes>  
+    </extra-includes>
   </object-type>
   <object-type name="QSqlResult">
       <extra-includes>
@@ -90,21 +90,21 @@
       <modify-function signature="virtual_hook(int,void*)">
         <remove />
       </modify-function>
-      
+
   </object-type>
-  <object-type name="QSqlTableModel">  
+  <object-type name="QSqlTableModel">
     <extra-includes>
         <include file-name="QSqlIndex" location="global" />
         <include file-name="QStringList" location="global" />
         <include file-name="QSize" location="global" />
-    </extra-includes>  
-  </object-type>  
+    </extra-includes>
+  </object-type>
   <object-type name="QSqlDriverCreatorBase">
     <extra-includes>
         <include file-name="QSqlDriver" location="global" />
-    </extra-includes>    
+    </extra-includes>
   </object-type>
-  
+
   <enum-type name="QSql::Location" />
   <enum-type name="QSql::ParamTypeFlag" flags="QSql::ParamType" />
   <enum-type name="QSql::TableType" />
@@ -119,10 +119,11 @@
   <enum-type name="QSqlResult::VirtualHookOperation" />
   <enum-type name="QSqlTableModel::EditStrategy" />
 
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSqlField' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSqlRecord' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+
   <suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'" />
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'" />  
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: hiding of function '*' in class '*'" />    
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSqlField' has equals operators but no qHash() function" />
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSqlRecord' has equals operators but no qHash() function" />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'" />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: hiding of function '*' in class '*'" />
 
 </typesystem>
diff --git a/generator/typesystem_sql.xml b/generator/typesystem_sql.xml
index 4a54cbf..b21157a 100644
--- a/generator/typesystem_sql.xml
+++ b/generator/typesystem_sql.xml
@@ -7,7 +7,7 @@
   <namespace-type name="QSql">
      <include file-name="qsql.h" location="global"/>
   </namespace-type>
-  
+
   <value-type name="QSqlDatabase">
     <extra-includes>
         <include file-name="QSqlQuery" location="global"/>
@@ -16,9 +16,9 @@
         <include file-name="QSqlRecord" location="global"/>
         <include file-name="QStringList" location="global"/>
         <include file-name="QSize" location="global"/>
-    </extra-includes>  
+    </extra-includes>
     <modify-function signature="operator=(QSqlDatabase)" remove="all"/>
-  </value-type>  
+  </value-type>
 
   <value-type name="QSqlQuery">
     <extra-includes>
@@ -26,9 +26,9 @@
         <include file-name="QSqlRecord" location="global"/>
         <include file-name="QStringList" location="global"/>
         <include file-name="QSize" location="global"/>
-    </extra-includes>  
+    </extra-includes>
     <modify-function signature="operator=(QSqlQuery)" remove="all"/>
-  </value-type>  
+  </value-type>
 
   <value-type name="QSqlRecord">
     <extra-includes>
@@ -42,7 +42,7 @@
     <modify-function signature="operator=(QSqlError)" remove="all"/>
   </value-type>
 
-  <value-type name="QSqlIndex">  
+  <value-type name="QSqlIndex">
     <modify-function signature="operator=(QSqlIndex)" remove="all"/>
   </value-type>
 
@@ -50,9 +50,9 @@
 
   <value-type name="QSqlField">
     <modify-function signature="operator=(QSqlField)" remove="all"/>
-  </value-type>  
-  
-  <object-type name="QSqlDriver">  
+  </value-type>
+
+  <object-type name="QSqlDriver">
     <extra-includes>
         <include file-name="QSqlQuery" location="global"/>
         <include file-name="QSqlError" location="global"/>
@@ -60,10 +60,10 @@
         <include file-name="QSqlRecord" location="global"/>
         <include file-name="QStringList" location="global"/>
         <include file-name="QSize" location="global"/>
-    </extra-includes>  
-  </object-type>  
-  
-  <object-type name="QSqlQueryModel">    
+    </extra-includes>
+  </object-type>
+
+  <object-type name="QSqlQueryModel">
     <modify-function signature="indexInQuery(QModelIndex)const" access="non-final"/>
     <modify-function signature="setQuery(QSqlQuery)" access="non-final"/>
     <extra-includes>
@@ -72,13 +72,13 @@
         <include file-name="QSqlRecord" location="global"/>
         <include file-name="QStringList" location="global"/>
         <include file-name="QSize" location="global"/>
-    </extra-includes>  
-  </object-type>      
+    </extra-includes>
+  </object-type>
   <object-type name="QSqlRelationalTableModel">
     <extra-includes>
         <include file-name="QStringList" location="global"/>
         <include file-name="QSize" location="global"/>
-    </extra-includes>  
+    </extra-includes>
   </object-type>
   <object-type name="QSqlResult">
       <extra-includes>
@@ -91,21 +91,21 @@
       <modify-function signature="virtual_hook(int,void*)">
         <remove/>
       </modify-function>
-      
+
   </object-type>
-  <object-type name="QSqlTableModel">  
+  <object-type name="QSqlTableModel">
     <extra-includes>
         <include file-name="QSqlIndex" location="global"/>
         <include file-name="QStringList" location="global"/>
         <include file-name="QSize" location="global"/>
-    </extra-includes>  
-  </object-type>  
+    </extra-includes>
+  </object-type>
   <object-type name="QSqlDriverCreatorBase">
     <extra-includes>
         <include file-name="QSqlDriver" location="global"/>
-    </extra-includes>    
+    </extra-includes>
   </object-type>
-  
+
   <enum-type name="QSql::Location"/>
   <enum-type name="QSql::ParamTypeFlag" flags="QSql::ParamType"/>
   <enum-type name="QSql::TableType"/>
@@ -120,10 +120,11 @@
   <enum-type name="QSqlResult::VirtualHookOperation"/>
   <enum-type name="QSqlTableModel::EditStrategy"/>
 
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSqlField' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSqlRecord' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+
   <suppress-warning text="WARNING(CppImplGenerator) :: protected function '*' in final class '*'"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'"/>  
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: hiding of function '*' in class '*'"/>    
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSqlField' has equals operators but no qHash() function"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QSqlRecord' has equals operators but no qHash() function"/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: visibility of function '*' modified in class '*'"/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: hiding of function '*' in class '*'"/>
 
 </typesystem>
diff --git a/generator/typesystem_svg-common.xml b/generator/typesystem_svg-common.xml
index 98383e1..48fec61 100644
--- a/generator/typesystem_svg-common.xml
+++ b/generator/typesystem_svg-common.xml
@@ -2,23 +2,23 @@
    <namespace-type name="QSvg" />
 
   <enum-type name="QGraphicsSvgItem::enum_1"/>
-  
+
   <object-type name="QSvgRenderer">
     <extra-includes>
         <include file-name="QRectF" location="global" />
         <include file-name="QMatrix" location="global" />
         <include file-name="QSize" location="global" />
         <include file-name="QByteArray" location="global" />
-    </extra-includes>  
-  </object-type>  
-  
+    </extra-includes>
+  </object-type>
+
   <object-type name="QSvgWidget">
     <extra-includes>
         <include file-name="QByteArray" location="global" />
         <include file-name="QSvgRenderer" location="global" />
         <include file-name="QSize" location="global" />
-    </extra-includes>  
-  </object-type> 
+    </extra-includes>
+  </object-type>
 
   <object-type name="QSvgGenerator">
     <modify-function signature="setOutputDevice(QIODevice*)">
@@ -33,12 +33,12 @@
         <include file-name="QGraphicsItem" location="global" />
         <include file-name="QSvgRenderer" location="global" />
         <include file-name="QSize" location="global" />
-    </extra-includes> 
-      
+    </extra-includes>
+
     <modify-function signature="matrix()const" remove="all"/>
     <modify-function signature="resetMatrix()" remove="all"/>
     <modify-function signature="sceneMatrix()const" remove="all"/>
     <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/>
-  </object-type>
+ </object-type>
 
 </typesystem>
diff --git a/generator/typesystem_svg.xml b/generator/typesystem_svg.xml
index ea36362..e4270d0 100644
--- a/generator/typesystem_svg.xml
+++ b/generator/typesystem_svg.xml
@@ -3,23 +3,23 @@
    <namespace-type name="QSvg"/>
 
   <enum-type name="QGraphicsSvgItem::enum_1"/>
-  
+
   <object-type name="QSvgRenderer">
     <extra-includes>
         <include file-name="QRectF" location="global"/>
         <include file-name="QMatrix" location="global"/>
         <include file-name="QSize" location="global"/>
         <include file-name="QByteArray" location="global"/>
-    </extra-includes>  
-  </object-type>  
-  
+    </extra-includes>
+  </object-type>
+
   <object-type name="QSvgWidget">
     <extra-includes>
         <include file-name="QByteArray" location="global"/>
         <include file-name="QSvgRenderer" location="global"/>
         <include file-name="QSize" location="global"/>
-    </extra-includes>  
-  </object-type> 
+    </extra-includes>
+  </object-type>
 
   <object-type name="QSvgGenerator">
     <modify-function signature="setOutputDevice(QIODevice*)">
@@ -34,12 +34,12 @@
         <include file-name="QGraphicsItem" location="global"/>
         <include file-name="QSvgRenderer" location="global"/>
         <include file-name="QSize" location="global"/>
-    </extra-includes> 
-      
+    </extra-includes>
+
     <modify-function signature="matrix()const" remove="all"/>
     <modify-function signature="resetMatrix()" remove="all"/>
     <modify-function signature="sceneMatrix()const" remove="all"/>
     <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/>
-  </object-type>
+ </object-type>
 
 </typesystem>
diff --git a/generator/typesystem_webkit-common.xml b/generator/typesystem_webkit-common.xml
index fc5ab67..e7c0a91 100644
--- a/generator/typesystem_webkit-common.xml
+++ b/generator/typesystem_webkit-common.xml
@@ -5,15 +5,24 @@
     <enum-type name="QWebSettings::FontFamily"/>
     <enum-type name="QWebSettings::FontSize"/>
     <enum-type name="QWebSettings::WebGraphic"/>
-    <enum-type name="QWebSettings::WebAttribute"/>
-    <enum-type name="QWebPage::Extension"/>
+    <enum-type name="QWebSettings::WebAttribute">
+        <reject-enum-value name="LocalStorageEnabled" />
+    </enum-type>
+    <enum-type name="QWebPage::Extension" />
     <enum-type name="QWebPage::NavigationType"/>
     <enum-type name="QWebPage::WebAction"/>
     <enum-type name="QWebPage::WebWindowType"/>
     <enum-type name="QWebPage::FindFlag" flags="QWebPage::FindFlags" />
     <enum-type name="QWebPage::LinkDelegationPolicy" />
-    <enum-type name="QWebPluginFactory::Extension"/>
-
+    <enum-type name="QWebPluginFactory::Extension" />
+    <enum-type name="QWebElement::StyleResolveStrategy" />
+    <enum-type name="QWebHistory::HistoryStateVersion">
+        <reject-enum-value name="DefaultHistoryVersion" />
+    </enum-type>
+    <enum-type name="QWebPage::ErrorDomain" />
+    
+    
+    <object-type name="QGraphicsWebView" />    
     <object-type name="QWebView">
         <modify-function signature="setPage(QWebPage*)">
             <modify-argument index="1">
@@ -28,30 +37,102 @@
             </modify-argument>
         </modify-function>
     </object-type>
-    <object-type name="QWebHistory"/>
+    <object-type name="QWebPage::ExtensionOption" />
+    <object-type name="QWebPage::ChooseMultipleFilesExtensionOption" />
+    <object-type name="QWebPage::ExtensionReturn" />
+    <object-type name="QWebPage::ChooseMultipleFilesExtensionReturn" />
+    <object-type name="QWebHistory">
+      <modify-function signature="saveState(QWebHistory::HistoryStateVersion)const">
+         <modify-argument index="1"><remove-default-expression /></modify-argument>
+      </modify-function>
+    </object-type>
     <object-type name="QWebSettings"/>
-    <object-type name="QWebPage"/>
+    <object-type name="QWebPage">
+        <modify-function signature="javaScriptPrompt(QWebFrame*,QString,QString,QString*)">
+            <access modifier="private"/>
+        </modify-function>
+        <modify-function signature="setView(QWidget*)">
+            <modify-argument index="1">
+                <reference-count action="set" variable-name="__rcView"/>
+            </modify-argument>
+        </modify-function>
+        <modify-function signature="setNetworkAccessManager(QNetworkAccessManager*)">
+            <modify-argument index="1">
+                 <define-ownership class="java" owner="c++"/>
+            </modify-argument>
+        </modify-function>
+    </object-type>
 
     <value-type name="QWebHitTestResult">
       <modify-function signature="operator=(QWebHitTestResult)" remove="all" />
     </value-type>
 
     <value-type name="QWebHistoryItem">
+        <custom-constructor>
+            return new QWebHistoryItem(*copy);
+        </custom-constructor>
+        <custom-destructor>
+            delete copy;
+        </custom-destructor>
         <modify-function signature="operator=(QWebHistoryItem)" remove="all"/>
     </value-type>
 
     <object-type name="QWebHistoryInterface">
+        <modify-function signature="setDefaultInterface(QWebHistoryInterface*)">
+            <modify-argument index="1">
+                <reference-count action="set" variable-name="__rcInterface"/>
+            </modify-argument>
+        </modify-function>
     </object-type>
 
-    <object-type name="QWebPluginFactory">
-    </object-type>
-    <value-type name="QWebPluginFactory::Plugin" generate="no">
+    <object-type name="QWebPluginFactory" />
+    <object-type name="QWebPluginDatabase" />
+    <object-type name="QWebInspector" />
+
+    <value-type name="QWebPluginInfo" />
+    <value-type name="QWebElement" />
+    <value-type name="QWebPluginFactory::Plugin" />
+    <value-type name="QWebPluginFactory::MimeType" />
+    <value-type name="QWebSecurityOrigin">
+      <custom-constructor>  
+	return new QWebSecurityOrigin(*copy);
+      </custom-constructor>
+      <custom-destructor>
+	delete copy;
+      </custom-destructor>
+    </value-type>
+    <value-type name="QWebDatabase">
+      <custom-constructor>  
+	return new QWebDatabase(*copy);
+      </custom-constructor>
+      <custom-destructor>
+	delete copy;
+      </custom-destructor>
     </value-type>
+    <object-type name="QWebPluginFactory::ExtensionOption" />
+    <object-type name="QWebPluginFactory::ExtensionReturn" />
+    <object-type name="QWebPage::ErrorPageExtensionOption" />
+    <object-type name="QWebPage::ErrorPageExtensionReturn" />
 
     <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebFrame::QWebFrame', unmatched parameter type 'QWebFrameData*'" />
     <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebSettings::QWebSettings', unmatched parameter type 'WebCore::Settings*'" />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebPluginInfo::QWebPluginInfo', unmatched parameter type 'WebCore::PluginPackage*'" />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebElement::enclosingElement', unmatched parameter type 'WebCore::Node*'" />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebElement::QWebElement', unmatched parameter type 'WebCore::Node*'" />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebElement::QWebElement', unmatched parameter type 'WebCore::Element*'" />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping field 'QWebPluginFactory_Plugin::mimeTypes' with unmatched type 'QList&lt;MimeType&gt;'" />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QWebPluginInfo' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QWebPluginFactory_MimeType' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QWebElement' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
 
     <!-- Needed to avoid warnings on compilers that don't support webkit -->
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPluginFactory::Plugin' is specified in typesystem, but not defined. This could potentially lead to compilation errors." />                            
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPluginFactory::ExtensionReturn' is specified in typesystem, but not defined. This could potentially lead to compilation errors." />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPluginFactory::MimeType' is specified in typesystem, but not defined. This could potentially lead to compilation errors." />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'Extension' is not declared" />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPluginFactory::ExtensionOption' is specified in typesystem, but not defined. This could potentially lead to compilation errors." />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPluginFactory' for enum 'Extension' is not declared" />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPluginFactory' is specified in typesystem, but not defined. This could potentially lead to compilation errors." />
     <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'NavigationRequestResponse' is not declared" />
     <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebSettings' for enum 'WebAttribute' is not declared" />
     <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebSettings' is specified in typesystem, but not defined. This could potentially lead to compilation errors." />
@@ -66,11 +147,17 @@
     <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebHistory' is specified in typesystem, but not defined. This could potentially lead to compilation errors." />
     <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebView' is specified in typesystem, but not defined. This could potentially lead to compilation errors." />
     <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPage' is specified in typesystem, but not defined. This could potentially lead to compilation errors." />
-
     <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebHitTestResult' is specified in typesystem, but not defined. This could potentially lead to compilation errors." />
     <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'FindFlag' is not declared" />
     <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'LinkDelegationPolicy' is not declared" />
     <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebSettings' for enum 'FontFamily' is not declared" />
     <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'WebWindowType' is not declared" />
-
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebFrame::addToJavaScriptWindowObject', unmatched parameter type 'QScriptEngine::ValueOwnership'" />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebDatabase' is specified in typesystem, but not defined. This could potentially lead to compilation errors." />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPage::ExtensionReturn' is specified in typesystem, but not defined. This could potentially lead to compilation errors." />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPage::ExtensionOption' is specified in typesystem, but not defined. This could potentially lead to compilation errors." />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPage::ChooseMultipleFilesExtensionOption' is specified in typesystem, but not defined. This could potentially lead to compilation errors." />                            
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebSecurityOrigin' is specified in typesystem, but not defined. This could potentially lead to compilation errors." />
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPage::ChooseMultipleFilesExtensionReturn' is specified in typesystem, but not defined. This could potentially lead to compilation errors." />
+    
 </typesystem>
diff --git a/generator/typesystem_webkit.xml b/generator/typesystem_webkit.xml
index b1243ad..ea2eefd 100644
--- a/generator/typesystem_webkit.xml
+++ b/generator/typesystem_webkit.xml
@@ -5,7 +5,9 @@
     <enum-type name="QWebSettings::FontFamily"/>
     <enum-type name="QWebSettings::FontSize"/>
     <enum-type name="QWebSettings::WebGraphic"/>
-    <enum-type name="QWebSettings::WebAttribute"/>
+    <enum-type name="QWebSettings::WebAttribute">
+        <reject-enum-value name="LocalStorageEnabled"/>
+    </enum-type>
     <enum-type name="QWebPage::Extension"/>
     <enum-type name="QWebPage::NavigationType"/>
     <enum-type name="QWebPage::WebAction"/>
@@ -13,7 +15,14 @@
     <enum-type name="QWebPage::FindFlag" flags="QWebPage::FindFlags"/>
     <enum-type name="QWebPage::LinkDelegationPolicy"/>
     <enum-type name="QWebPluginFactory::Extension"/>
-
+    <enum-type name="QWebElement::StyleResolveStrategy"/>
+    <enum-type name="QWebHistory::HistoryStateVersion">
+        <reject-enum-value name="DefaultHistoryVersion"/>
+    </enum-type>
+    <enum-type name="QWebPage::ErrorDomain"/>
+    
+    
+    <object-type name="QGraphicsWebView"/>    
     <object-type name="QWebView">
         <modify-function signature="setPage(QWebPage*)">
             <modify-argument index="1">
@@ -28,30 +37,102 @@
             </modify-argument>
         </modify-function>
     </object-type>
-    <object-type name="QWebHistory"/>
+    <object-type name="QWebPage::ExtensionOption"/>
+    <object-type name="QWebPage::ChooseMultipleFilesExtensionOption"/>
+    <object-type name="QWebPage::ExtensionReturn"/>
+    <object-type name="QWebPage::ChooseMultipleFilesExtensionReturn"/>
+    <object-type name="QWebHistory">
+      <modify-function signature="saveState(QWebHistory::HistoryStateVersion)const">
+         <modify-argument index="1"><remove-default-expression/></modify-argument>
+      </modify-function>
+    </object-type>
     <object-type name="QWebSettings"/>
-    <object-type name="QWebPage"/>
+    <object-type name="QWebPage">
+        <modify-function signature="javaScriptPrompt(QWebFrame*,QString,QString,QString*)">
+            <access modifier="private"/>
+        </modify-function>
+        <modify-function signature="setView(QWidget*)">
+            <modify-argument index="1">
+                <reference-count action="set" variable-name="__rcView"/>
+            </modify-argument>
+        </modify-function>
+        <modify-function signature="setNetworkAccessManager(QNetworkAccessManager*)">
+            <modify-argument index="1">
+                 <define-ownership class="java" owner="c++"/>
+            </modify-argument>
+        </modify-function>
+    </object-type>
 
     <value-type name="QWebHitTestResult">
       <modify-function signature="operator=(QWebHitTestResult)" remove="all"/>
     </value-type>
 
     <value-type name="QWebHistoryItem">
+        <custom-constructor>
+            return new QWebHistoryItem(*copy);
+        </custom-constructor>
+        <custom-destructor>
+            delete copy;
+        </custom-destructor>
         <modify-function signature="operator=(QWebHistoryItem)" remove="all"/>
     </value-type>
 
     <object-type name="QWebHistoryInterface">
+        <modify-function signature="setDefaultInterface(QWebHistoryInterface*)">
+            <modify-argument index="1">
+                <reference-count action="set" variable-name="__rcInterface"/>
+            </modify-argument>
+        </modify-function>
     </object-type>
 
-    <object-type name="QWebPluginFactory">
-    </object-type>
-    <value-type name="QWebPluginFactory::Plugin" generate="no">
+    <object-type name="QWebPluginFactory"/>
+    <object-type name="QWebPluginDatabase"/>
+    <object-type name="QWebInspector"/>
+
+    <value-type name="QWebPluginInfo"/>
+    <value-type name="QWebElement"/>
+    <value-type name="QWebPluginFactory::Plugin"/>
+    <value-type name="QWebPluginFactory::MimeType"/>
+    <value-type name="QWebSecurityOrigin">
+      <custom-constructor>  
+	return new QWebSecurityOrigin(*copy);
+      </custom-constructor>
+      <custom-destructor>
+	delete copy;
+      </custom-destructor>
+    </value-type>
+    <value-type name="QWebDatabase">
+      <custom-constructor>  
+	return new QWebDatabase(*copy);
+      </custom-constructor>
+      <custom-destructor>
+	delete copy;
+      </custom-destructor>
     </value-type>
+    <object-type name="QWebPluginFactory::ExtensionOption"/>
+    <object-type name="QWebPluginFactory::ExtensionReturn"/>
+    <object-type name="QWebPage::ErrorPageExtensionOption"/>
+    <object-type name="QWebPage::ErrorPageExtensionReturn"/>
 
     <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebFrame::QWebFrame', unmatched parameter type 'QWebFrameData*'"/>
     <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebSettings::QWebSettings', unmatched parameter type 'WebCore::Settings*'"/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebPluginInfo::QWebPluginInfo', unmatched parameter type 'WebCore::PluginPackage*'"/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebElement::enclosingElement', unmatched parameter type 'WebCore::Node*'"/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebElement::QWebElement', unmatched parameter type 'WebCore::Node*'"/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebElement::QWebElement', unmatched parameter type 'WebCore::Element*'"/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping field 'QWebPluginFactory_Plugin::mimeTypes' with unmatched type 'QList&lt;MimeType&gt;'"/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QWebPluginInfo' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QWebPluginFactory_MimeType' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QWebElement' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
 
     <!-- Needed to avoid warnings on compilers that don't support webkit -->
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPluginFactory::Plugin' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>                            
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPluginFactory::ExtensionReturn' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPluginFactory::MimeType' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'Extension' is not declared"/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPluginFactory::ExtensionOption' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPluginFactory' for enum 'Extension' is not declared"/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPluginFactory' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
     <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'NavigationRequestResponse' is not declared"/>
     <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebSettings' for enum 'WebAttribute' is not declared"/>
     <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebSettings' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
@@ -66,11 +147,17 @@
     <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebHistory' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
     <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebView' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
     <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPage' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
-
     <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebHitTestResult' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
     <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'FindFlag' is not declared"/>
     <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'LinkDelegationPolicy' is not declared"/>
     <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebSettings' for enum 'FontFamily' is not declared"/>
     <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.webkit.QWebPage' for enum 'WebWindowType' is not declared"/>
-
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QWebFrame::addToJavaScriptWindowObject', unmatched parameter type 'QScriptEngine::ValueOwnership'"/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebDatabase' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPage::ExtensionReturn' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPage::ExtensionOption' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPage::ChooseMultipleFilesExtensionOption' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>                            
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebSecurityOrigin' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QWebPage::ChooseMultipleFilesExtensionReturn' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
+    
 </typesystem>
diff --git a/generator/typesystem_xml-common.xml b/generator/typesystem_xml-common.xml
index f97a66e..0961d77 100644
--- a/generator/typesystem_xml-common.xml
+++ b/generator/typesystem_xml-common.xml
@@ -1,20 +1,20 @@
 <?xml-stylesheet type="text/xsl" href="merge.xsl"?>
 <typesystem>
     <rejection class="QXmlAttributes::Attribute" />
-    <rejection class="QDomNode" field-name="impl" />    
-    
+    <rejection class="QDomNode" field-name="impl" />
+
     <enum-type name="QDomNode::NodeType" />
     <enum-type name="QDomNode::EncodingPolicy" />
     <enum-type name="QDomImplementation::InvalidDataPolicy" />
-<!--
     <enum-type name="QXmlStreamReader::Error" />
     <enum-type name="QXmlStreamReader::TokenType" />
--->
+    <enum-type name="QXmlStreamReader::ReadElementTextBehaviour" />
+
 
     <value-type name="QDomAttr">
         <modify-function signature="operator=(QDomAttr)" remove="all"/>
         <modify-function signature="nodeType()const" remove="all"/>
-    </value-type>   
+    </value-type>
 
     <value-type name="QDomCDATASection">
         <modify-function signature="operator=(QDomCDATASection)" remove="all"/>
@@ -39,20 +39,25 @@
         <modify-function signature="setContent(QIODevice*, bool, QString*, int*, int*)">
             <modify-argument index="1">
                 <reference-count action="set" variable-name="__rcContent" />
-            </modify-argument>            
+            </modify-argument>
         </modify-function>
 
-
         <modify-function signature="setContent(QXmlInputSource*,QXmlReader*,QString*,int*,int*)">
             <modify-argument index="1">
                 <reference-count action="set" variable-name="__rcContent" />
             </modify-argument>
         </modify-function>
+                
+        <modify-function signature="setContent(QXmlInputSource*,bool,QString*,int*,int*)">
+            <modify-argument index="1">
+                <reference-count action="set" variable-name="__rcContent" />
+            </modify-argument>
+        </modify-function>        
 
         <modify-function signature="setContent(QIODevice*,QString*,int*,int*)">
             <modify-argument index="1">
                 <reference-count action="set" variable-name="__rcContent" />
-            </modify-argument>            
+            </modify-argument>
         </modify-function>
 
     </value-type>
@@ -111,7 +116,6 @@
 
     <value-type name="QXmlParseException" />
 
-<!--
     <value-type name="QXmlStreamAttribute">
         <modify-function signature="operator=(QXmlStreamAttribute)" remove="all"/>
     </value-type>
@@ -127,13 +131,16 @@
 
         <modify-function signature="value(const QString &amp;, const QLatin1String &amp;)const">
             <remove />
-        </modify-function>            
+        </modify-function>
         <modify-function signature="value(const QLatin1String &amp;, const QLatin1String &amp;)const">
             <remove />
-        </modify-function>            
+        </modify-function>
         <modify-function signature="value(const QLatin1String &amp;)const">
-            <remove />            
-        </modify-function>            
+            <remove />
+        </modify-function>
+        <modify-function signature="hasAttribute(const QLatin1String &amp;)const">
+            <remove />
+        </modify-function>
     </value-type>
 
     <value-type name="QXmlStreamNamespaceDeclaration">
@@ -147,9 +154,8 @@
     <value-type name="QXmlStreamEntityDeclaration">
         <modify-function signature="operator=(QXmlStreamEntityDeclaration)" remove="all"/>
     </value-type>
--->
-    
-    <value-type name="QXmlAttributes">  
+
+    <value-type name="QXmlAttributes">
       <modify-function signature="index(const QLatin1String&amp;) const">
         <remove/>
       </modify-function>
@@ -162,39 +168,39 @@
         <custom-constructor>
             QXmlNamespaceSupport *clone = new QXmlNamespaceSupport;
             clone->setPrefix("", copy->uri(""));
-            
+
             QStringList prefixes = copy->prefixes();
-            for (int i=0; i&lt;prefixes.size(); ++i) 
+            for (int i=0; i&lt;prefixes.size(); ++i)
                 clone->setPrefix(prefixes.at(i), copy->uri(prefixes.at(i)));
-                
+
             return clone;
         </custom-constructor>
         <custom-destructor>
             delete (QXmlNamespaceSupport *)copy;
-        </custom-destructor>           
+        </custom-destructor>
+
 
-     
     </value-type>
 
     <value-type name="QDomElement">
         <modify-function signature="nodeType()const" remove="all"/>
         <modify-function signature="operator=(QDomElement)" remove="all"/>
-        
+
         <modify-function signature="setAttribute(const QString &amp;, unsigned int)">
             <remove />
         </modify-function>
-        <modify-function signature="setAttribute(const QString &amp;, qulonglong)">
+        <modify-function signature="setAttribute(const QString &amp;, unsigned long long)">
             <remove />
-        </modify-function>        
+        </modify-function>
         <modify-function signature="setAttributeNS(const QString, const QString &amp;, unsigned int)">
             <remove />
         </modify-function>
-        <modify-function signature="setAttributeNS(const QString, const QString &amp;, qulonglong)">
+        <modify-function signature="setAttributeNS(const QString, const QString &amp;, unsigned long long)">
             <remove />
-        </modify-function>        
-        
+        </modify-function>
+
     </value-type>
-    
+
     <interface-type name="QXmlContentHandler">
         <modify-function signature="setDocumentLocator(QXmlLocator*)">
             <modify-argument index="1">
@@ -207,21 +213,21 @@
     <interface-type name="QXmlEntityResolver" />
     <interface-type name="QXmlErrorHandler" />
     <interface-type name="QXmlLexicalHandler" />
-    
+
     <object-type name="QXmlDefaultHandler">
         <modify-function signature="setDocumentLocator(QXmlLocator*)">
             <modify-argument index="1">
                 <define-ownership class="shell" owner="c++" />
             </modify-argument>
-        </modify-function>    
+        </modify-function>
     </object-type>
     <object-type name="QXmlInputSource" />
-    <object-type name="QXmlLocator" />        
+    <object-type name="QXmlLocator" />
     <object-type name="QXmlSimpleReader">
         <modify-function signature="parse(const QXmlInputSource*,bool)">
             <modify-argument index="1" invalidate-after-use="yes" />
         </modify-function>
-    
+
         <modify-function signature="setContentHandler(QXmlContentHandler*)">
             <modify-argument index="1">
                 <reference-count action="set" variable-name="__rcContentHandler" />
@@ -254,7 +260,6 @@
         </modify-function>
     </object-type>
 
-<!--
     <object-type name="QXmlStreamReader">
       <modify-function signature="QXmlStreamReader(const char*)" remove="all" />
       <modify-function signature="addData(const char*)" remove="all" />
@@ -262,19 +267,28 @@
         <modify-argument index="1">
             <reference-count action="set" variable-name="__rcEntityResolver" />
         </modify-argument>
-      </modify-function>      
+      </modify-function>
     </object-type>
     <object-type name="QXmlStreamWriter">
         <modify-function signature="QXmlStreamWriter(QString *)">
             <remove />
         </modify-function>
     </object-type>
--->
-    
+
     <object-type name="QXmlReader">
         <modify-function signature="parse(const QXmlInputSource*)">
             <modify-argument index="1" invalidate-after-use="yes" />
         </modify-function>
-    </object-type>    
-    
+    </object-type>
+
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QDomNodeList' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QXmlStreamNamespaceDeclaration' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QDomNamedNodeMap' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QXmlStreamNotationDeclaration' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QDomNode' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QDomImplementation' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QXmlStreamAttribute' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QXmlStreamAttributes' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QXmlStreamEntityDeclaration' has equals operators but no qHash() function. Hashcode of objects will consistently be 0." />
+
 </typesystem>
diff --git a/generator/typesystem_xml.xml b/generator/typesystem_xml.xml
index 568ca95..5f32e56 100644
--- a/generator/typesystem_xml.xml
+++ b/generator/typesystem_xml.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0"?>
 <typesystem package="com.trolltech.qt.xml"><rejection class="QXmlNamespaceSupport"/>
     <rejection class="QXmlAttributes::Attribute"/>
-    <rejection class="QDomNode" field-name="impl"/>    
-    
+    <rejection class="QDomNode" field-name="impl"/>
+
     <enum-type name="QDomNode::NodeType"/>
     <enum-type name="QDomNode::EncodingPolicy"/>
     <enum-type name="QDomImplementation::InvalidDataPolicy"/>
-<!--
-    <enum-type name="QXmlStreamReader::Error" />
-    <enum-type name="QXmlStreamReader::TokenType" />
--->
+    <enum-type name="QXmlStreamReader::Error"/>
+    <enum-type name="QXmlStreamReader::TokenType"/>
+    <enum-type name="QXmlStreamReader::ReadElementTextBehaviour"/>
+
 
     <value-type name="QDomAttr">
         <modify-function signature="operator=(QDomAttr)" remove="all"/>
         <modify-function signature="nodeType()const" remove="all"/>
-    </value-type>   
+    </value-type>
 
     <value-type name="QDomCDATASection">
         <modify-function signature="operator=(QDomCDATASection)" remove="all"/>
@@ -39,20 +39,25 @@
         <modify-function signature="setContent(QIODevice*, bool, QString*, int*, int*)">
             <modify-argument index="1">
                 <reference-count action="set" variable-name="__rcContent"/>
-            </modify-argument>            
+            </modify-argument>
         </modify-function>
 
-
         <modify-function signature="setContent(QXmlInputSource*,QXmlReader*,QString*,int*,int*)">
             <modify-argument index="1">
                 <reference-count action="set" variable-name="__rcContent"/>
             </modify-argument>
         </modify-function>
+                
+        <modify-function signature="setContent(QXmlInputSource*,bool,QString*,int*,int*)">
+            <modify-argument index="1">
+                <reference-count action="set" variable-name="__rcContent"/>
+            </modify-argument>
+        </modify-function>        
 
         <modify-function signature="setContent(QIODevice*,QString*,int*,int*)">
             <modify-argument index="1">
                 <reference-count action="set" variable-name="__rcContent"/>
-            </modify-argument>            
+            </modify-argument>
         </modify-function>
 
     </value-type>
@@ -129,14 +134,13 @@
 
     <value-type name="QXmlParseException"/>
 
-<!--
     <value-type name="QXmlStreamAttribute">
         <modify-function signature="operator=(QXmlStreamAttribute)" remove="all"/>
     </value-type>
 
     <value-type name="QXmlStreamAttributes">
-        <modify-function signature="operator+(QVector&lt;QXmlStreamAttribute>)const" remove="all"/>
-        <modify-function signature="operator&lt;&lt;(QVector&lt;QXmlStreamAttribute>)" remove="all"/>
+        <modify-function signature="operator+(QVector&lt;QXmlStreamAttribute&gt;)const" remove="all"/>
+        <modify-function signature="operator&lt;&lt;(QVector&lt;QXmlStreamAttribute&gt;)" remove="all"/>
         <modify-function signature="operator&lt;&lt;(QXmlStreamAttribute)" remove="all"/>
         <modify-function signature="push_back(QXmlStreamAttribute)" remove="all"/>
         <modify-function signature="pop_back()" remove="all"/>
@@ -144,14 +148,17 @@
         <modify-function signature="pop_front()" remove="all"/>
 
         <modify-function signature="value(const QString &amp;, const QLatin1String &amp;)const">
-            <remove />
-        </modify-function>            
+            <remove/>
+        </modify-function>
         <modify-function signature="value(const QLatin1String &amp;, const QLatin1String &amp;)const">
-            <remove />
-        </modify-function>            
+            <remove/>
+        </modify-function>
         <modify-function signature="value(const QLatin1String &amp;)const">
-            <remove />            
-        </modify-function>            
+            <remove/>
+        </modify-function>
+        <modify-function signature="hasAttribute(const QLatin1String &amp;)const">
+            <remove/>
+        </modify-function>
     </value-type>
 
     <value-type name="QXmlStreamNamespaceDeclaration">
@@ -165,9 +172,8 @@
     <value-type name="QXmlStreamEntityDeclaration">
         <modify-function signature="operator=(QXmlStreamEntityDeclaration)" remove="all"/>
     </value-type>
--->
-    
-    <value-type name="QXmlAttributes">  
+
+    <value-type name="QXmlAttributes">
       <modify-function signature="index(const QLatin1String&amp;) const">
         <remove/>
       </modify-function>
@@ -180,39 +186,39 @@
         <custom-constructor>
             QXmlNamespaceSupport *clone = new QXmlNamespaceSupport;
             clone-&gt;setPrefix("", copy-&gt;uri(""));
-            
+
             QStringList prefixes = copy-&gt;prefixes();
-            for (int i=0; i&lt;prefixes.size(); ++i) 
+            for (int i=0; i&lt;prefixes.size(); ++i)
                 clone-&gt;setPrefix(prefixes.at(i), copy-&gt;uri(prefixes.at(i)));
-                
+
             return clone;
         </custom-constructor>
         <custom-destructor>
             delete (QXmlNamespaceSupport *)copy;
-        </custom-destructor>           
+        </custom-destructor>
+
 
-     
     </value-type>
 
     <value-type name="QDomElement">
         <modify-function signature="nodeType()const" remove="all"/>
         <modify-function signature="operator=(QDomElement)" remove="all"/>
-        
+
         <modify-function signature="setAttribute(const QString &amp;, unsigned int)">
             <remove/>
         </modify-function>
-        <modify-function signature="setAttribute(const QString &amp;, qulonglong)">
+        <modify-function signature="setAttribute(const QString &amp;, unsigned long long)">
             <remove/>
-        </modify-function>        
+        </modify-function>
         <modify-function signature="setAttributeNS(const QString, const QString &amp;, unsigned int)">
             <remove/>
         </modify-function>
-        <modify-function signature="setAttributeNS(const QString, const QString &amp;, qulonglong)">
+        <modify-function signature="setAttributeNS(const QString, const QString &amp;, unsigned long long)">
             <remove/>
-        </modify-function>        
-        
+        </modify-function>
+
     </value-type>
-    
+
     <interface-type name="QXmlContentHandler">
         <modify-function signature="setDocumentLocator(QXmlLocator*)">
             <modify-argument index="1">
@@ -225,21 +231,21 @@
     <interface-type name="QXmlEntityResolver"/>
     <interface-type name="QXmlErrorHandler"/>
     <interface-type name="QXmlLexicalHandler"/>
-    
+
     <object-type name="QXmlDefaultHandler">
         <modify-function signature="setDocumentLocator(QXmlLocator*)">
             <modify-argument index="1">
                 <define-ownership class="shell" owner="c++"/>
             </modify-argument>
-        </modify-function>    
+        </modify-function>
     </object-type>
     <object-type name="QXmlInputSource"/>
-    <object-type name="QXmlLocator"/>        
+    <object-type name="QXmlLocator"/>
     <object-type name="QXmlSimpleReader">
         <modify-function signature="parse(const QXmlInputSource*,bool)">
             <modify-argument index="1" invalidate-after-use="yes"/>
         </modify-function>
-    
+
         <modify-function signature="setContentHandler(QXmlContentHandler*)">
             <modify-argument index="1">
                 <reference-count action="set" variable-name="__rcContentHandler"/>
@@ -272,23 +278,21 @@
         </modify-function>
     </object-type>
 
-<!--
     <object-type name="QXmlStreamReader">
-      <modify-function signature="QXmlStreamReader(const char*)" remove="all" />
-      <modify-function signature="addData(const char*)" remove="all" />
+      <modify-function signature="QXmlStreamReader(const char*)" remove="all"/>
+      <modify-function signature="addData(const char*)" remove="all"/>
       <modify-function signature="setEntityResolver(QXmlStreamEntityResolver*)">
         <modify-argument index="1">
-            <reference-count action="set" variable-name="__rcEntityResolver" />
+            <reference-count action="set" variable-name="__rcEntityResolver"/>
         </modify-argument>
-      </modify-function>      
+      </modify-function>
     </object-type>
     <object-type name="QXmlStreamWriter">
         <modify-function signature="QXmlStreamWriter(QString *)">
-            <remove />
+            <remove/>
         </modify-function>
     </object-type>
--->
-    
+
     <object-type name="QXmlReader">
         <modify-function signature="parse(const QXmlInputSource*)">
             <modify-argument index="1" invalidate-after-use="yes"/>
@@ -304,6 +308,16 @@
                 <remove-argument/>
             </modify-argument>
         </modify-function>
-    </object-type>    
-    
+    </object-type>
+
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QDomNodeList' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QXmlStreamNamespaceDeclaration' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QDomNamedNodeMap' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QXmlStreamNotationDeclaration' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QDomNode' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QDomImplementation' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QXmlStreamAttribute' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QXmlStreamAttributes' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: Class 'QXmlStreamEntityDeclaration' has equals operators but no qHash() function. Hashcode of objects will consistently be 0."/>
+
 </typesystem>
diff --git a/generator/typesystem_xmlpatterns-common.xml b/generator/typesystem_xmlpatterns-common.xml
index 5b3638c..ce9d75c 100644
--- a/generator/typesystem_xmlpatterns-common.xml
+++ b/generator/typesystem_xmlpatterns-common.xml
@@ -2,11 +2,14 @@
 <typesystem>
 
 
+  <namespace-type name="QPatternist"/>
+  <namespace-type name="QPatternistSDK"/>
+
   <enum-type name="QXmlNodeModelIndex::NodeKind"/>
   <enum-type name="QXmlNodeModelIndex::DocumentOrder"/>
-  <enum-type name="QXmlNodeModelIndex::Axis"/>
-  <enum-type name="QXmlQuery::QueryLanguage"/>
+  <enum-type name="QAbstractXmlNodeModel::NodeCopySetting"/>
   <enum-type name="QAbstractXmlNodeModel::SimpleAxis"/>
+  <enum-type name="QXmlQuery::QueryLanguage" />
 
   <object-type name="QAbstractMessageHandler">
     <modify-function signature="QAbstractMessageHandler(QObject*)" remove="all" />
@@ -15,29 +18,33 @@
   <object-type name="QAbstractXmlForwardIterator"/>
 
   <rejection class="QPatternist::NodeIndexStorage" />
-
-  <rejection class="QAbstractXmlNodeModel" enum-name="NodeCopySetting"/>
+  <rejection class="QAbstractXmlNodeModel" function-name="mapToItem" />
   <rejection class="QAbstractXmlNodeModel" function-name="mapToSequence" />
   <rejection class="QAbstractXmlNodeModel" function-name="sequencedTypedValue" />
   <rejection class="QAbstractXmlNodeModel" function-name="sendNamespaces" />
   <rejection class="QAbstractXmlNodeModel" function-name="iterate" />
   <rejection class="QAbstractXmlNodeModel" function-name="copyNodeTo" />
   <rejection class="QAbstractXmlNodeModel" function-name="type" />
-  <rejection class="QAbstractXmlNodeModel" function-name="isDeepEqual" />
-  <rejection class="QAbstractXmlNodeModel" function-name="namespaceForPrefix" />
   <object-type name="QAbstractXmlNodeModel">
+    <modify-function signature="QAbstractXmlNodeModel()" remove="all" />
+    <modify-function signature="namespaceForPrefix(QXmlNodeModelIndex,short) const"
+             remove="all" />
+    <modify-function signature="isDeepEqual(QXmlNodeModelIndex,QXmlNodeModelIndex) const"
+             remove="all" />
   </object-type>
 
   <rejection class="QAbstractXmlReceiver" function-name="item" />
   <rejection class="QAbstractXmlReceiver" function-name="sendAsNode" />
-  <object-type name="QAbstractXmlReceiver">
-  </object-type>
+  <value-type name="QAbstractXmlReceiver">
+  </value-type>
 
   <object-type name="QSimpleXmlNodeModel" />
 
   <value-type name="QSourceLocation">
     <modify-function signature="operator=(QSourceLocation)" remove="all" />
   </value-type>
+ <value-type name="QXmlSchema" />
+ <object-type name="QXmlSchemaValidator" />
 
   <rejection class="QXmlFormatter" function-name="item" />
   <object-type name="QXmlFormatter">
@@ -49,8 +56,18 @@
   </value-type>
 
   <value-type name="QXmlName">
+    <modify-function signature="QXmlName(QXmlNamePool&amp;,QString,QString,QString)" access="private">
+      <modify-argument index="3">
+    <remove-default-expression />
+      </modify-argument>
+      <modify-argument index="4">
+    <remove-default-expression />
+      </modify-argument>
+    </modify-function>
+
     <modify-function signature="operator=(QXmlName)" remove="all" />
-    <modify-function signature="QXmlName(short,short,short)" remove="all" />
+    <modify-function signature="QXmlName(short,short,short)"
+             remove="all" />
     <modify-function signature="localName()const" remove="all" />
     <modify-function signature="prefix()const" remove="all" />
     <modify-function signature="hasPrefix()const" remove="all" />
@@ -71,6 +88,7 @@
   <rejection class="QXmlNodeModelIndex" function-name="sendNamespaces" />
   <rejection class="QXmlNodeModelIndex" function-name="iterate" />
   <rejection class="QXmlNodeModelIndex" function-name="type" />
+  <rejection class="QXmlNodeModelIndex" enum-name="Axis" />
   <value-type name="QXmlNodeModelIndex">
     <modify-function signature="name() const" remove="all" />
     <modify-function signature="root() const" remove="all" />
@@ -87,7 +105,20 @@
     <modify-function signature="internalPointer()const" remove="all" />
   </value-type>
 
-  <value-type name="QXmlQuery">
+  <value-type name="QXmlSerializerPointer"/>
+
+  <object-type name="QXmlQuery">
+    <modify-function signature="setFocus(QIODevice*)">
+        <modify-argument index="1"> 
+            <reference-count action="set" variable-name="__rcFocusDevice" />
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="setNetworkAccessManager(QNetworkAccessManager*)">
+        <modify-argument index="1">
+            <reference-count action="set" variable-name="__rcNetworkAccessManager" />
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="evaluateTo(QAbstractXmlReceiver *)const" remove="all" />
     <modify-function signature="evaluateTo(QStringList&lt;QString&gt;*)const" remove="all" />
     <modify-function signature="setMessageHandler(QAbstractMessageHandler*)">
       <modify-argument index="1">
@@ -104,24 +135,40 @@
     <reference-count action="set" variable-name="__rcUriResolver" />
       </modify-argument>
     </modify-function>
-  </value-type>
+  </object-type>
   <object-type name="QXmlResultItems"/>
 
   <rejection class="QXmlSerializer" function-name="item" />
   <object-type name="QXmlSerializer">
+    <modify-function signature="atDocumentRoot()const" remove="all" />
+    <modify-function signature="startContent()" remove="all" />
+    <modify-function signature="writeEscaped(QString)" remove="all" />
+    <modify-function signature="writeEscapedAttribute(QString)" remove="all" />
+    <modify-function signature="write(QString)" remove="all" />
+    <modify-function signature="write(QXmlName)" remove="all" />
+    <modify-function signature="write(const char *)" remove="all" />
+    <modify-function signature="isBindingInScope(QXmlName)const" remove="all" />
+    <modify-function signature="setCodec(const QTextCodec *)">
+      <modify-argument index="1">
+    <reference-count action="set" variable-name="__rcCodec" />
+      </modify-argument>
+    </modify-function>
   </object-type>
 
 
 
   <suppress-warning text="WARNING(MetaJavaBuilder) :: horribly broken type ''"/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: template baseclass 'QExplicitlySharedDataPointer&lt;QXmlSerializer&gt;' of 'QXmlSerializerPointer' is not known" />
 
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlItem::QXmlItem', unmatched parameter type 'QPatternist::Item const&amp;'" />
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlNodeModelIndex::sequencedTypedValue', unmatched return type 'QExplicitlySharedDataPointer&lt;QAbstractXmlForwardIterator&lt;QPatternist::Item&gt;&gt;"/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlNamePool::QXmlNamePool', unmatched parameter type 'QPatternist::NamePool*'" />
 
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlNodeModelIndex::QXmlNodeModelIndex', unmatched parameter type 'QPatternist::NodeIndexStorage const&amp;'" />
 
   <!-- To avoid warnings when running the generator on systems without XML patterns -->
   <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSimpleXmlNodeModel' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QXmlSerializerPointer' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSourceLocation' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QXmlFormatter' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QAbstractUriResolver' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
@@ -139,5 +186,5 @@
   <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.xmlpatterns.QXmlNodeModelIndex' for enum 'NodeKind' is not declared"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.xmlpatterns.QAbstractXmlNodeModel' for enum 'SimpleAxis' is not declared"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QXmlNamePool' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
-
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.xmlpatterns.QXmlQuery' for enum 'QueryLanguage' is not declared" />
 </typesystem>
diff --git a/generator/typesystem_xmlpatterns.xml b/generator/typesystem_xmlpatterns.xml
index 340a94e..ecbb6fc 100644
--- a/generator/typesystem_xmlpatterns.xml
+++ b/generator/typesystem_xmlpatterns.xml
@@ -2,11 +2,14 @@
 <typesystem package="com.trolltech.qt.xmlpatterns"><suppress-warning text="WARNING(MetaJavaBuilder) :: unhandled enum value: ForwardAxis in QXmlNodeModelIndex::Axis"/><suppress-warning text="WARNING(MetaJavaBuilder) :: unhandled enum value: ReverseAxis in QXmlNodeModelIndex::Axis"/>
 
 
+  <namespace-type name="QPatternist"/>
+  <namespace-type name="QPatternistSDK"/>
+
   <enum-type name="QXmlNodeModelIndex::NodeKind"/>
   <enum-type name="QXmlNodeModelIndex::DocumentOrder"/>
-  <enum-type name="QXmlNodeModelIndex::Axis"/>
-  <enum-type name="QXmlQuery::QueryLanguage"/>
+  <enum-type name="QAbstractXmlNodeModel::NodeCopySetting"/>
   <enum-type name="QAbstractXmlNodeModel::SimpleAxis"/>
+  <enum-type name="QXmlQuery::QueryLanguage"/>
 
   <object-type name="QAbstractMessageHandler">
     <modify-function signature="QAbstractMessageHandler(QObject*)" remove="all"/>
@@ -15,29 +18,31 @@
   <object-type name="QAbstractXmlForwardIterator"/>
 
   <rejection class="QPatternist::NodeIndexStorage"/>
-
-  <rejection class="QAbstractXmlNodeModel" enum-name="NodeCopySetting"/>
+  <rejection class="QAbstractXmlNodeModel" function-name="mapToItem"/>
   <rejection class="QAbstractXmlNodeModel" function-name="mapToSequence"/>
   <rejection class="QAbstractXmlNodeModel" function-name="sequencedTypedValue"/>
   <rejection class="QAbstractXmlNodeModel" function-name="sendNamespaces"/>
   <rejection class="QAbstractXmlNodeModel" function-name="iterate"/>
   <rejection class="QAbstractXmlNodeModel" function-name="copyNodeTo"/>
   <rejection class="QAbstractXmlNodeModel" function-name="type"/>
-  <rejection class="QAbstractXmlNodeModel" function-name="isDeepEqual"/>
-  <rejection class="QAbstractXmlNodeModel" function-name="namespaceForPrefix"/>
   <object-type name="QAbstractXmlNodeModel">
+    <modify-function signature="QAbstractXmlNodeModel()" remove="all"/>
+    <modify-function signature="namespaceForPrefix(QXmlNodeModelIndex,short) const" remove="all"/>
+    <modify-function signature="isDeepEqual(QXmlNodeModelIndex,QXmlNodeModelIndex) const" remove="all"/>
   </object-type>
 
   <rejection class="QAbstractXmlReceiver" function-name="item"/>
   <rejection class="QAbstractXmlReceiver" function-name="sendAsNode"/>
-  <object-type name="QAbstractXmlReceiver">
-  </object-type>
+  <value-type name="QAbstractXmlReceiver">
+  </value-type>
 
   <object-type name="QSimpleXmlNodeModel"/>
 
   <value-type name="QSourceLocation">
     <modify-function signature="operator=(QSourceLocation)" remove="all"/>
   </value-type>
+ <value-type name="QXmlSchema"/>
+ <object-type name="QXmlSchemaValidator"/>
 
   <rejection class="QXmlFormatter" function-name="item"/>
   <object-type name="QXmlFormatter">
@@ -49,6 +54,15 @@
   </value-type>
 
   <value-type name="QXmlName">
+    <modify-function signature="QXmlName(QXmlNamePool&amp;,QString,QString,QString)" access="private">
+      <modify-argument index="3">
+    <remove-default-expression/>
+      </modify-argument>
+      <modify-argument index="4">
+    <remove-default-expression/>
+      </modify-argument>
+    </modify-function>
+
     <modify-function signature="operator=(QXmlName)" remove="all"/>
     <modify-function signature="QXmlName(short,short,short)" remove="all"/>
     <modify-function signature="localName()const" remove="all"/>
@@ -71,6 +85,7 @@
   <rejection class="QXmlNodeModelIndex" function-name="sendNamespaces"/>
   <rejection class="QXmlNodeModelIndex" function-name="iterate"/>
   <rejection class="QXmlNodeModelIndex" function-name="type"/>
+  <rejection class="QXmlNodeModelIndex" enum-name="Axis"/>
   <value-type name="QXmlNodeModelIndex">
     <modify-function signature="name() const" remove="all"/>
     <modify-function signature="root() const" remove="all"/>
@@ -87,7 +102,20 @@
     <modify-function signature="internalPointer()const" remove="all"/>
   </value-type>
 
-  <value-type name="QXmlQuery">
+  <value-type name="QXmlSerializerPointer"/>
+
+  <object-type name="QXmlQuery">
+    <modify-function signature="setFocus(QIODevice*)">
+        <modify-argument index="1"> 
+            <reference-count action="set" variable-name="__rcFocusDevice"/>
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="setNetworkAccessManager(QNetworkAccessManager*)">
+        <modify-argument index="1">
+            <reference-count action="set" variable-name="__rcNetworkAccessManager"/>
+        </modify-argument>
+    </modify-function>
+    <modify-function signature="evaluateTo(QAbstractXmlReceiver *)const" remove="all"/>
     <modify-function signature="evaluateTo(QStringList&lt;QString&gt;*)const" remove="all"/>
     <modify-function signature="setMessageHandler(QAbstractMessageHandler*)">
       <modify-argument index="1">
@@ -104,24 +132,40 @@
     <reference-count action="set" variable-name="__rcUriResolver"/>
       </modify-argument>
     </modify-function>
-  </value-type>
+  </object-type>
   <object-type name="QXmlResultItems"/>
 
   <rejection class="QXmlSerializer" function-name="item"/>
   <object-type name="QXmlSerializer">
+    <modify-function signature="atDocumentRoot()const" remove="all"/>
+    <modify-function signature="startContent()" remove="all"/>
+    <modify-function signature="writeEscaped(QString)" remove="all"/>
+    <modify-function signature="writeEscapedAttribute(QString)" remove="all"/>
+    <modify-function signature="write(QString)" remove="all"/>
+    <modify-function signature="write(QXmlName)" remove="all"/>
+    <modify-function signature="write(const char *)" remove="all"/>
+    <modify-function signature="isBindingInScope(QXmlName)const" remove="all"/>
+    <modify-function signature="setCodec(const QTextCodec *)">
+      <modify-argument index="1">
+    <reference-count action="set" variable-name="__rcCodec"/>
+      </modify-argument>
+    </modify-function>
   </object-type>
 
 
 
   <suppress-warning text="WARNING(MetaJavaBuilder) :: horribly broken type ''"/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: template baseclass 'QExplicitlySharedDataPointer&lt;QXmlSerializer&gt;' of 'QXmlSerializerPointer' is not known"/>
 
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlItem::QXmlItem', unmatched parameter type 'QPatternist::Item const&amp;'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlNodeModelIndex::sequencedTypedValue', unmatched return type 'QExplicitlySharedDataPointer&lt;QAbstractXmlForwardIterator&lt;QPatternist::Item&gt;&gt;"/>
+    <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlNamePool::QXmlNamePool', unmatched parameter type 'QPatternist::NamePool*'"/>
 
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping function 'QXmlNodeModelIndex::QXmlNodeModelIndex', unmatched parameter type 'QPatternist::NodeIndexStorage const&amp;'"/>
 
   <!-- To avoid warnings when running the generator on systems without XML patterns -->
   <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSimpleXmlNodeModel' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QXmlSerializerPointer' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QSourceLocation' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QXmlFormatter' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QAbstractUriResolver' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
@@ -139,5 +183,5 @@
   <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.xmlpatterns.QXmlNodeModelIndex' for enum 'NodeKind' is not declared"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.xmlpatterns.QAbstractXmlNodeModel' for enum 'SimpleAxis' is not declared"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: type 'QXmlNamePool' is specified in typesystem, but not defined. This could potentially lead to compilation errors."/>
-
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: namespace 'com.trolltech.qt.xmlpatterns.QXmlQuery' for enum 'QueryLanguage' is not declared"/>
 </typesystem>