From 217e1204485575f9c31bd9e4bbd94525f452fc0e 2012-04-25 14:52:36
From: florianlink <florianlink@ea8d5007-eb21-0410-b261-ccb3ea6e24a9>
Date: 2012-04-25 14:52:36
Subject: [PATCH] Updated to Qt 4.8 and added some previously unwrapped classes

git-svn-id: svn://svn.code.sf.net/p/pythonqt/code/trunk@213 ea8d5007-eb21-0410-b261-ccb3ea6e24a9

---

diff --git a/generator/typesystem_core.xml b/generator/typesystem_core.xml
index d903f54..6e3990e 100644
--- a/generator/typesystem_core.xml
+++ b/generator/typesystem_core.xml
@@ -31,7 +31,27 @@
           }
     </template><template name="core.convert_stringref_to_string">
             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"/>
+    </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="qgl_GLsizeiptr"/>
+  <primitive-type name="qgl_GLintptr"/>
+  <primitive-type name="GLint"/>
+  <primitive-type name="GLuint"/>
+  <primitive-type name="GLenum"/>
+  <primitive-type name="GLclampf"/>
+  <primitive-type name="GLsizei"/>
+  <primitive-type name="GLfloat"/>
+  <primitive-type name="GLbitfield"/>
+  <primitive-type name="GLbyte"/>
+  <primitive-type name="GLshort"/>
+  <primitive-type name="GLubyte"/>
+  <primitive-type name="GLushort"/>
+  <primitive-type name="GLdouble"/>
+  <primitive-type name="GLclampd"/>
+  <primitive-type name="GLvoid"/>
+  <primitive-type name="GLboolean"/>
+
+  <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"/>
@@ -271,7 +291,6 @@
   <rejection class="QHashNode"/>
   <rejection class="QInternal"/>
   <rejection class="QIncompatibleFlag"/>
-  <rejection class="QLibrary"/>
   <rejection class="QLinkedList"/>
   <rejection class="QLinkedListData"/>
   <rejection class="QLinkedListIterator"/>
@@ -283,13 +302,7 @@
   <rejection class="QMapPayloadNode"/>
   <rejection class="QMapData"/>
   <rejection class="QMapIterator"/>
-  <rejection class="QMetaType"/>
   <rejection class="QMetaTypeId"/>
-  <rejection class="QMetaProperty"/>
-  <rejection class="QMetaObject"/>
-  <rejection class="QMetaClassInfo"/>
-  <rejection class="QMetaMethod"/>
-  <rejection class="QMetaEnum"/>
   <rejection class="QMultiHash"/>
   <rejection class="QMultiMap"/>
   <rejection class="QMutableHashIterator"/>
@@ -305,13 +318,11 @@
   <rejection class="QPluginLoader"/>
   <rejection class="QPointer"/>
   <rejection class="QReadLocker"/>
-  <rejection class="QResource"/>
   <rejection class="QSet"/>
   <rejection class="QSetIterator"/>
   <rejection class="QSharedData"/>
   <rejection class="QSharedDataPointer"/>
   <rejection class="QStack"/>
-  <rejection class="QSysInfo"/>
   <rejection class="QTextStreamManipulator"/>
   <rejection class="QThreadStorage"/>
   <rejection class="QThreadStorageData"/>
@@ -350,7 +361,6 @@
 
   <rejection class="QLocale::Data"/>
   <rejection class="QGlobalStaticDeleter"/>
-  <rejection class="QSharedMemory"/> <!-- Temporarily until we know how to implement it in Java -->
   <rejection class="QVarLengthArray"/>
 
   <!-- DBus -->
@@ -471,7 +481,16 @@
   <enum-type name="Qt::RenderHint"/>
   <enum-type name="Qt::TileRule"/>
   <enum-type name="Qt::TouchPointState" flags="Qt::TouchPointStates"/>
-
+  <enum-type name="QSysInfo::Endian"/>
+  <enum-type name="QSysInfo::Sizes"/>
+  <enum-type name="QMetaMethod::Access"/>
+  <enum-type name="QMetaMethod::Attributes"/>
+  <enum-type name="QMetaMethod::MethodType"/>
+  <enum-type name="QSharedMemory::AccessMode"/>
+  <enum-type name="QSharedMemory::SharedMemoryError"/>
+  <enum-type name="QElapsedTimer::ClockType"/>
+  <enum-type name="QMetaType::Type"/>
+ 
   <enum-type name="QtMsgType">
     <reject-enum-value name="QtSystemMsg"/>
   </enum-type>
