Fixes: get the number of actual warnings down to 0

Details:  no more noise when running the generator. Many of the
	  warnings were Jambi-specific, many were just plain
	  annoying. Yet others were valid and have now been fixed.

21 files changed, 173 insertions, 83 deletions

diff --git a/generator/abstractmetabuilder.cpp b/generator/abstractmetabuilder.cpp
index f3862b3..90534f8 100644
--- a/generator/abstractmetabuilder.cpp
+++ b/generator/abstractmetabuilder.cpp
@@ -800,7 +800,7 @@ void AbstractMetaBuilder::figureOutEnumValuesForClass(AbstractMetaClass *meta_cl
                 AbstractMetaEnumValue *used = entries.value(reject->value());
                 if (!used) {
                     ReportHandler::warning(
-                        QString::fromLatin1("Rejected enum has no alternative...: %1::%2\n")
+                        QString::fromLatin1("Rejected enum has no alternative...: %1::%2")
                         .arg(meta_class->name())
                         .arg(reject->name()));
                     continue;
diff --git a/generator/main.cpp b/generator/main.cpp
index dcf1d27..f47248f 100644
--- a/generator/main.cpp
+++ b/generator/main.cpp
@@ -114,6 +114,8 @@ int main(int argc, char *argv[])
     if (!gs->readParameters(args))
         displayHelp(gs);
 
+    printf("Please wait while source files are being generated...\n");
+
     if (!TypeDatabase::instance()->parseFile(typesystemFileName))
         qFatal("Cannot parse file: '%s'", qPrintable(typesystemFileName));
 
diff --git a/generator/main.h b/generator/main.h
index 07addd2..88a88f4 100644
--- a/generator/main.h
+++ b/generator/main.h
@@ -56,7 +56,7 @@ struct Preprocess
 #if defined(Q_OS_WIN32)
         char *path_splitter = ";";
 #else
-        char *path_splitter = ":";
+        const char *path_splitter = ":";
 #endif
 
         // Environment INCLUDE
diff --git a/generator/typesystem_core-common.xml b/generator/typesystem_core-common.xml
index f05efc1..4e24c92 100644
--- a/generator/typesystem_core-common.xml
+++ b/generator/typesystem_core-common.xml
@@ -607,8 +607,8 @@
   </value-type>
 
   <value-type name="QRectF">
-    <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="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>
@@ -620,8 +620,8 @@
 
 
   <value-type name="QSize">
-    <modify-function signature="operator*=(double)"> <access modifier="private"/> </modify-function>
-    <modify-function signature="operator/=(double)"> <access modifier="private"/> </modify-function>
+    <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>
@@ -629,8 +629,8 @@
   </value-type>
 
   <value-type name="QSizeF">
-    <modify-function signature="operator*=(double)"> <access modifier="private"/> </modify-function>
-    <modify-function signature="operator/=(double)"> <access modifier="private"/> </modify-function>
+    <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>
@@ -656,8 +656,8 @@
   </value-type>
 
   <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(qlonglong) const" remove="all"/>
+    <modify-function signature="toString(ushort) 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"/>
@@ -744,7 +744,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(unsigned long long,int)" remove="all"/>
+    <modify-function signature="number(qulonglong,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"/>
@@ -760,8 +760,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(unsigned long long,int)" remove="all"/>
-    <modify-function signature="setNum(unsigned short,int)" remove="all"/>
+    <modify-function signature="setNum(qulonglong,int)" remove="all"/>
+    <modify-function signature="setNum(ushort,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"/>
@@ -787,8 +787,8 @@
   <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="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>
 
   <object-type name="QIODevice"/>
@@ -904,7 +904,7 @@
     <extra-includes>
         <include file-name="QDateTime" location="global"/>
     </extra-includes>
-    <modify-function signature="map(long long,long long,QFile::MemoryMapFlags)" remove="all" />
+    <modify-function signature="map(qlonglong,qlonglong,QFile::MemoryMapFlags)" remove="all" />
     <modify-function signature="unmap(unsigned char*)" remove="all" />
   </object-type>
   
@@ -1089,13 +1089,13 @@
     <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;(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;(unsigned long long&amp;)"> <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>
diff --git a/generator/typesystem_core-qtscript.xml b/generator/typesystem_core-qtscript.xml
index 88ab3ed..7d91497 100644
--- a/generator/typesystem_core-qtscript.xml
+++ b/generator/typesystem_core-qtscript.xml
@@ -987,7 +987,7 @@
       </modify-function>
 
       <modify-function signature="operator&lt;&lt;(qulonglong)" remove="all"/> 
-      <modify-function signature="operator&gt;&gt;(qulonglong)" remove="all"/> 
+      <modify-function signature="operator&gt;&gt;(qulonglong&amp;)" remove="all"/> 
   </object-type>
 
   <value-type name="QPointF">
@@ -1480,5 +1480,24 @@
     <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" />
+
+  <!-- some catch-all warning suppressions -->
+  <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" />
 
 </typesystem>
diff --git a/generator/typesystem_core.xml b/generator/typesystem_core.xml
index 8d48f5a..a4a6046 100644
--- a/generator/typesystem_core.xml
+++ b/generator/typesystem_core.xml
@@ -31,7 +31,7 @@
           }
     </template><template name="core.convert_stringref_to_string">
             QString %out% = %in%.toString();
-    </template><rejection class="QTextCodec::ConverterState"/><rejection class="QAbstractEventDispatcher"/><rejection class="QAbstractFileEngine"/><rejection class="QAbstractFileEngineHandler"/><rejection class="QAbstractFileEngineIterator"/><rejection class="QAbstractItemModel"/><rejection class="QAbstractListModel"/><rejection class="QPersistentModelIndex"/><rejection class="QFSFileEngine"/><rejection class="QMimeData"/><rejection class="QSystemLocale"/><rejection class="QFutureWatcherBase"/><rejection class="QFutureSynchronizer"/><rejection class="QRegExp"/><rejection class="QDate"/><rejection class="QDateTime"/><rejection class="QByteArray" function-name="contains"/><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"/>
+    </template><rejection class="QTextCodec::ConverterState"/><rejection class="QAbstractEventDispatcher"/><rejection class="QAbstractFileEngine"/><rejection class="QAbstractFileEngineHandler"/><rejection class="QAbstractFileEngineIterator"/><rejection class="QAbstractItemModel"/><rejection class="QAbstractListModel"/><rejection class="QPersistentModelIndex"/><rejection class="QFSFileEngine"/><rejection class="QMimeData"/><rejection class="QSystemLocale"/><rejection class="QFutureWatcherBase"/><rejection class="QFutureSynchronizer"/><rejection class="QRegExp"/><rejection class="QDate"/><rejection class="QDateTime"/><rejection class="QByteArray" function-name="contains"/><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) :: 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"/>
 
   <rejection class="*" function-name="d_func"/>
   <rejection class="*" function-name="data_ptr"/>
@@ -649,8 +649,8 @@
   </value-type>
 
   <value-type name="QRectF">
-    <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="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>
@@ -662,8 +662,8 @@
 
 
   <value-type name="QSize">
-    <modify-function signature="operator*=(double)"> <access modifier="private"/> </modify-function>
-    <modify-function signature="operator/=(double)"> <access modifier="private"/> </modify-function>
+    <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>
@@ -671,8 +671,8 @@
   </value-type>
 
   <value-type name="QSizeF">
-    <modify-function signature="operator*=(double)"> <access modifier="private"/> </modify-function>
-    <modify-function signature="operator/=(double)"> <access modifier="private"/> </modify-function>
+    <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>
@@ -698,8 +698,8 @@
   </value-type>
 
   <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(qlonglong) const" remove="all"/>
+    <modify-function signature="toString(ushort) 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"/>
@@ -984,7 +984,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(unsigned long long,int)" remove="all"/>
+    <modify-function signature="number(qulonglong,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"/>
@@ -1000,8 +1000,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(unsigned long long,int)" remove="all"/>
-    <modify-function signature="setNum(unsigned short,int)" remove="all"/>
+    <modify-function signature="setNum(qulonglong,int)" remove="all"/>
+    <modify-function signature="setNum(ushort,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"/>
@@ -1253,8 +1253,8 @@
   <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="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 -->    
   
     <modify-function signature="open(int,QFlags&lt;QIODevice::OpenModeFlag&gt;)" remove="all"/>
     <modify-function signature="decodeName(const char*)" remove="all"/>
@@ -1397,7 +1397,7 @@
     <extra-includes>
         <include file-name="QDateTime" location="global"/>
     </extra-includes>
-    <modify-function signature="map(long long,long long,QFile::MemoryMapFlags)" remove="all"/>
+    <modify-function signature="map(qlonglong,qlonglong,QFile::MemoryMapFlags)" remove="all"/>
     <modify-function signature="unmap(unsigned char*)" remove="all"/>
   </object-type>
   
@@ -1857,13 +1857,13 @@
     <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;(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;(unsigned long long&amp;)"> <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>
@@ -2073,7 +2073,7 @@
       </modify-function>
 
       <modify-function signature="operator&lt;&lt;(qulonglong)" remove="all"/> 
-      <modify-function signature="operator&gt;&gt;(qulonglong)" remove="all"/> 
+      <modify-function signature="operator&gt;&gt;(qulonglong&amp;)" remove="all"/> 
   </object-type>
   
   <object-type name="QSystemSemaphore"/>
diff --git a/generator/typesystem_gui-common.xml b/generator/typesystem_gui-common.xml
index 1108887..7abee83 100644
--- a/generator/typesystem_gui-common.xml
+++ b/generator/typesystem_gui-common.xml
@@ -136,6 +136,7 @@
   <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"/>
@@ -158,6 +159,7 @@
   <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"/>
@@ -193,6 +195,8 @@
   <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"/>
@@ -344,6 +348,8 @@
   <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"/>
@@ -485,12 +491,12 @@
   <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(double,double,double*,double*)const" remove="all"/>
+    <modify-function signature="map(qreal,qreal,qreal*,qreal*)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*=(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="operator*(QTransform)const" rename="multiplied" />
     <modify-function signature="operator*=(QTransform)" access="private"/>
   </value-type>  
@@ -559,7 +565,7 @@
         <modify-argument index="2"> <remove-default-expression/> </modify-argument>
     </modify-function>
 
-    <modify-function signature="fromData(QSize,const unsigned char*,QImage::Format)">
+    <modify-function signature="fromData(QSize,const uchar*,QImage::Format)">
         <access modifier="private"/>        
         <modify-argument index="3">
             <remove-default-expression/>
@@ -782,15 +788,15 @@
       </extra-includes>
 
       <modify-function signature="map(int,int,int*,int*)const" remove="all"/>
-      <modify-function signature="map(double,double,double*,double*)const" remove="all"/>
+      <modify-function signature="map(qreal,qreal,qreal*,qreal*)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(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="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="inverted(bool*)const">
         <access modifier="private"/>
@@ -891,7 +897,7 @@
     <modify-function signature="QImage(const char **)">
         <access modifier="private"/>
     </modify-function>
-    <modify-function signature="QImage(const unsigned char*,int,int,int,QImage::Format)">
+    <modify-function signature="QImage(const uchar*,int,int,int,QImage::Format)">
 	    <remove/>
     </modify-function>
     <modify-function signature="bits()const">
@@ -900,7 +906,7 @@
     <modify-function signature="scanLine(int)const">
         <remove/>
     </modify-function>
-    <modify-function signature="QImage(const unsigned char *, int, int, QImage::Format)">
+    <modify-function signature="QImage(const uchar *, int, int, QImage::Format)">
         <remove/>
     </modify-function>
   
@@ -919,7 +925,7 @@
         </modify-argument>        
     </modify-function>
     
-    <modify-function signature="QImage(unsigned char*,int,int,QImage::Format)">
+    <modify-function signature="QImage(uchar*,int,int,QImage::Format)">
         <access modifier="private"/>
     </modify-function>
 
@@ -943,7 +949,7 @@
         <access modifier="private"/>
     </modify-function>
        
-    <modify-function signature="loadFromData(const unsigned char*,int,const char*)">
+    <modify-function signature="loadFromData(const uchar*,int,const char*)">
         <access modifier="private"/>
         <modify-argument index="2">
             <remove-default-expression/>
@@ -977,7 +983,7 @@
         </modify-argument>
     </modify-function>
       
-    <modify-function signature="fromData(const unsigned char*,int,const char*)">
+    <modify-function signature="fromData(const uchar*,int,const char*)">
         <remove/>
     </modify-function>        
   
@@ -1041,7 +1047,7 @@
         <remove/>
     </modify-function>
     
-    <modify-function signature="getCmykF(double*,double*,double*,double*,double*)">
+    <modify-function signature="getCmykF(qreal*,qreal*,qreal*,qreal*,qreal*)">
         <remove/>
     </modify-function>
     
@@ -1049,7 +1055,7 @@
         <remove/>
     </modify-function>
     
-    <modify-function signature="getHsvF(double*,double*,double*,double*)const">
+    <modify-function signature="getHsvF(qreal*,qreal*,qreal*,qreal*)const">
         <remove/>
     </modify-function>
     
@@ -1057,7 +1063,7 @@
         <remove/>
     </modify-function>
     
-    <modify-function signature="getRgbF(double*,double*,double*,double*)const">
+    <modify-function signature="getRgbF(qreal*,qreal*,qreal*,qreal*)const">
         <remove/>
     </modify-function>
       
diff --git a/generator/typesystem_gui-qtscript.xml b/generator/typesystem_gui-qtscript.xml
index 6a58f60..4c9c322 100644
--- a/generator/typesystem_gui-qtscript.xml
+++ b/generator/typesystem_gui-qtscript.xml
@@ -557,4 +557,7 @@
       </modify-function>
   </value-type>
 
+  <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" />
+
 </typesystem>
diff --git a/generator/typesystem_gui.xml b/generator/typesystem_gui.xml
index ac1bddb..768fc56 100644
--- a/generator/typesystem_gui.xml
+++ b/generator/typesystem_gui.xml
@@ -1,5 +1,5 @@
 <?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="QTextCodecFactoryInterface"/><rejection class="QPictureFormatInterface"/><rejection class="QAbstractProxyModel"/><rejection class="QAbstractTableModel"/><rejection class="QSortFilterProxyModel"/><rejection class="QDirModel"/><rejection class="QDrag"/><rejection class="QDropEvent"/><rejection class="QFileSystemModel"/><rejection class="QGraphicsSceneDragDropEvent"/><rejection class="QPrinterInfo"/><rejection class="QProxyModel"/><rejection class="QPrinterInfo"/><rejection class="QTextOption"/>
+<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="QTextCodecFactoryInterface"/><rejection class="QPictureFormatInterface"/><rejection class="QAbstractProxyModel"/><rejection class="QAbstractTableModel"/><rejection class="QSortFilterProxyModel"/><rejection class="QDirModel"/><rejection class="QDrag"/><rejection class="QDropEvent"/><rejection class="QFileSystemModel"/><rejection class="QGraphicsSceneDragDropEvent"/><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"/>
@@ -136,6 +136,7 @@
   <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"/>
@@ -158,6 +159,7 @@
   <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"/>
@@ -193,6 +195,8 @@
   <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"/>
@@ -344,6 +348,8 @@
   <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"/>
@@ -485,12 +491,12 @@
   <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(double,double,double*,double*)const" remove="all"/>
+    <modify-function signature="map(qreal,qreal,qreal*,qreal*)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*=(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="operator*(QTransform)const" rename="multiplied"/>
     <modify-function signature="operator*=(QTransform)" access="private"/>
   
@@ -565,7 +571,7 @@
         <modify-argument index="2"> <remove-default-expression/> </modify-argument>
     </modify-function>
 
-    <modify-function signature="fromData(QSize,const unsigned char*,QImage::Format)">
+    <modify-function signature="fromData(QSize,const uchar*,QImage::Format)">
         <access modifier="private"/>        
         <modify-argument index="3">
             <remove-default-expression/>
@@ -894,15 +900,15 @@
       </extra-includes>
 
       <modify-function signature="map(int,int,int*,int*)const" remove="all"/>
-      <modify-function signature="map(double,double,double*,double*)const" remove="all"/>
+      <modify-function signature="map(qreal,qreal,qreal*,qreal*)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(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="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="inverted(bool*)const">
         <access modifier="private"/>
@@ -1018,7 +1024,7 @@
     <modify-function signature="QImage(const char **)">
         <access modifier="private"/>
     </modify-function>
-    <modify-function signature="QImage(const unsigned char*,int,int,int,QImage::Format)">
+    <modify-function signature="QImage(const uchar*,int,int,int,QImage::Format)">
 	    <remove/>
     </modify-function>
     <modify-function signature="bits()const">
@@ -1027,7 +1033,7 @@
     <modify-function signature="scanLine(int)const">
         <remove/>
     </modify-function>
-    <modify-function signature="QImage(const unsigned char *, int, int, QImage::Format)">
+    <modify-function signature="QImage(const uchar *, int, int, QImage::Format)">
         <remove/>
     </modify-function>
   
@@ -1046,7 +1052,7 @@
         </modify-argument>        
     </modify-function>
     
-    <modify-function signature="QImage(unsigned char*,int,int,QImage::Format)">
+    <modify-function signature="QImage(uchar*,int,int,QImage::Format)">
         <access modifier="private"/>
     </modify-function>
 
@@ -1070,7 +1076,7 @@
         <access modifier="private"/>
     </modify-function>
        
-    <modify-function signature="loadFromData(const unsigned char*,int,const char*)">
+    <modify-function signature="loadFromData(const uchar*,int,const char*)">
         <access modifier="private"/>
         <modify-argument index="2">
             <remove-default-expression/>
@@ -1104,7 +1110,7 @@
         </modify-argument>
     </modify-function>
       
-    <modify-function signature="fromData(const unsigned char*,int,const char*)">
+    <modify-function signature="fromData(const uchar*,int,const char*)">
         <remove/>
     </modify-function>        
   
@@ -1252,7 +1258,7 @@
         <remove/>
     </modify-function>
     
-    <modify-function signature="getCmykF(double*,double*,double*,double*,double*)">
+    <modify-function signature="getCmykF(qreal*,qreal*,qreal*,qreal*,qreal*)">
         <remove/>
     </modify-function>
     
@@ -1260,7 +1266,7 @@
         <remove/>
     </modify-function>
     
-    <modify-function signature="getHsvF(double*,double*,double*,double*)const">
+    <modify-function signature="getHsvF(qreal*,qreal*,qreal*,qreal*)const">
         <remove/>
     </modify-function>
     
@@ -1268,7 +1274,7 @@
         <remove/>
     </modify-function>
     
-    <modify-function signature="getRgbF(double*,double*,double*,double*)const">
+    <modify-function signature="getRgbF(qreal*,qreal*,qreal*,qreal*)const">
         <remove/>
     </modify-function>
       
diff --git a/generator/typesystem_network-common.xml b/generator/typesystem_network-common.xml
index ae169ef..e5f45b5 100644
--- a/generator/typesystem_network-common.xml
+++ b/generator/typesystem_network-common.xml
@@ -17,7 +17,9 @@
   <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" />    
@@ -35,6 +37,9 @@
   <enum-type name="QNetworkRequest::CacheLoadControl" />
   <enum-type name="QNetworkRequest::KnownHeaders" />
 
+  <object-type name="QAbstractNetworkCache">
+  </object-type>
+
   <object-type name="QAbstractSocket" />
   <object-type name="QFtp" />
 
@@ -84,6 +89,13 @@
     <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>
@@ -92,6 +104,13 @@
     <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>
diff --git a/generator/typesystem_network.xml b/generator/typesystem_network.xml
index 38df4ce..58973c7 100644
--- a/generator/typesystem_network.xml
+++ b/generator/typesystem_network.xml
@@ -18,7 +18,9 @@
   <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"/>    
@@ -36,6 +38,9 @@
   <enum-type name="QNetworkRequest::CacheLoadControl"/>
   <enum-type name="QNetworkRequest::KnownHeaders"/>
 
+  <object-type name="QAbstractNetworkCache">
+  </object-type>
+
   <object-type name="QAbstractSocket"/>
   <object-type name="QFtp"/>
 
@@ -110,6 +115,13 @@
     <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>
@@ -118,6 +130,13 @@
     <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>
diff --git a/generator/typesystem_phonon-qtscript.xml b/generator/typesystem_phonon-qtscript.xml
index f7e627a..da9b411 100644
--- a/generator/typesystem_phonon-qtscript.xml
+++ b/generator/typesystem_phonon-qtscript.xml
@@ -18,4 +18,9 @@
         <modify-function signature="operator==(Phonon::EffectParameter)const" remove="all" />
     </value-type>
 
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: enum 'Phonon::AddonInterface::SubtitleCommand' does not have a type entry or is not an enum" />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: enum 'Phonon::AddonInterface::AudioChannelCommand' does not have a type entry or is not an enum" />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: class 'AudioOutputInterface' inherits from unknown base class 'Phonon::AudioOutputInterface40'" />
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: class not found for setup inheritance 'Phonon::AudioOutputInterface40'" />
+
 </typesystem>
diff --git a/generator/typesystem_phonon.xml b/generator/typesystem_phonon.xml
index dab9ef0..e2d7361 100644
--- a/generator/typesystem_phonon.xml
+++ b/generator/typesystem_phonon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<typesystem package="com.trolltech.qt.phonon">
+<typesystem package="com.trolltech.qt.phonon"><suppress-warning text="WARNING(MetaJavaBuilder) :: enum 'Phonon::AddonInterface::SubtitleCommand' does not have a type entry or is not an enum"/><suppress-warning text="WARNING(MetaJavaBuilder) :: enum 'Phonon::AddonInterface::AudioChannelCommand' does not have a type entry or is not an enum"/><suppress-warning text="WARNING(MetaJavaBuilder) :: class 'AudioOutputInterface' inherits from unknown base class 'Phonon::AudioOutputInterface40'"/><suppress-warning text="WARNING(MetaJavaBuilder) :: class not found for setup inheritance 'Phonon::AudioOutputInterface40'"/>
     
     <rejection class="Phonon::ObjectDescriptionData"/>
     <rejection class="Phonon::ObjectDescriptionModelData"/>
diff --git a/generator/typesystem_webkit-common.xml b/generator/typesystem_webkit-common.xml
index 4308597..fc5ab67 100644
--- a/generator/typesystem_webkit-common.xml
+++ b/generator/typesystem_webkit-common.xml
@@ -6,11 +6,13 @@
     <enum-type name="QWebSettings::FontSize"/>
     <enum-type name="QWebSettings::WebGraphic"/>
     <enum-type name="QWebSettings::WebAttribute"/>
+    <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"/>
 
     <object-type name="QWebView">
         <modify-function signature="setPage(QWebPage*)">
diff --git a/generator/typesystem_webkit-qtscript.xml b/generator/typesystem_webkit-qtscript.xml
index 8550136..148df2c 100644
--- a/generator/typesystem_webkit-qtscript.xml
+++ b/generator/typesystem_webkit-qtscript.xml
@@ -7,4 +7,6 @@
 
     <rejection class="WebCore"/>
 
+  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping field 'QWebPluginFactory_Plugin::mimeTypes' with unmatched type 'QList&lt;MimeType&gt;'" />
+
 </typesystem>
diff --git a/generator/typesystem_webkit.xml b/generator/typesystem_webkit.xml
index cd4b0a7..b1243ad 100644
--- a/generator/typesystem_webkit.xml
+++ b/generator/typesystem_webkit.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0"?>
-<typesystem package="com.trolltech.qt.webkit"><rejection class="QWebHistory"/><rejection class="QWebHistoryItem"/><rejection class="WebCore"/>
+<typesystem package="com.trolltech.qt.webkit"><rejection class="QWebHistory"/><rejection class="QWebHistoryItem"/><rejection class="WebCore"/><suppress-warning text="WARNING(MetaJavaBuilder) :: skipping field 'QWebPluginFactory_Plugin::mimeTypes' with unmatched type 'QList&lt;MimeType&gt;'"/>
     <namespace-type name="WebCore"/>
 
     <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="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"/>
 
     <object-type name="QWebView">
         <modify-function signature="setPage(QWebPage*)">
diff --git a/generator/typesystem_xml-common.xml b/generator/typesystem_xml-common.xml
index f7fd33e..f97a66e 100644
--- a/generator/typesystem_xml-common.xml
+++ b/generator/typesystem_xml-common.xml
@@ -183,13 +183,13 @@
         <modify-function signature="setAttribute(const QString &amp;, unsigned int)">
             <remove />
         </modify-function>
-        <modify-function signature="setAttribute(const QString &amp;, unsigned long long)">
+        <modify-function signature="setAttribute(const QString &amp;, qulonglong)">
             <remove />
         </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;, unsigned long long)">
+        <modify-function signature="setAttributeNS(const QString, const QString &amp;, qulonglong)">
             <remove />
         </modify-function>        
         
diff --git a/generator/typesystem_xml.xml b/generator/typesystem_xml.xml
index c30f46e..568ca95 100644
--- a/generator/typesystem_xml.xml
+++ b/generator/typesystem_xml.xml
@@ -201,13 +201,13 @@
         <modify-function signature="setAttribute(const QString &amp;, unsigned int)">
             <remove/>
         </modify-function>
-        <modify-function signature="setAttribute(const QString &amp;, unsigned long long)">
+        <modify-function signature="setAttribute(const QString &amp;, qulonglong)">
             <remove/>
         </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;, unsigned long long)">
