Added missing classes.

Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
          Marcelo Lira <marcelo.lira@openbossa.org>

6 files changed, 52 insertions, 8 deletions

diff --git a/PySide/QtCore/CMakeLists.txt b/PySide/QtCore/CMakeLists.txt
index 5bd295d1e..554cefbae 100644
--- a/PySide/QtCore/CMakeLists.txt
+++ b/PySide/QtCore/CMakeLists.txt
@@ -83,6 +83,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qmutex_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qmutexlocker_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qobject_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qpersistentmodelindex_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qpluginloader_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qpoint_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qpointf_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qprocess_wrapper.cpp
@@ -92,6 +93,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qrect_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qrectf_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qregexp_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qresource_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qrunnable_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qsemaphore_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qsettings_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qsignalmapper_wrapper.cpp
@@ -113,6 +115,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtextencoder_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtextstream_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtextstreammanipulator_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qthread_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qthreadpool_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtime_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtimeline_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtimer_wrapper.cpp
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
index 70e18e538..f364dd053 100644
--- a/PySide/QtCore/typesystem_core.xml
+++ b/PySide/QtCore/typesystem_core.xml
@@ -58,7 +58,6 @@
 
   <rejection class="QFutureSynchronizer"/>
   <rejection class="QByteArray" function-name="contains"/>
-  <rejection class="QRunnable"/>
   <rejection class="QLatin1String" />
   <rejection class="QLatin1Char" />
   <rejection class="QStringMatcher" />
@@ -75,7 +74,6 @@
   <rejection class="*" function-name="trUtf8" />
   <rejection class="*" function-name="qt_metacast" />
   <rejection class="*" function-name="qt_metacall" />
-  <rejection class="QThreadPool"/>
   <!-- From Qt4.6 -->
   <rejection class="*" field-name="d_ptr"/>
   <rejection class="*" field-name="staticQtMetaObject"/>
@@ -430,14 +428,12 @@
   <rejection class="QForeachContainerBase"/>
   <rejection class="QGlobalStatic"/>
   <rejection class="QInternal"/>
-  <rejection class="QLibrary"/>
   <rejection class="QMetaType"/>
   <rejection class="QMetaTypeId"/>
   <rejection class="QNoImplicitBoolCast"/>
   <rejection class="QObjectCleanupHandler"/>
   <rejection class="QObjectData"/>
   <rejection class="QObjectUserData"/>
-  <rejection class="QPluginLoader"/>
   <rejection class="QPointer"/>
   <rejection class="QSetIterator"/>
   <rejection class="QSharedData"/>
@@ -2228,9 +2224,8 @@
       <include file-name="qtconcurrentthreadengine.h" location="global"/>
     </extra-includes>
   </namespace-type>
-  <!-- <object-type name="QThreadPool"/> -->
+  <object-type name="QThreadPool" />
   <value-type name="QXmlStreamAttribute"/>
-  <!-- FIXME Removed due to a shiboken bug-->
   <value-type name="QXmlStreamAttributes">
     <modify-function signature="push_back(QXmlStreamAttribute)" remove="all"/>
     <modify-function signature="pop_back()" remove="all"/>
@@ -2597,7 +2592,11 @@
   </add-function>
 
   <object-type name="QFactoryInterface"/>
+  <object-type name="QRunnable"/>
+
+  <object-type name="QPluginLoader"/>
 
+  <suppress-warning text="Unable to decide type of property: 'QLibrary::LoadHints' in class 'QPluginLoader'" />
   <suppress-warning text="enum '_ISalnum' does not have a type entry or is not an enum" />
   <suppress-warning text="enum 'Qt::Initialization' does not have a type entry or is not an enum" />
   <suppress-warning text="signature 'contais(QXmlStreamAttribute)' for function modification in 'QXmlStreamAttributes' not found."/>
diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt
index 9d502944b..85c61b9b2 100644
--- a/PySide/QtGui/CMakeLists.txt
+++ b/PySide/QtGui/CMakeLists.txt
@@ -3,6 +3,8 @@ project(QtGui)
 if(ENABLE_X11)
     set(SPECIFIC_OS_FILES
         ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qx11info_wrapper.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qx11embedcontainer_wrapper.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qx11embedwidget_wrapper.cpp
        )
 
     if(Q_WS_MAEMO_5)
