From 8b191fbc3bd76ef61103977b3e7d0c875c6c921e Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Tue, 26 Oct 2010 09:53:53 +0200
Subject: Make bindings for 4.7 compile

---
 generator/typesystem_core-common.xml    | 9 ++++++++-
 generator/typesystem_core.xml           | 9 ++++++++-
 generator/typesystem_gui-common.xml     | 8 ++++++--
 generator/typesystem_gui.xml            | 8 ++++++--
 generator/typesystem_network-common.xml | 3 +++
 generator/typesystem_network.xml        | 3 +++
 6 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/generator/typesystem_core-common.xml b/generator/typesystem_core-common.xml
index 82827f7..0b2673b 100644
--- a/generator/typesystem_core-common.xml
+++ b/generator/typesystem_core-common.xml
@@ -16,6 +16,7 @@
   <rejection class="" enum-name="QtValidLicenseForSqlModule"/>
   <rejection class="" enum-name="QtValidLicenseForOpenGLModule"/>
   <rejection class="" enum-name="enum_1"/>
+  <rejection class="" enum-name="enum_2"/>
   <rejection class="" enum-name="QtValidLicenseForXmlModule"/>
   <rejection class="" enum-name="QtValidLicenseForXmlPatternsModule"/>
   <rejection class="" enum-name="QtValidLicenseForActiveQtModule"/>
@@ -419,6 +420,9 @@
     <modify-function signature="mightBeRichText(const QString &amp;)" remove="all" />
     <modify-function signature="escape(const QString&amp;)" remove="all" />
     <modify-function signature="convertFromPlainText(const QString &amp;, Qt::WhiteSpaceMode)" remove="all" />
+    <extra-includes>
+      <include file-name="QGesture" location="global"/>
+    </extra-includes>
   </namespace-type>
 
   <enum-type name="QDate::MonthNameType" />
@@ -434,7 +438,9 @@
   <enum-type name="QStateMachine::RestorePolicy" />
   <enum-type name="Qt::AnchorPoint" />
   <enum-type name="Qt::CoordinateSystem" />
-  <!-- <enum-type name="Qt::GestureState" /> -->
+  <enum-type name="Qt::GestureFlag" flags="Qt::GestureFlags" />
+  <enum-type name="Qt::GestureState" />
+  <enum-type name="Qt::GestureType" />
   <enum-type name="Qt::InputMethodHint" flags="Qt::InputMethodHints" />
   <enum-type name="Qt::NavigationMode" />
   <enum-type name="Qt::RenderHint" />
@@ -584,6 +590,7 @@
   <enum-type name="QDataStream::Version">
     <reject-enum-value name="Qt_4_1"/>
     <reject-enum-value name="Qt_4_5"/>
+    <reject-enum-value name="Qt_4_6"/>
   </enum-type>
 
   <enum-type name="QDir::SortFlag" flags="QDir::SortFlags">
diff --git a/generator/typesystem_core.xml b/generator/typesystem_core.xml
index f8550f8..3e5d7e0 100644
--- a/generator/typesystem_core.xml
+++ b/generator/typesystem_core.xml
@@ -50,6 +50,7 @@
   <rejection class="" enum-name="QtValidLicenseForSqlModule"/>
   <rejection class="" enum-name="QtValidLicenseForOpenGLModule"/>
   <rejection class="" enum-name="enum_1"/>
+  <rejection class="" enum-name="enum_2"/>
   <rejection class="" enum-name="QtValidLicenseForXmlModule"/>
   <rejection class="" enum-name="QtValidLicenseForXmlPatternsModule"/>
   <rejection class="" enum-name="QtValidLicenseForActiveQtModule"/>
@@ -453,6 +454,9 @@
     <modify-function signature="mightBeRichText(const QString &amp;)" remove="all"/>
     <modify-function signature="escape(const QString&amp;)" remove="all"/>
     <modify-function signature="convertFromPlainText(const QString &amp;, Qt::WhiteSpaceMode)" remove="all"/>