@@ -497,11 +516,16 @@
   <enum-type name="QFile::FileError"/>
   <enum-type name="QFile::MemoryMapFlags"/>
   <enum-type name="QFile::Permission" flags="QFile::Permissions"/>
+  <enum-type name="QFile::FileHandleFlag" flags="QFile::FileHandleFlags"/>
   <enum-type name="QIODevice::OpenModeFlag" flags="QIODevice::OpenMode"/>
   <enum-type name="QLibraryInfo::LibraryLocation"/>
+  <enum-type name="QLibrary::LoadHint" flags="QLibrary::LoadHints"/>
   <enum-type name="QLocale::FormatType"/>
   <enum-type name="QLocale::NumberOption" flags="QLocale::NumberOptions"/>
   <enum-type name="QLocale::MeasurementSystem"/>
+  <enum-type name="QLocale::QuotationStyle"/>
+  <enum-type name="QLocale::Script"/>
+  <enum-type name="QLocale::CurrencySymbolFormat"/>
   <enum-type name="QMutex::RecursionMode"/>
   <enum-type name="QProcess::ExitStatus"/>
   <enum-type name="QProcess::ProcessChannel"/>
@@ -550,6 +574,9 @@
   <enum-type name="Qt::FocusPolicy"/>
   <enum-type name="Qt::FocusReason"/>
   <enum-type name="Qt::GlobalColor"/>
+  <enum-type name="Qt::GestureType"/>
+  <enum-type name="Qt::GestureFlag" flags="Qt::GestureFlags"/>
+  <enum-type name="Qt::CursorMoveStyle"/>
   <enum-type name="Qt::HitTestAccuracy"/>
   <enum-type name="Qt::InputMethodQuery"/>
   <enum-type name="Qt::ItemFlag" flags="Qt::ItemFlags"/>
@@ -1698,6 +1725,7 @@
     <modify-function signature="QCoreApplication(int &amp;, char  **)">
       <access modifier="private"/>
     </modify-function>
+    <modify-function signature="QCoreApplication(int &amp;, char  **, int)" remove="all"/>
     <modify-function signature="removePostedEvents(QObject*)">
       <modify-argument index="1">
         <reference-count action="ignore"/>
@@ -2359,6 +2387,18 @@
   <object-type name="QtJambiFutureIterator" generic-class="yes" java-name="QFutureIterator"/>
   <object-type name="QRunnable"/>
 
+  <object-type name="QSysInfo"/>
+  <object-type name="QLibrary"/>
+  <object-type name="QResource"/>
+  <object-type name="QSharedMemory"/>
+  <object-type name="QMetaObject"/>
+  <object-type name="QMetaMethod"/>
+  <object-type name="QMetaEnum"/>
+  <object-type name="QMetaProperty"/>
+  <object-type name="QMetaClassInfo"/>
+  <object-type name="QElapsedTimer"/>
+  <object-type name="QMetaType"/>
+
   <!-- 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."/>
@@ -2375,7 +2415,6 @@
   <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;'"/>
-  <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QMetaObject'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'FILE\*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QByteArray::Data\*'"/>
   <suppress-warning text="WARNING(MetaJavaBuilder) :: skipping * unmatched *type 'QTSMFC'"/>
diff --git a/generator/typesystem_gui.xml b/generator/typesystem_gui.xml
index 5ae2920..cf4a8f9 100644
--- a/generator/typesystem_gui.xml
+++ b/generator/typesystem_gui.xml
@@ -1,11 +1,12 @@
 <?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"/>
+<typesystem package="com.trolltech.qt.gui"><rejection class="QAbstractTextDocumentLayout"/><rejection class="QColormap"/><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"/><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"/>
@@ -17,7 +18,6 @@
   <rejection class="QBrushData"/>
   <rejection class="QImageTextKeyLang"/>
   <rejection class="QItemEditorCreator"/>
-  <rejection class="QLibrary"/>
   <rejection class="QLinkedList"/>
   <rejection class="QLinkedListData"/>
   <rejection class="QLinkedListIterator"/>
@@ -95,7 +95,9 @@
   <rejection class="QGradient" function-name="interpolationMode"/>
   <rejection class="QAbstractTextDocumentLayout" function-name="handlerForObject"/>
   