+        <modify-function signature="setAttributeNS(const QString, const QString &amp;, qulonglong)">
             <remove/>
         </modify-function>        
         
diff --git a/generator/typesystem_xmlpatterns-common.xml b/generator/typesystem_xmlpatterns-common.xml
index 20ccc57..5b3638c 100644
--- a/generator/typesystem_xmlpatterns-common.xml
+++ b/generator/typesystem_xmlpatterns-common.xml
@@ -5,6 +5,7 @@
   <enum-type name="QXmlNodeModelIndex::NodeKind"/>
   <enum-type name="QXmlNodeModelIndex::DocumentOrder"/>
   <enum-type name="QXmlNodeModelIndex::Axis"/>
+  <enum-type name="QXmlQuery::QueryLanguage"/>
   <enum-type name="QAbstractXmlNodeModel::SimpleAxis"/>
 
   <object-type name="QAbstractMessageHandler">
diff --git a/generator/typesystem_xmlpatterns-qtscript.xml b/generator/typesystem_xmlpatterns-qtscript.xml
index fa7a289..af289dd 100644
--- a/generator/typesystem_xmlpatterns-qtscript.xml
+++ b/generator/typesystem_xmlpatterns-qtscript.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0"?>
 <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" />
+
 </typesystem>
diff --git a/generator/typesystem_xmlpatterns.xml b/generator/typesystem_xmlpatterns.xml
index cfb1d45..340a94e 100644
--- a/generator/typesystem_xmlpatterns.xml
+++ b/generator/typesystem_xmlpatterns.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
-<typesystem package="com.trolltech.qt.xmlpatterns">
+<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"/>
 
 
   <enum-type name="QXmlNodeModelIndex::NodeKind"/>
   <enum-type name="QXmlNodeModelIndex::DocumentOrder"/>
   <enum-type name="QXmlNodeModelIndex::Axis"/>
+  <enum-type name="QXmlQuery::QueryLanguage"/>
   <enum-type name="QAbstractXmlNodeModel::SimpleAxis"/>
 
   <object-type name="QAbstractMessageHandler">