+    <extra-includes>
+      <include file-name="QGesture" location="global"/>
+    </extra-includes>
   
     <extra-includes>
         <include file-name="QTextDocument" location="global"/>
@@ -472,7 +476,9 @@
   <enum-type name="QStateMachine::RestorePolicy"/>
   <enum-type name="Qt::AnchorPoint"/>
   <enum-type name="Qt::CoordinateSystem"/>
-  <!-- <enum-type name="Qt::GestureState" /> -->
+  <enum-type name="Qt::GestureFlag" flags="Qt::GestureFlags"/>
+  <enum-type name="Qt::GestureState"/>
+  <enum-type name="Qt::GestureType"/>
   <enum-type name="Qt::InputMethodHint" flags="Qt::InputMethodHints"/>
   <enum-type name="Qt::NavigationMode"/>
   <enum-type name="Qt::RenderHint"/>
@@ -622,6 +628,7 @@
   <enum-type name="QDataStream::Version">
     <reject-enum-value name="Qt_4_1"/>
     <reject-enum-value name="Qt_4_5"/>
+    <reject-enum-value name="Qt_4_6"/>
   </enum-type>
 
   <enum-type name="QDir::SortFlag" flags="QDir::SortFlags">
diff --git a/generator/typesystem_gui-common.xml b/generator/typesystem_gui-common.xml
index d008541..61f33e4 100644
--- a/generator/typesystem_gui-common.xml
+++ b/generator/typesystem_gui-common.xml
@@ -244,6 +244,7 @@
   <enum-type name="QPaintEngine::Type"/>
   <enum-type name="QPageSetupDialog::PageSetupDialogOption" flags="QPageSetupDialog::PageSetupDialogOptions" />
   <enum-type name="QPainter::CompositionMode"/>
+  <enum-type name="QPainter::PixmapFragmentHint"/>
   <enum-type name="QPainter::RenderHint" flags="QPainter::RenderHints"/>
   <enum-type name="QPainterPath::ElementType"/>
   <enum-type name="QPrintEngine::PrintEnginePropertyKey">
@@ -380,6 +381,7 @@
   <enum-type name="QTextDocument::FindFlag" flags="QTextDocument::FindFlags"/>
   <enum-type name="QTextDocument::MetaInformation"/>
   <enum-type name="QTextDocument::ResourceType"/>
+  <enum-type name="QTextDocument::Stacks"/>
   <enum-type name="QTextEdit::AutoFormattingFlag" flags="QTextEdit::AutoFormatting"/>
   <enum-type name="QTextEdit::LineWrapMode"/>
   <enum-type name="QTextFormat::ObjectTypes"/>
@@ -3326,6 +3328,7 @@
 
   <object-type name="QWidget">
     <extra-includes>
+        <include file-name="QGesture" location="global"/>
         <include file-name="QIcon" location="global"/>
         <include file-name="QMessageBox" location="global"/>
     </extra-includes>
@@ -5099,6 +5102,9 @@
   <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" />
+    <extra-includes>
+      <include file-name="QGesture" location="global"/>
+    </extra-includes>
   </object-type>
   <object-type name="QGraphicsOpacityEffect" />
   <object-type name="QGraphicsPixelizeEffect" />
@@ -5113,8 +5119,6 @@
   <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" />
   
-  <enum-type name="Qt::GestureType" />
-  <enum-type name="Qt::GestureFlag" flags="Qt::GestureFlags" />
   <enum-type name="QGesture::GestureCancelPolicy" />
   <enum-type name="QGraphicsEffect::PixmapPadMode" />
   <enum-type name="QGraphicsBlurEffect::BlurHint" flags="QGraphicsBlurEffect::BlurHints" />