-
+  <enum-type name="QStaticText::PerformanceHint"/>
+  <enum-type name="QTextBlockFormat::LineHeightTypes"/>
+  <enum-type name="QStyleOptionTabWidgetFrameV2::StyleOptionVersion"/>
   <enum-type name="QStyleOptionTabBarBaseV2::StyleOptionVersion"/>
   <enum-type name="QTabBar::SelectionBehavior"/>
   <enum-type name="QTabBar::ButtonPosition"/>
@@ -508,11 +510,29 @@
   <enum-type name="QGraphicsEffect::ChangeFlag" flags="QGraphicsEffect::ChangeFlags"/>
   <enum-type name="QGraphicsItem::PanelModality"/>
   <enum-type name="QPinchGesture::WhatChange" flags="QPinchGesture::WhatChanged"/>
+  <enum-type name="QPinchGesture::ChangeFlag" flags="QPinchGesture::ChangeFlags"/>
+  <enum-type name="QGraphicsBlurEffect::BlurHint" flags="QGraphicsBlurEffect::BlurHints"/>
+  <enum-type name="QGraphicsEffect::PixmapPadMode"/>
+  <enum-type name="QGestureRecognizer::ResultFlag" flags="QGestureRecognizer::Result"/>
+  <enum-type name="QGestureRecognizer::LineHeightTypes"/>
   <enum-type name="QStyle::RequestSoftwareInputPanel"/>
   <enum-type name="QSwipeGesture::SwipeDirection"/>
   <enum-type name="QTouchEvent::DeviceType"/>
+  <enum-type name="QFont::HintingPreference"/>
+  <enum-type name="QGesture::GestureCancelPolicy"/>
+  <enum-type name="QTextDocument::Stacks"/>
+  <enum-type name="QPainter::PixmapFragmentHint"/>
+
+  <object-type name="QAbstractProxyModel"/>
+  <object-type name="QDirModel"/>
+  <object-type name="QFileSystemModel"/>
+  <object-type name="QPrinterInfo"/>
+  <object-type name="QSortFilterProxyModel"/>
+  <object-type name="QProxyModel"/>
+  <object-type name="QTextOption"/>
+  <object-type name="QFontDatabase"/>
+  <object-type name="QGestureRecognizer" force-abstract="yes"/>
   
-
   <value-type name="QPixmapCache::Key"/>
   <value-type name="QTileRules"/>
   <value-type name="QVector2D"/>
@@ -587,6 +607,7 @@
     <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="QStyleOptionTabWidgetFrameV2" delete-in-main-thread="yes" polymorphic-id-expression="%1-&gt;type == QStyleOptionTabWidgetFrameV2::Type &amp;&amp; %1-&gt;version == QStyleOptionTabWidgetFrameV2::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"/>
@@ -2660,6 +2681,7 @@
   <object-type name="QInputEvent">
     <modify-function signature="modifiers()const" access="non-final"/>
   </object-type>
+  <object-type name="QGestureEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Gesture || %1-&gt;type() == QEvent::GestureOverride"/>
   <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"/>
@@ -5146,9 +5168,7 @@
     <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <!--### Obsolete in 4.3-->
     <modify-function signature="setMatrixEnabled(bool)" remove="all"/> <!--### Obsolete in 4.3-->
   
-    <modify-function signature="fontInfo()const" remove="all"/>
-    <modify-function signature="fontMetrics()const" remove="all"/>
-    <modify-function signature="QPainter(QPaintDevice*)" remove="all"/>
+    <modify-function signature="setBrush(Qt::BrushStyle)" remove="all"/> <!--### Problematic in PythonQt -->
 
     <modify-function signature="begin(QPaintDevice*)">
       <modify-argument index="1">
@@ -5562,9 +5582,12 @@
   <object-type name="QStylePlugin"/>
   <object-type name="QTextCodecPlugin"/>
   <object-type name="QGesture"/>
+  <object-type name="QTapGesture"/>
+  <object-type name="QTapAndHoldGesture"/>
   <object-type name="QGraphicsAnchorLayout"/>
   <object-type name="QGraphicsAnchor"/>
   <object-type name="QGraphicsEffect"/>
+  <object-type name="QStaticText"/>
   <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"/>
diff --git a/generator/typesystem_network.xml b/generator/typesystem_network.xml
index c635547..77d4d18 100644
--- a/generator/typesystem_network.xml
+++ b/generator/typesystem_network.xml
@@ -6,7 +6,6 @@
 
   <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"/>