@@ -28,6 +30,7 @@ else()
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qmatrix4x3_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qmatrix4x4_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qgesture_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qgestureevent_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qgesturerecognizer_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qgraphicsanchor_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qgraphicsanchorlayout_wrapper.cpp
@@ -46,6 +49,8 @@ else()
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qpinchgesture_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qquaternion_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qswipegesture_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qtapandholdgesture_wrapper.cpp
+    ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qtapgesture_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qtilerules_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qtouchevent_wrapper.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qtouchevent_touchpoint_wrapper.cpp
diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml
index 4ba84e628..6e1ef31d8 100644
--- a/PySide/QtGui/typesystem_gui_common.xml
+++ b/PySide/QtGui/typesystem_gui_common.xml
@@ -2333,6 +2333,33 @@
   <object-type name="QMouseEvent" copyable= "false" 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" copyable= "false" polymorphic-id-expression="%1-&gt;type() == QEvent::Paint"/>
   <object-type name="QAccessibleEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::AccessibilityDescription || %1-&gt;type() == QEvent::AccessibilityHelp"/>
+  <object-type name="QGestureEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::Gesture || %1-&gt;type() == QEvent::GestureOverride">
+    <modify-function signature="activeGestures()const">
+      <modify-argument index="return">
+        <define-ownership owner="default"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="canceledGestures()const">
+      <modify-argument index="return">
+        <define-ownership owner="default"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="gestures()const">
+      <modify-argument index="return">
+        <define-ownership owner="default"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="gesture(Qt::GestureType)const">
+      <modify-argument index="return">
+        <define-ownership owner="default"/>
+      </modify-argument>
+    </modify-function>
+    <modify-function signature="widget()const">
+      <modify-argument index="return">
+        <define-ownership owner="default"/>
+      </modify-argument>
+    </modify-function>
+  </object-type>
   <object-type name="QAbstractButton"/>
   <object-type name="QStyle">
     <enum-type name="ComplexControl" extensible="yes"/>
@@ -4849,6 +4876,8 @@
   <object-type name="QGestureRecognizer">
       <enum-type name="ResultFlag" flags="QGestureRecognizer::Result"/>
   </object-type>
+  <object-type name="QTapAndHoldGesture"/>
+  <object-type name="QTapGesture"/>
   <object-type name="QGraphicsAnchor"/>
   <object-type name="QGraphicsAnchorLayout"/>
   <object-type name="QGraphicsBlurEffect">
@@ -4912,7 +4941,7 @@
       <include file-name="QMatrix4x4" location="global"/>
     </extra-includes>
   </value-type>
-
+  
   <suppress-warning text="template baseclass 'QGenericMatrix&lt;qreal&gt;' of '*' is not known"/>
   <suppress-warning text="signature 'QApplication(int&amp;,char**)' for function modification in 'QApplication' not found."/>
   <suppress-warning text="signature 'QApplication(int&amp;,char**,bool)' for function modification in 'QApplication' not found."/>
diff --git a/PySide/QtGui/typesystem_gui_x11.xml b/PySide/QtGui/typesystem_gui_x11.xml
index 0fd36280b..920b6a2dc 100644
--- a/PySide/QtGui/typesystem_gui_x11.xml
+++ b/PySide/QtGui/typesystem_gui_x11.xml
@@ -26,6 +26,12 @@
     <modify-function signature="visual()const" remove="all"/>
     <modify-function signature="appVisual(int)" remove="all"/>
   </value-type>
-
+  <object-type name="QX11EmbedContainer">
+    <enum-type name="Error"/>
+  </object-type>
+  <object-type name="QX11EmbedWidget">
+    <enum-type name="Error"/>
+  </object-type>
+ 
   <enum-type name="QPixmap::ShareMode"/>
 </typesystem>
diff --git a/PySide/global.h.in b/PySide/global.h.in
index 7266fe1cd..0e76e4681 100644
--- a/PySide/global.h.in
+++ b/PySide/global.h.in
@@ -337,6 +337,8 @@ QT_END_HEADER
 #include "qpytextobject.h"
 #if @ENABLE_X11@
   #include <QtGui/QX11Info>
+  #include <QtGui/QX11EmbedContainer>
+  #include <QtGui/QX11EmbedWidget>
 #endif
 #include <QtXml/QtXml>
 #include <QtUiTools/QtUiTools>