diff --git a/generator/typesystem_gui.xml b/generator/typesystem_gui.xml
index c87ff20..da96b82 100644
--- a/generator/typesystem_gui.xml
+++ b/generator/typesystem_gui.xml
@@ -244,6 +244,7 @@
   <enum-type name="QPaintEngine::Type"/>
   <enum-type name="QPageSetupDialog::PageSetupDialogOption" flags="QPageSetupDialog::PageSetupDialogOptions"/>
   <enum-type name="QPainter::CompositionMode"/>
+  <enum-type name="QPainter::PixmapFragmentHint"/>
   <enum-type name="QPainter::RenderHint" flags="QPainter::RenderHints"/>
   <enum-type name="QPainterPath::ElementType"/>
   <enum-type name="QPrintEngine::PrintEnginePropertyKey">
@@ -380,6 +381,7 @@
   <enum-type name="QTextDocument::FindFlag" flags="QTextDocument::FindFlags"/>
   <enum-type name="QTextDocument::MetaInformation"/>
   <enum-type name="QTextDocument::ResourceType"/>
+  <enum-type name="QTextDocument::Stacks"/>
   <enum-type name="QTextEdit::AutoFormattingFlag" flags="QTextEdit::AutoFormatting"/>
   <enum-type name="QTextEdit::LineWrapMode"/>
   <enum-type name="QTextFormat::ObjectTypes"/>
@@ -3745,6 +3747,7 @@
 
   <object-type name="QWidget">
     <extra-includes>
+        <include file-name="QGesture" location="global"/>
         <include file-name="QIcon" location="global"/>
         <include file-name="QMessageBox" location="global"/>
     </extra-includes>
@@ -5572,6 +5575,9 @@
   <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"/>
+    <extra-includes>
+      <include file-name="QGesture" location="global"/>
+    </extra-includes>
   </object-type>
   <object-type name="QGraphicsOpacityEffect"/>
   <object-type name="QGraphicsPixelizeEffect"/>
@@ -5586,8 +5592,6 @@
   <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"/>
   
-  <enum-type name="Qt::GestureType"/>
-  <enum-type name="Qt::GestureFlag" flags="Qt::GestureFlags"/>
   <enum-type name="QGesture::GestureCancelPolicy"/>
   <enum-type name="QGraphicsEffect::PixmapPadMode"/>
   <enum-type name="QGraphicsBlurEffect::BlurHint" flags="QGraphicsBlurEffect::BlurHints"/>
diff --git a/generator/typesystem_network-common.xml b/generator/typesystem_network-common.xml
index 0a04119..c33be39 100644
--- a/generator/typesystem_network-common.xml
+++ b/generator/typesystem_network-common.xml
@@ -31,12 +31,15 @@
   <enum-type name="QSsl::SslProtocol" />
   <enum-type name="QLocalSocket::LocalSocketError" />
   <enum-type name="QLocalSocket::LocalSocketState" />
+  <enum-type name="QNetworkAccessManager::NetworkAccessibility" />
   <enum-type name="QNetworkAccessManager::Operation" />
   <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::LoadControl" />
+  <enum-type name="QNetworkRequest::Priority" />
 
   <object-type name="QAbstractNetworkCache" />
   <object-type name="QNetworkDiskCache">
diff --git a/generator/typesystem_network.xml b/generator/typesystem_network.xml
index ef4a961..0ed8f31 100644
--- a/generator/typesystem_network.xml
+++ b/generator/typesystem_network.xml
@@ -32,12 +32,15 @@
   <enum-type name="QSsl::SslProtocol"/>
   <enum-type name="QLocalSocket::LocalSocketError"/>
   <enum-type name="QLocalSocket::LocalSocketState"/>
+  <enum-type name="QNetworkAccessManager::NetworkAccessibility"/>
   <enum-type name="QNetworkAccessManager::Operation"/>
   <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::LoadControl"/>
+  <enum-type name="QNetworkRequest::Priority"/>
 
   <object-type name="QAbstractNetworkCache"/>
   <object-type name="QNetworkDiskCache">
-- 
cgit v1.2.3