@@ -30,15 +29,22 @@
   <enum-type name="QSsl::KeyAlgorithm"/>
   <enum-type name="QSsl::AlternateNameEntryType"/>
   <enum-type name="QSsl::SslProtocol"/>
+  <enum-type name="QSsl::SslOption" flags="QSsl::SslOptions"/>
   <enum-type name="QLocalSocket::LocalSocketError"/>
   <enum-type name="QLocalSocket::LocalSocketState"/>
   <enum-type name="QNetworkAccessManager::Operation"/>
+  <enum-type name="QNetworkAccessManager::NetworkAccessibility"/>
   <enum-type name="QNetworkCookie::RawForm"/>
   <enum-type name="QNetworkReply::NetworkError"/>
   <enum-type name="QNetworkRequest::Attribute" extensible="yes"/>
   <enum-type name="QNetworkRequest::CacheLoadControl"/>
   <enum-type name="QNetworkRequest::KnownHeaders"/>
-
+  <enum-type name="QNetworkRequest::Priority"/>
+  <enum-type name="QNetworkRequest::LoadControl"/>
+  <enum-type name="QNetworkProxyQuery::QueryType"/>
+  <enum-type name="QHttpMultiPart::ContentType"/>
+  <object-type name="QHttpMultiPart"/>
+  <object-type name="QHttpPart"/>
   <object-type name="QAbstractNetworkCache"/>
   <object-type name="QNetworkDiskCache">
     <modify-function signature="insert(QIODevice*)">
diff --git a/generator/typesystem_opengl.xml b/generator/typesystem_opengl.xml
index 73b9d42..ab84896 100644
--- a/generator/typesystem_opengl.xml
+++ b/generator/typesystem_opengl.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0"?>
-<typesystem package="com.trolltech.qt.opengl"><rejection class="QGL"/><rejection class="QGLFormat"/>
+<typesystem package="com.trolltech.qt.opengl"><rejection class="QGL"/>
+
+ 
+
   <rejection class="QGLColormap::QGLColormapData"/>
   <rejection class="QGLWidget" function-name="setMouseTracking"/>
 
@@ -9,6 +12,11 @@
   <enum-type name="QGLContext::BindOption" flags="QGLContext::BindOptions"/>
   <enum-type name="QGLShader::ShaderTypeBit" flags="QGLShader::ShaderType"/>
 
+  <enum-type name="QGLBuffer::Access"/>
+  <enum-type name="QGLBuffer::Type"/>
+  <enum-type name="QGLBuffer::UsagePattern"/>
+  <enum-type name="QGLFunctions::OpenGLFeature"/>
+  <enum-type name="QGLFormat::OpenGLContextProfile"/>
 
   <namespace-type name="QGL">
      <include file-name="qgl.h" location="global"/>
@@ -27,6 +35,8 @@
   </value-type>
 
   <value-type name="QGLFramebufferObjectFormat"/>
+  <object-type name="QGLFunctions"/>
+  <object-type name="QGLBuffer"/>
   <object-type name="QGLShader"/>
   <object-type name="QGLShaderProgram">
     <!-- Should be disambiguated later by fixing the native pointer API -->
diff --git a/generator/typesystem_sql.xml b/generator/typesystem_sql.xml
index b21157a..99a550d 100644
--- a/generator/typesystem_sql.xml
+++ b/generator/typesystem_sql.xml
@@ -119,6 +119,7 @@
   <enum-type name="QSqlResult::BindingSyntax"/>
   <enum-type name="QSqlResult::VirtualHookOperation"/>
   <enum-type name="QSqlTableModel::EditStrategy"/>
+  <enum-type name="QSqlRelationalTableModel::JoinMode"/>
 
   <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."/>
diff --git a/generator/typesystem_webkit.xml b/generator/typesystem_webkit.xml
index d99e27f..92ea3d9 100644
--- a/generator/typesystem_webkit.xml
+++ b/generator/typesystem_webkit.xml
@@ -10,6 +10,11 @@
     <enum-type name="QWebSettings::WebAttribute">
         <reject-enum-value name="LocalStorageEnabled"/>
     </enum-type>
+
+    <enum-type name="QWebFrame::RenderLayer"/>
+
+    <enum-type name="QWebPage::Feature"/>
+    <enum-type name="QWebPage::PermissionPolicy"/>
     <enum-type name="QWebPage::Extension"/>
     <enum-type name="QWebPage::NavigationType"/>
     <enum-type name="QWebPage::WebAction"/>