Commits

Anonymous committed ce9ad58

Regenerated the patches using the modified files from PyQt 4.9.1 to ensure
that the patches can be applied cleanly.

  • Participants
  • Parent commits 5e6303e

Comments (0)

Files changed (130)

File PyQt4-Qt-Embedded-Linux-patches/qpy/QtCore/qpycore_api.h.diff

---- qpy/QtCore/qpycore_api.h.old	2009-10-01 01:45:46.000000000 +0200
-+++ qpy/QtCore/qpycore_api.h	2009-10-01 01:54:17.000000000 +0200
-@@ -33,6 +33,7 @@
+--- qpy/QtCore/qpycore_api.h.old	2012-10-04 17:51:55.172239140 +0200
++++ qpy/QtCore/qpycore_api.h	2012-10-04 17:51:55.180239140 +0200
+@@ -28,6 +28,7 @@
  #define _QPYCORE_API_H
  
  
  #include <QCoreApplication>
  #include <QString>
  #include <QVariant>
-@@ -49,7 +50,9 @@
- 
+@@ -47,7 +48,9 @@
+ PyObject *qpycore_pyqtsignature(PyObject *args, PyObject *kwds);
  
  // Support for pyqtConfigure().
 +#ifndef QT_NO_PROPERTIES
  int qpycore_pyqtconfigure(PyObject *self, QObject *qobj, PyObject *kwds);
 +#endif
  
- 
  // Support for converting between PyObject and QString.
+ PyObject *qpycore_PyObject_FromQString(const QString &qstr);

File PyQt4-Qt-Embedded-Linux-patches/qpy/QtCore/qpycore_init.cpp.diff

---- qpy/QtCore/qpycore_init.cpp.old	2009-10-01 01:45:46.000000000 +0200
-+++ qpy/QtCore/qpycore_init.cpp	2009-10-01 01:54:27.000000000 +0200
-@@ -30,7 +30,8 @@
+--- qpy/QtCore/qpycore_init.cpp.old	2012-10-04 17:51:55.192239140 +0200
++++ qpy/QtCore/qpycore_init.cpp	2012-10-04 17:51:55.200239140 +0200
+@@ -25,6 +25,7 @@
  
  #include <Python.h>
  
  #include "qpycore_chimera.h"
  #include "qpycore_qobject_helpers.h"
  #include "qpycore_shared.h"
- #include "qpycore_sip.h"
-@@ -57,7 +58,9 @@
+@@ -54,7 +55,9 @@
      sipExportSymbol("qpycore_qobject_receivers",
              (void *)qpycore_qobject_receivers);
  

File PyQt4-Qt-Embedded-Linux-patches/qpy/QtCore/qpycore_pyqtconfigure.cpp.diff

---- qpy/QtCore/qpycore_pyqtconfigure.cpp.old	2009-10-01 01:45:46.000000000 +0200
-+++ qpy/QtCore/qpycore_pyqtconfigure.cpp	2009-10-01 01:54:10.000000000 +0200
-@@ -28,6 +28,8 @@
+--- qpy/QtCore/qpycore_pyqtconfigure.cpp.old	2012-10-04 17:51:55.184239140 +0200
++++ qpy/QtCore/qpycore_pyqtconfigure.cpp	2012-10-04 17:51:55.188239140 +0200
+@@ -23,6 +23,8 @@
  // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  
  
  #include <Python.h>
  
  #include <QByteArray>
-@@ -140,3 +142,4 @@
+@@ -167,3 +169,4 @@
  
      return 0;
  }

File PyQt4-Qt-Embedded-Linux-patches/qpy/QtCore/qpycore_qstring.cpp.diff

---- qpy/QtCore/qpycore_qstring.cpp.old	2009-10-01 01:45:46.000000000 +0200
-+++ qpy/QtCore/qpycore_qstring.cpp	2009-10-01 01:54:23.000000000 +0200
-@@ -31,8 +31,11 @@
+--- qpy/QtCore/qpycore_qstring.cpp.old	2012-10-04 17:51:55.204239140 +0200
++++ qpy/QtCore/qpycore_qstring.cpp	2012-10-04 17:51:55.244239140 +0200
+@@ -26,8 +26,11 @@
  #include <Python.h>
  #include <string.h>
  
  #include <QVector>
  
  #include "qpycore_sip.h"
-@@ -121,6 +124,7 @@
+@@ -116,6 +119,7 @@
          }
          else
          {
              QTextCodec *codec = QTextCodec::codecForTr();
  
              if (codec)
-@@ -140,6 +144,9 @@
+@@ -135,6 +139,9 @@
              {
                  obj = PyUnicode_AsLatin1String(obj);
              }

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/QtCoremod.sip.diff

---- sip/QtCore/QtCoremod.sip.old	2010-10-23 14:13:01.000000000 +0200
-+++ sip/QtCore/QtCoremod.sip	2010-10-23 14:33:01.000000000 +0200
-@@ -34,17 +34,152 @@
+--- sip/QtCore/QtCoremod.sip.old	2012-10-04 17:51:54.992239141 +0200
++++ sip/QtCore/QtCoremod.sip	2012-10-04 17:51:54.996239141 +0200
+@@ -29,17 +29,152 @@
  
- %Timeline {Qt_4_1_1 Qt_4_1_2 Qt_4_1_3 Qt_4_2_0 Qt_4_2_2 Qt_4_2_3 Qt_4_3_0 Qt_4_3_1 Qt_4_3_2 Qt_4_3_3 Qt_4_3_4 Qt_4_4_0 Qt_4_4_1 Qt_4_4_2 Qt_4_5_0 Qt_4_5_1 Qt_4_5_2 Qt_4_5_3 Qt_4_6_0 Qt_4_6_1 Qt_4_6_2 Qt_4_6_3 Qt_4_7_0}
+ %Timeline {Qt_4_1_1 Qt_4_1_2 Qt_4_1_3 Qt_4_2_0 Qt_4_2_2 Qt_4_2_3 Qt_4_3_0 Qt_4_3_1 Qt_4_3_2 Qt_4_3_3 Qt_4_3_4 Qt_4_4_0 Qt_4_4_1 Qt_4_4_2 Qt_4_5_0 Qt_4_5_1 Qt_4_5_2 Qt_4_5_3 Qt_4_6_0 Qt_4_6_1 Qt_4_6_2 Qt_4_6_3 Qt_4_7_0 Qt_4_7_1 Qt_4_7_2 Qt_4_7_3 Qt_4_7_4 Qt_4_8_0}
  
 -%Platforms {WS_X11 WS_WIN WS_MACX}
 +%Platforms {WS_X11 WS_WIN WS_MACX WS_QWS}
  %Feature PyQt_qreal_double
  %Feature Py_v3
  %Feature PyQt_PrintDialog
-@@ -140,13 +275,19 @@
+@@ -130,13 +265,19 @@
  
  %Include qglobal.sip
  %Include qnamespace.sip
  %Include qbasictimer.sip
  %Include qbitarray.sip
  %Include qbuffer.sip
-@@ -156,78 +297,132 @@
+@@ -146,78 +287,132 @@
  %Include qcoreapplication.sip
  %Include qcoreevent.sip
  %Include qcryptographichash.sip

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qabstracteventdispatcher.sip.diff

---- sip/QtCore/qabstracteventdispatcher.sip.old	2010-09-07 01:47:48.000000000 +0200
-+++ sip/QtCore/qabstracteventdispatcher.sip	2010-09-07 01:48:34.000000000 +0200
-@@ -41,7 +41,9 @@
+--- sip/QtCore/qabstracteventdispatcher.sip.old	2012-10-04 17:51:54.972239141 +0200
++++ sip/QtCore/qabstracteventdispatcher.sip	2012-10-04 17:51:54.976239141 +0200
+@@ -36,7 +36,9 @@
  public:
      explicit QAbstractEventDispatcher(QObject *parent /TransferThis/ = 0);
      virtual ~QAbstractEventDispatcher();

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qabstractitemmodel.sip.diff

---- sip/QtCore/qabstractitemmodel.sip.old	2012-10-04 17:32:10.952244884 +0200
-+++ sip/QtCore/qabstractitemmodel.sip	2012-10-04 17:33:40.188244447 +0200
+--- sip/QtCore/qabstractitemmodel.sip.old	2012-10-04 17:51:55.080239142 +0200
++++ sip/QtCore/qabstractitemmodel.sip	2012-10-04 17:51:55.084239142 +0200
 @@ -183,8 +183,10 @@
  %End
  

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qabstracttransition.sip.diff

---- sip/QtCore/qabstracttransition.sip.old	2010-09-12 00:59:43.000000000 +0200
-+++ sip/QtCore/qabstracttransition.sip	2010-09-12 00:52:29.000000000 +0200
-@@ -47,9 +47,11 @@
+--- sip/QtCore/qabstracttransition.sip.old	2012-10-04 17:51:54.856239143 +0200
++++ sip/QtCore/qabstracttransition.sip	2012-10-04 17:51:54.860239143 +0200
+@@ -42,9 +42,11 @@
      QList<QAbstractState*> targetStates() const;
-     void setTargetStates(const QList<QAbstractState*> &targets);
+     void setTargetStates(const QList<QAbstractState*> &targets /KeepReference/);
      QStateMachine *machine() const;
 +%If (PyQt_Animation)
      void addAnimation(QAbstractAnimation *animation);

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qbitarray.sip.diff

---- sip/QtCore/qbitarray.sip.old	2009-06-14 22:29:33.000000000 +0200
-+++ sip/QtCore/qbitarray.sip	2009-06-14 22:29:33.000000000 +0200
-@@ -101,8 +101,10 @@
+--- sip/QtCore/qbitarray.sip.old	2012-10-04 17:51:54.816239142 +0200
++++ sip/QtCore/qbitarray.sip	2012-10-04 17:51:54.820239142 +0200
+@@ -93,8 +93,10 @@
  QBitArray operator&(const QBitArray &, const QBitArray &);
  QBitArray operator|(const QBitArray &, const QBitArray &);
  QBitArray operator^(const QBitArray &, const QBitArray &);

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qbytearray.sip.diff

---- sip/QtCore/qbytearray.sip.old	2010-09-07 02:05:18.000000000 +0200
-+++ sip/QtCore/qbytearray.sip	2010-09-07 02:05:36.000000000 +0200
-@@ -394,8 +394,10 @@
+--- sip/QtCore/qbytearray.sip.old	2012-10-04 17:51:54.844239142 +0200
++++ sip/QtCore/qbytearray.sip	2012-10-04 17:51:54.852239143 +0200
+@@ -411,8 +411,10 @@
  bool operator>(const QByteArray &a1, const QByteArray &a2);
  bool operator>=(const QByteArray &a1, const QByteArray &a2);
  const QByteArray operator+(const QByteArray &a1, const QByteArray &a2);

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qchar.sip.diff

---- sip/QtCore/qchar.sip.old	2010-09-07 01:53:31.000000000 +0200
-+++ sip/QtCore/qchar.sip	2010-09-07 01:53:55.000000000 +0200
-@@ -407,5 +407,7 @@
+--- sip/QtCore/qchar.sip.old	2012-10-04 17:51:55.152239140 +0200
++++ sip/QtCore/qchar.sip	2012-10-04 17:51:55.160239140 +0200
+@@ -414,5 +414,7 @@
  bool operator>=(QChar c1, QChar c2);
  bool operator<(QChar c1, QChar c2);
  bool operator>(QChar c1, QChar c2);

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qcoreapplication.sip.diff

---- sip/QtCore/qcoreapplication.sip.old	2009-06-14 22:29:33.000000000 +0200
-+++ sip/QtCore/qcoreapplication.sip	2009-06-14 22:29:33.000000000 +0200
-@@ -176,12 +176,16 @@
+--- sip/QtCore/qcoreapplication.sip.old	2012-10-04 17:51:54.908239143 +0200
++++ sip/QtCore/qcoreapplication.sip	2012-10-04 17:51:54.916239142 +0200
+@@ -165,12 +165,16 @@
      static bool closingDown();
      static QString applicationDirPath();
      static QString applicationFilePath();
  
      enum Encoding
      {
-@@ -346,18 +350,23 @@
+@@ -340,18 +344,23 @@
      }
  }
  %End
  %ModuleCode
  #include <QCoreApplication>
  #include <QThread>
-@@ -403,8 +412,11 @@
+@@ -397,8 +406,11 @@
      return 0;
  }
  %End

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qcoreevent.sip.diff

---- sip/QtCore/qcoreevent.sip.old	2010-10-10 02:02:58.000000000 +0200
-+++ sip/QtCore/qcoreevent.sip	2010-10-10 02:15:56.000000000 +0200
-@@ -55,7 +55,7 @@
+--- sip/QtCore/qcoreevent.sip.old	2012-10-04 17:51:55.120239141 +0200
++++ sip/QtCore/qcoreevent.sip	2012-10-04 17:51:55.124239140 +0200
+@@ -50,7 +50,7 @@
              break;
      #endif
      
      case QEvent::StateMachineSignal:
              sipType = sipType_QStateMachine_SignalEvent;
              break;
-@@ -274,12 +274,14 @@
+@@ -269,12 +269,14 @@
  %If (Qt_4_6_0 -)
          WinIdChange,
  %End

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qdatetime.sip.diff

---- sip/QtCore/qdatetime.sip.old	2010-10-05 00:18:32.000000000 +0200
-+++ sip/QtCore/qdatetime.sip	2010-10-05 00:20:05.000000000 +0200
-@@ -98,6 +98,7 @@
-                  sipCpp->month(), sipCpp->day());
+--- sip/QtCore/qdatetime.sip.old	2012-10-04 17:51:54.896239143 +0200
++++ sip/QtCore/qdatetime.sip	2012-10-04 17:51:54.904239143 +0200
+@@ -104,6 +104,7 @@
+         }
  %End
  
 +%If (PyQt_DateString)
      long __hash__() const;
  %MethodCode
          if (sipIsAPIEnabled("QDate", 2, 0))
-@@ -110,6 +111,7 @@
+@@ -116,6 +117,7 @@
              sipRes = _Py_HashPointer(sipSelf);
          }
  %End
  
  %If (Py_DateTime)
      SIP_PYOBJECT toPyDate() const /DocType="datetime.date"/;
-@@ -137,12 +139,16 @@
+@@ -143,12 +145,16 @@
      int daysInMonth() const;
      int daysInYear() const;
      int weekNumber(int *yearNumber = 0) const;
      bool setYMD(int y, int m, int d);
      QDate addDays(int days) const;
      QDate addMonths(int months) const;
-@@ -155,8 +161,10 @@
+@@ -161,8 +167,10 @@
      bool operator>(const QDate &other) const;
      bool operator>=(const QDate &other) const;
      static QDate currentDate();
      static bool isValid(int y, int m, int d);
      static bool isLeapYear(int year);
      static uint gregorianToJulian(int y, int m, int d);
-@@ -178,6 +186,7 @@
+@@ -184,6 +192,7 @@
      };
  
  %End
 +%If (PyQt_TextDate)
  %If (Qt_4_5_0 -)
-     static QString shortMonthName(int, QDate::MonthNameType);
+     static QString shortMonthName(int month, QDate::MonthNameType type);
  %End
-@@ -190,6 +199,7 @@
+@@ -196,6 +205,7 @@
  %If (Qt_4_5_0 -)
-     static QString longDayName(int, QDate::MonthNameType);
+     static QString longDayName(int weekday, QDate::MonthNameType type);
  %End
 +%End
  };
  
  class QTime
-@@ -280,6 +290,7 @@
-         #endif
+@@ -297,6 +307,7 @@
+         }
  %End
  
 +%If (PyQt_DateString)
      long __hash__() const;
  %MethodCode
          if (sipIsAPIEnabled("QTime", 2, 0))
-@@ -292,6 +303,7 @@
+@@ -309,6 +320,7 @@
              sipRes = _Py_HashPointer(sipSelf);
          }
  %End
  
  %If (Py_DateTime)
      SIP_PYOBJECT toPyTime() const /DocType="datetime.time"/;
-@@ -315,8 +327,10 @@
+@@ -332,8 +344,10 @@
      int minute() const;
      int second() const;
      int msec() const;
      bool setHMS(int h, int m, int s, int msec = 0);
      QTime addSecs(int secs) const;
      int secsTo(const QTime &) const;
-@@ -329,8 +343,10 @@
+@@ -346,8 +360,10 @@
      bool operator>(const QTime &other) const;
      bool operator>=(const QTime &other) const;
      static QTime currentTime();
      static bool isValid(int h, int m, int s, int msec = 0);
      void start();
      int restart();
-@@ -465,6 +481,7 @@
-         #endif
+@@ -495,6 +511,7 @@
+         }
  %End
  
 +%If (PyQt_DateString)
      long __hash__() const;
  %MethodCode
          if (sipIsAPIEnabled("QDateTime", 2, 0))
-@@ -477,6 +494,7 @@
+@@ -507,6 +524,7 @@
              sipRes = _Py_HashPointer(sipSelf);
          }
  %End
  
  %If (Py_DateTime)
      SIP_PYOBJECT toPyDateTime() const /DocType="datetime.datetime"/;
-@@ -508,8 +526,10 @@
+@@ -538,8 +556,10 @@
      void setTime(const QTime &time);
      void setTimeSpec(Qt::TimeSpec spec);
      void setTime_t(uint secsSince1Jan1970UTC);
      QDateTime addDays(int days) const;
      QDateTime addMonths(int months) const;
      QDateTime addYears(int years) const;
-@@ -527,8 +547,10 @@
+@@ -557,8 +577,10 @@
      bool operator>(const QDateTime &other) const;
      bool operator>=(const QDateTime &other) const;
      static QDateTime currentDateTime();
  %If (Qt_4_2_0 -)
      static QDateTime fromTime_t(uint secsSince1Jan1970UTC);
  %End
-@@ -552,9 +574,11 @@
+@@ -582,9 +604,11 @@
  %End
  };
  

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qline.sip.diff

---- sip/QtCore/qline.sip.old	2009-06-14 22:29:33.000000000 +0200
-+++ sip/QtCore/qline.sip	2009-06-14 22:29:33.000000000 +0200
+--- sip/QtCore/qline.sip.old	2012-10-04 17:51:55.044239141 +0200
++++ sip/QtCore/qline.sip	2012-10-04 17:51:55.048239141 +0200
 @@ -104,8 +104,10 @@
  %End
  };
  
  class QLineF
  {
-@@ -218,5 +220,7 @@
+@@ -229,5 +231,7 @@
  %End
  };
  

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qlocale.sip.diff

---- sip/QtCore/qlocale.sip.old	2010-09-26 03:42:23.000000000 +0200
-+++ sip/QtCore/qlocale.sip	2010-09-26 04:15:58.000000000 +0200
-@@ -567,6 +567,7 @@
+--- sip/QtCore/qlocale.sip.old	2012-10-04 17:51:54.920239141 +0200
++++ sip/QtCore/qlocale.sip	2012-10-04 17:51:54.928239141 +0200
+@@ -715,6 +715,7 @@
  %If (Qt_4_4_0 -)
-     QString dateTimeFormat(QLocale::FormatType format = QLocale::LongFormat) const;
+     QString toString(const QDateTime &dateTime, const QString &format) const;
  %End
 +%If (PyQt_DateString)
  %If (Qt_4_4_0 -)
-     QDate toDate(const QString &, QLocale::FormatType format = QLocale::LongFormat) const;
+     QString toString(const QDateTime &dateTime, QLocale::FormatType format = QLocale::LongFormat) const;
  %End
-@@ -585,6 +586,7 @@
+@@ -745,6 +746,7 @@
  %If (Qt_4_4_0 -)
-     QDateTime toDateTime(const QString &, const QString &) const;
+     QDateTime toDateTime(const QString &string, const QString &format) const;
  %End
 +%End
      QChar decimalPoint() const;
      QChar groupSeparator() const;
      QChar percent() const;
-@@ -635,8 +637,10 @@
+@@ -893,8 +895,10 @@
  %End
  };
  
  QDataStream &operator>>(QDataStream &, QLocale & /Constrained/);
 +%End
  %If (Qt_4_2_0 -)
- QFlags<QLocale::NumberOption> operator|(QLocale::NumberOption, QFlags<QLocale::NumberOption>);
+ QFlags<QLocale::NumberOption> operator|(QLocale::NumberOption f1, QFlags<QLocale::NumberOption> f2);
  %End

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qnamespace.sip.diff

---- sip/QtCore/qnamespace.sip.old	2010-10-09 18:30:34.000000000 +0200
-+++ sip/QtCore/qnamespace.sip	2010-10-09 22:15:40.000000000 +0200
-@@ -1502,7 +1502,7 @@
+--- sip/QtCore/qnamespace.sip.old	2012-10-04 17:51:55.056239142 +0200
++++ sip/QtCore/qnamespace.sip	2012-10-04 17:51:55.060239142 +0200
+@@ -1507,7 +1507,7 @@
      };
  
      typedef QFlags<Qt::MatchFlag> MatchFlags;
      typedef void *HANDLE;
  %End
  %If (WS_X11)
-@@ -1715,6 +1715,7 @@
+@@ -1729,6 +1729,7 @@
  %If (Qt_4_6_0 -)
      typedef QFlags<Qt::TouchPointState> TouchPointStates;
  %End
  %If (Qt_4_6_0 -)
  
      enum GestureState
-@@ -1754,6 +1755,7 @@
+@@ -1768,6 +1769,7 @@
  %If (Qt_4_6_0 -)
      typedef QFlags<Qt::GestureFlag> GestureFlags;
  %End
  %If (Qt_4_6_0 -)
  
      enum NavigationMode
-@@ -1790,5 +1792,7 @@
+@@ -1992,5 +1994,7 @@
  QFlags<Qt::TouchPointState> operator|(Qt::TouchPointState f1, QFlags<Qt::TouchPointState> f2);
  %End
  %If (Qt_4_6_0 -)

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qobject.sip.diff

---- sip/QtCore/qobject.sip.old	2010-09-12 00:44:24.000000000 +0200
-+++ sip/QtCore/qobject.sip	2010-09-12 00:56:11.000000000 +0200
-@@ -166,31 +166,41 @@
+--- sip/QtCore/qobject.sip.old	2012-10-04 17:51:55.068239142 +0200
++++ sip/QtCore/qobject.sip	2012-10-04 17:51:55.076239142 +0200
+@@ -243,31 +243,41 @@
          int yes, no;
      } graph[] = {
      #if QT_VERSION >= 0x040400
          {sipName_QAbstractTransition, &sipType_QAbstractTransition, 30, 14},
      #else
          {0, 0, 30, 14},
-@@ -202,20 +212,24 @@
+@@ -279,20 +289,24 @@
          {0, 0, -1, 16},
      #endif
          {sipName_QAbstractItemModel, &sipType_QAbstractItemModel, 32, 17},
          {sipName_QState, &sipType_QState, 25, 23},
          {sipName_QFinalState, &sipType_QFinalState, -1, 24},
          {sipName_QHistoryState, &sipType_QHistoryState, -1, -1},
-@@ -228,9 +242,13 @@
+@@ -305,9 +319,13 @@
      #endif
          {sipName_QBuffer, &sipType_QBuffer, -1, 27},
          {sipName_QFile, &sipType_QFile, 29, 28},
          {sipName_QEventTransition, &sipType_QEventTransition, -1, 31},
          {sipName_QSignalTransition, &sipType_QSignalTransition, -1, -1},
      #else
-@@ -239,7 +257,7 @@
+@@ -316,7 +334,7 @@
      #endif
          {sipName_QAbstractListModel, &sipType_QAbstractListModel, -1, 33},
          {sipName_QAbstractTableModel, &sipType_QAbstractTableModel, -1, -1},
          {sipName_QAnimationGroup, &sipType_QAnimationGroup, 37, 35},
          {sipName_QVariantAnimation, &sipType_QVariantAnimation, 39, 36},
          {sipName_QPauseAnimation, &sipType_QPauseAnimation, -1, -1},
-@@ -284,6 +302,7 @@
+@@ -362,6 +380,7 @@
      const QMetaObject *metaObject() const;
      explicit QObject(QObject *parent /TransferThis/ = 0);
      virtual ~QObject();
      void pyqtConfigure(SIP_PYOBJECT) /NoArgParser/;
  %Docstring
  QObject.pyqtConfigure(...)
-@@ -316,6 +335,7 @@
+@@ -394,6 +413,7 @@
          Py_INCREF(Py_None);
          return Py_None;
  %End
 +%End
  
-     virtual bool event(QEvent *);
-     virtual bool eventFilter(QObject *, QEvent *);
-@@ -377,6 +397,7 @@
+     SIP_PYOBJECT __getattr__(const char *name) const;
+ %MethodCode
+@@ -461,6 +481,7 @@
  %End
  
  %End
  %If (Qt_4_2_0 -)
      QString trUtf8(SIP_PYOBJECT sourceText /DocType="str"/, const char *disambiguation = 0, int n = -1) const;
  %MethodCode
-@@ -435,6 +456,7 @@
+@@ -519,6 +540,7 @@
  %End
  
  %End
 +%End
      SIP_PYOBJECT findChild(SIP_PYTYPE type, const QString &name /DocValue="Py_v3:''"/ = QString()) const /DocType="QObject"/;
  %MethodCode
-         sipRes = qtcore_FindChild(sipCpp, (PyTypeObject *)a0, *a1);
-@@ -472,8 +494,10 @@
+         sipRes = qtcore_FindChild(sipCpp, qtcore_type_to_tuple(a0), *a1);
+@@ -578,8 +600,10 @@
      bool isWidgetType() const;
      bool signalsBlocked() const;
      bool blockSignals(bool b);
      int startTimer(int interval);
      void killTimer(int id);
      const QObjectList &children() const;
-@@ -507,11 +531,13 @@
+@@ -613,11 +637,13 @@
  
      void dumpObjectInfo();
      void dumpObjectTree();

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qpoint.sip.diff

---- sip/QtCore/qpoint.sip.old	2010-09-07 01:49:30.000000000 +0200
-+++ sip/QtCore/qpoint.sip	2010-09-07 01:50:10.000000000 +0200
-@@ -76,8 +76,10 @@
+--- sip/QtCore/qpoint.sip.old	2012-10-04 17:51:54.952239141 +0200
++++ sip/QtCore/qpoint.sip	2012-10-04 17:51:54.956239141 +0200
+@@ -89,8 +89,10 @@
      QPoint &operator/=(qreal c);
  };
  

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qprocess.sip.diff

---- sip/QtCore/qprocess.sip.old	2010-09-07 01:54:47.000000000 +0200
-+++ sip/QtCore/qprocess.sip	2010-09-07 01:56:35.000000000 +0200
-@@ -29,11 +29,12 @@
+--- sip/QtCore/qprocess.sip.old	2012-10-04 17:51:54.824239142 +0200
++++ sip/QtCore/qprocess.sip	2012-10-04 17:51:54.828239142 +0200
+@@ -24,11 +24,12 @@
  // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
  // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  
  typedef qint64 Q_PID;
  %End
  
-@@ -231,3 +232,4 @@
+@@ -232,3 +233,4 @@
  };
  
  %End

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qreadwritelock.sip.diff

---- sip/QtCore/qreadwritelock.sip.old	2010-09-11 00:10:22.000000000 +0200
-+++ sip/QtCore/qreadwritelock.sip	2010-09-11 00:11:05.000000000 +0200
-@@ -38,6 +38,7 @@
+--- sip/QtCore/qreadwritelock.sip.old	2012-10-04 17:51:54.940239141 +0200
++++ sip/QtCore/qreadwritelock.sip	2012-10-04 17:51:54.948239141 +0200
+@@ -33,6 +33,7 @@
  
  public:
  %If (Qt_4_4_0 -)
  
      enum RecursionMode
      {
-@@ -46,10 +47,13 @@
+@@ -41,10 +42,13 @@
      };
  
  %End

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qrect.sip.diff

---- sip/QtCore/qrect.sip.old	2010-09-07 01:59:16.000000000 +0200
-+++ sip/QtCore/qrect.sip	2010-09-07 01:59:51.000000000 +0200
-@@ -147,8 +147,10 @@
+--- sip/QtCore/qrect.sip.old	2012-10-04 17:51:54.876239143 +0200
++++ sip/QtCore/qrect.sip	2012-10-04 17:51:54.880239143 +0200
+@@ -153,8 +153,10 @@
  %End
  };
  
  bool operator==(const QRect &r1, const QRect &r2);
  bool operator!=(const QRect &r1, const QRect &r2);
  
-@@ -289,7 +291,9 @@
+@@ -307,7 +309,9 @@
  %End
  };
  

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qregexp.sip.diff

---- sip/QtCore/qregexp.sip.old	2010-09-07 01:50:59.000000000 +0200
-+++ sip/QtCore/qregexp.sip	2010-09-07 01:51:35.000000000 +0200
-@@ -148,5 +148,7 @@
+--- sip/QtCore/qregexp.sip.old	2012-10-04 17:51:55.024239141 +0200
++++ sip/QtCore/qregexp.sip	2012-10-04 17:51:55.028239141 +0200
+@@ -146,5 +146,7 @@
  %End
  };
  

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qsettings.sip.diff

---- sip/QtCore/qsettings.sip.old	2010-09-11 23:06:53.000000000 +0200
-+++ sip/QtCore/qsettings.sip	2010-09-12 00:18:26.000000000 +0200
-@@ -105,6 +105,7 @@
+--- sip/QtCore/qsettings.sip.old	2012-10-04 17:51:55.144239142 +0200
++++ sip/QtCore/qsettings.sip	2012-10-04 17:51:55.148239141 +0200
+@@ -114,6 +114,7 @@
  %If (Qt_4_4_0 -)
      static QSettings::Format defaultFormat();
  %End
 +%If (PyQt_TextCodec)
  %If (Qt_4_5_0 -)
-     void setIniCodec(QTextCodec *);
+     void setIniCodec(QTextCodec *codec /KeepReference/);
  %End
-@@ -114,6 +115,7 @@
+@@ -123,6 +124,7 @@
  %If (Qt_4_5_0 -)
      QTextCodec *iniCodec() const;
  %End
 +%End
  
  protected:
-     virtual bool event(QEvent *);
+     virtual bool event(QEvent *event);

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qsharedmemory.sip.diff

---- sip/QtCore/qsharedmemory.sip.old	2009-06-14 22:29:33.000000000 +0200
-+++ sip/QtCore/qsharedmemory.sip	2009-06-14 22:29:33.000000000 +0200
-@@ -84,8 +84,10 @@
+--- sip/QtCore/qsharedmemory.sip.old	2012-10-04 17:51:54.980239141 +0200
++++ sip/QtCore/qsharedmemory.sip	2012-10-04 17:51:54.984239141 +0200
+@@ -73,8 +73,10 @@
          sipRes = sipConvertFromConstVoidPtrAndSize(sipCpp->constData(), sipCpp->size());
  %End
  
 +%End
      QSharedMemory::SharedMemoryError error() const;
      QString errorString() const;
- 
+ %If (Qt_4_8_0 -)

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qsize.sip.diff

---- sip/QtCore/qsize.sip.old	2010-09-07 01:38:01.000000000 +0200
-+++ sip/QtCore/qsize.sip	2010-09-07 01:38:41.000000000 +0200
-@@ -82,8 +82,10 @@
+--- sip/QtCore/qsize.sip.old	2012-10-04 17:51:54.888239143 +0200
++++ sip/QtCore/qsize.sip	2012-10-04 17:51:54.892239143 +0200
+@@ -87,8 +87,10 @@
      QSize boundedTo(const QSize &otherSize) const;
  };
  

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qstate.sip.diff

---- sip/QtCore/qstate.sip.old	2010-09-12 01:02:25.000000000 +0200
-+++ sip/QtCore/qstate.sip	2010-09-12 00:53:42.000000000 +0200
-@@ -75,7 +75,9 @@
+--- sip/QtCore/qstate.sip.old	2012-10-04 17:51:54.932239141 +0200
++++ sip/QtCore/qstate.sip	2012-10-04 17:51:54.936239141 +0200
+@@ -73,7 +73,9 @@
      void setInitialState(QAbstractState *state /KeepReference/);
      QState::ChildMode childMode() const;
      void setChildMode(QState::ChildMode mode);

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qstatemachine.sip.diff

---- sip/QtCore/qstatemachine.sip.old	2010-09-12 01:01:20.000000000 +0200
-+++ sip/QtCore/qstatemachine.sip	2010-09-12 00:58:02.000000000 +0200
-@@ -92,11 +92,13 @@
+--- sip/QtCore/qstatemachine.sip.old	2012-10-04 17:51:55.088239142 +0200
++++ sip/QtCore/qstatemachine.sip	2012-10-04 17:51:55.096239142 +0200
+@@ -87,11 +87,13 @@
      QString errorString() const;
      void clearError();
      bool isRunning() const;

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qstring.sip.diff

---- sip/QtCore/qstring.sip.old	2010-09-11 00:04:08.000000000 +0200
-+++ sip/QtCore/qstring.sip	2010-09-11 00:07:19.000000000 +0200
-@@ -88,7 +88,9 @@
+--- sip/QtCore/qstring.sip.old	2012-10-04 17:51:55.132239142 +0200
++++ sip/QtCore/qstring.sip	2012-10-04 17:51:55.136239143 +0200
+@@ -83,7 +83,9 @@
  
  
  // This is needed by the %BIGetCharBufferCode.
  %End
  
  %ConvertToTypeCode
-@@ -206,6 +208,7 @@
+@@ -201,6 +203,7 @@
      }
      else
      {
          static QTextCodec *codec = 0;
          static bool check_codec = TRUE;
      
-@@ -223,6 +226,9 @@
+@@ -218,6 +221,9 @@
          if (codec)
              enc = codec->fromUnicode(*sipCpp);
          else
              enc = sipCpp->toAscii();
      
          // A Python string is the most convenient method to save the encoded
-@@ -600,8 +606,10 @@
+@@ -620,8 +626,10 @@
  const QString operator+(QChar s1, const QString &s2) /Numeric/;
  const QString operator+(const QByteArray &ba, const QString &s) /Numeric/;
  const QString operator+(const QString &s, const QByteArray &ba) /Numeric/;

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qstringlist.sip.diff

---- sip/QtCore/qstringlist.sip.old	2010-09-07 02:00:38.000000000 +0200
-+++ sip/QtCore/qstringlist.sip	2010-09-07 02:01:06.000000000 +0200
-@@ -256,5 +256,7 @@
+--- sip/QtCore/qstringlist.sip.old	2012-10-04 17:51:55.012239141 +0200
++++ sip/QtCore/qstringlist.sip	2012-10-04 17:51:55.020239141 +0200
+@@ -263,5 +263,7 @@
  QStringList &operator+=(const QString &value);
  };
  

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qtextstream.sip.diff

---- sip/QtCore/qtextstream.sip.old	2010-10-23 14:51:35.000000000 +0200
-+++ sip/QtCore/qtextstream.sip	2010-10-23 14:55:09.000000000 +0200
-@@ -78,6 +78,7 @@
+--- sip/QtCore/qtextstream.sip.old	2012-10-04 17:51:55.032239141 +0200
++++ sip/QtCore/qtextstream.sip	2012-10-04 17:51:55.040239141 +0200
+@@ -76,6 +76,7 @@
      QTextStream(QString *string /Constrained/, QFlags<QIODevice::OpenModeFlag> mode = QIODevice::ReadWrite) /API=QString: - 2/;
      QTextStream(QByteArray *array /Constrained/, QFlags<QIODevice::OpenModeFlag> mode = QIODevice::ReadWrite);
      virtual ~QTextStream();
      void setCodec(QTextCodec *codec /KeepReference/);
      void setCodec(const char *codecName);
      QTextCodec *codec() const;
-@@ -85,6 +86,7 @@
+@@ -83,6 +84,7 @@
      bool autoDetectUnicode() const;
      void setGenerateByteOrderMark(bool generate);
      bool generateByteOrderMark() const;
      void setDevice(QIODevice *device);
      QIODevice *device() const;
      void setString(QString *string /Constrained/, QFlags<QIODevice::OpenModeFlag> mode = QIODevice::ReadWrite) /API=QString: - 2/;
-@@ -166,7 +168,9 @@
+@@ -164,7 +166,9 @@
  QTextStream &endl(QTextStream &s);
  QTextStream &flush(QTextStream &s);
  QTextStream &reset(QTextStream &s);

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qthread.sip.diff

---- sip/QtCore/qthread.sip.old	2009-06-14 22:29:33.000000000 +0200
-+++ sip/QtCore/qthread.sip	2009-06-14 22:29:33.000000000 +0200
-@@ -44,7 +44,9 @@
+--- sip/QtCore/qthread.sip.old	2012-10-04 17:51:54.836239142 +0200
++++ sip/QtCore/qthread.sip	2012-10-04 17:51:54.840239142 +0200
+@@ -33,7 +33,9 @@
  
  public:
      static QThread *currentThread();

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qurl.sip.diff

---- sip/QtCore/qurl.sip.old	2010-09-07 01:52:18.000000000 +0200
-+++ sip/QtCore/qurl.sip	2010-09-07 01:52:46.000000000 +0200
-@@ -241,8 +241,10 @@
+--- sip/QtCore/qurl.sip.old	2012-10-04 17:51:54.864239143 +0200
++++ sip/QtCore/qurl.sip	2012-10-04 17:51:54.872239143 +0200
+@@ -249,8 +249,10 @@
  };
  
  QFlags<QUrl::FormattingOption> operator|(QUrl::FormattingOption f1, QFlags<QUrl::FormattingOption> f2);

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/quuid.sip.diff

---- sip/QtCore/quuid.sip.old	2012-10-04 17:38:58.836242905 +0200
-+++ sip/QtCore/quuid.sip	2012-10-04 17:42:58.880241743 +0200
+--- sip/QtCore/quuid.sip.old	2012-10-04 17:51:55.112239142 +0200
++++ sip/QtCore/quuid.sip	2012-10-04 17:51:55.116239142 +0200
 @@ -55,10 +55,13 @@
  
      QUuid();

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qvariant.sip.diff

---- sip/QtCore/qvariant.sip.old	2010-09-07 02:06:29.000000000 +0200
-+++ sip/QtCore/qvariant.sip	2010-09-07 02:07:12.000000000 +0200
-@@ -304,8 +304,10 @@
+--- sip/QtCore/qvariant.sip.old	2012-10-04 17:51:55.100239142 +0200
++++ sip/QtCore/qvariant.sip	2012-10-04 17:51:55.104239142 +0200
+@@ -212,8 +212,10 @@
          sipRes = qpycore_PyObject_FromQVariant(*sipCpp);
  %End
  
      static const char *typeToName(QVariant::Type type);
      static QVariant::Type nameToType(const char *name);
      void *data();
-@@ -324,11 +326,13 @@
+@@ -354,11 +356,13 @@
  %If (Qt_4_5_0 -)
- typedef QHash<QString,QVariant> QVariantHash /DocType="Py_v3:dict-of-str-object"/;
+ typedef QHash<QString, QVariant> QVariantHash /DocType="Py_v3:dict-of-str-object"/;
  %End
 +%If (PyQt_DataStream)
  QDataStream &operator>>(QDataStream &s, QVariant &p /Constrained/) /API=QVariant: - 2/;

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qwaitcondition.sip.diff

---- sip/QtCore/qwaitcondition.sip.old	2010-09-07 01:57:41.000000000 +0200
-+++ sip/QtCore/qwaitcondition.sip	2010-09-07 01:58:22.000000000 +0200
-@@ -41,8 +41,10 @@
+--- sip/QtCore/qwaitcondition.sip.old	2012-10-04 17:51:54.960239141 +0200
++++ sip/QtCore/qwaitcondition.sip	2012-10-04 17:51:54.968239141 +0200
+@@ -36,8 +36,10 @@
      ~QWaitCondition();
      bool wait(QMutex *mutex, unsigned long msecs = ULONG_MAX) /ReleaseGIL/;
  %If (Qt_4_4_0 -)

File PyQt4-Qt-Embedded-Linux-patches/sip/QtCore/qxmlstream.sip.diff

---- sip/QtCore/qxmlstream.sip.old	2010-10-23 14:35:13.000000000 +0200
-+++ sip/QtCore/qxmlstream.sip	2010-10-23 14:49:55.000000000 +0200
-@@ -325,6 +325,7 @@
+--- sip/QtCore/qxmlstream.sip.old	2012-10-04 17:51:55.004239141 +0200
++++ sip/QtCore/qxmlstream.sip	2012-10-04 17:51:55.008239141 +0200
+@@ -335,6 +335,7 @@
  
  %End
  %If (Qt_4_4_0 -)
  
  class QXmlStreamReader
  {
-@@ -439,7 +440,9 @@
+@@ -449,7 +450,9 @@
  };
  
  %End
  
  class QXmlStreamWriter
  {
-@@ -455,9 +458,11 @@
+@@ -465,9 +468,11 @@
      ~QXmlStreamWriter();
      void setDevice(QIODevice *device);
      QIODevice *device() const;
      void setAutoFormatting(bool);
      bool autoFormatting() const;
      void setAutoFormattingIndent(int spaces);
-@@ -487,13 +492,16 @@
+@@ -497,7 +502,9 @@
  %End
      void writeStartElement(const QString &qualifiedName);
      void writeStartElement(const QString &namespaceUri, const QString &name);
  %If (Qt_4_8_0 -)
      bool hasError() const;
  %End
-
- private:
-     QXmlStreamWriter(const QXmlStreamWriter &);
+@@ -507,3 +514,4 @@
  };
  
  %End

File PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/QtGuimod.sip.diff

---- sip/QtGui/QtGuimod.sip.old	2010-10-10 00:37:06.000000000 +0200
-+++ sip/QtGui/QtGuimod.sip	2010-10-10 01:59:24.000000000 +0200
-@@ -68,201 +68,425 @@
+--- sip/QtGui/QtGuimod.sip.old	2012-10-04 17:51:54.128239145 +0200
++++ sip/QtGui/QtGuimod.sip	2012-10-04 17:51:54.136239145 +0200
+@@ -58,78 +58,145 @@
  %DefaultSupertype sip.simplewrapper
  
  %Include qabstractbutton.sip
 -%Include qcolumnview.sip
 -%Include qcolordialog.sip
 -%Include qcombobox.sip
--%Include qcommonstyle.sip
--%Include qcompleter.sip
--%Include qcursor.sip
--%Include qdatawidgetmapper.sip
--%Include qdatetimeedit.sip
--%Include qdesktopservices.sip
 +%If (PyQt_Clipboard)
 +  %Include qclipboard.sip
 +%End
 +%If (PyQt_ComboBox)
 +  %Include qcombobox.sip
 +%End
-+%Include qcommonstyle.sip
+ %Include qcommonstyle.sip
+-%Include qcompleter.sip
+-%Include qcursor.sip
+-%Include qdatawidgetmapper.sip
+-%Include qdatetimeedit.sip
+-%Include qdesktopservices.sip
 +%If (PyQt_Completer)
 +  %Include qcompleter.sip
 +%End
  %Include qgenericmatrix.sip
 -%Include qgesture.sip
 -%Include qgesturerecognizer.sip
--%Include qglyphrun.sip
++%If (PyQt_Gestures)
++  %Include qgesture.sip
++  %Include qgesturerecognizer.sip
++%End
+ %Include qglyphrun.sip
 -%Include qgraphicsanchorlayout.sip
 -%Include qgraphicseffect.sip
 -%Include qgraphicsgridlayout.sip
 -%Include qgraphicssceneevent.sip
 -%Include qgraphicstransform.sip
 -%Include qgraphicsview.sip
-+%If (PyQt_Gestures)
-+  %Include qgesture.sip
-+  %Include qgesturerecognizer.sip
-+%End
-+%Include qglyphrun.sip
 +%If (PyQt_GraphicsView)
 +  %Include qgraphicsanchorlayout.sip
 +  %Include qgraphicseffect.sip
  %Include qicon.sip
  %Include qiconengine.sip
  %Include qidentityproxymodel.sip
- %Include qimage.sip
+@@ -137,122 +204,279 @@
  %Include qimageiohandler.sip
  %Include qimagereader.sip
  %Include qimagewriter.sip

File PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/qabstractbutton.sip.diff

---- sip/QtGui/qabstractbutton.sip.old	2010-09-08 01:00:52.000000000 +0200
-+++ sip/QtGui/qabstractbutton.sip	2010-09-08 01:01:16.000000000 +0200
-@@ -56,8 +56,10 @@
+--- sip/QtGui/qabstractbutton.sip.old	2012-10-04 17:51:54.340239144 +0200
++++ sip/QtGui/qabstractbutton.sip	2012-10-04 17:51:54.348239144 +0200
+@@ -51,8 +51,10 @@
      void setIcon(const QIcon &icon);
      QIcon icon() const;
      QSize iconSize() const;
      void setCheckable(bool);
      bool isCheckable() const;
      bool isChecked() const;
-@@ -67,7 +69,9 @@
+@@ -62,7 +64,9 @@
      bool autoRepeat() const;
      void setAutoExclusive(bool);
      bool autoExclusive() const;

File PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/qabstractitemview.sip.diff

---- sip/QtGui/qabstractitemview.sip.old	2010-09-12 02:20:11.000000000 +0200
-+++ sip/QtGui/qabstractitemview.sip	2010-09-12 02:59:29.000000000 +0200
-@@ -42,6 +42,7 @@
+--- sip/QtGui/qabstractitemview.sip.old	2012-10-04 17:51:53.996239146 +0200
++++ sip/QtGui/qabstractitemview.sip	2012-10-04 17:51:54.004239146 +0200
+@@ -37,6 +37,7 @@
  
  public:
  %If (Qt_4_2_0 -)
  
      enum DragDropMode
      {
-@@ -53,6 +54,7 @@
+@@ -48,6 +49,7 @@
      };
  
  %End
  
      enum EditTrigger
      {
-@@ -123,10 +125,12 @@
+@@ -118,10 +120,12 @@
      bool hasAutoScroll() const;
      void setTabKeyNavigation(bool enable);
      bool tabKeyNavigation() const;
      void setAlternatingRowColors(bool enable);
      bool alternatingRowColors() const;
      void setIconSize(const QSize &size);
-@@ -233,7 +237,9 @@
+@@ -227,7 +231,9 @@
      virtual QModelIndexList selectedIndexes() const;
      virtual bool edit(const QModelIndex &index, QAbstractItemView::EditTrigger trigger, QEvent *event);
      virtual QFlags<QItemSelectionModel::SelectionFlag> selectionCommand(const QModelIndex &index, const QEvent *event = 0) const;
      virtual QStyleOptionViewItem viewOptions() const;
  
      enum State
-@@ -262,10 +268,12 @@
+@@ -256,10 +262,12 @@
      virtual void mouseMoveEvent(QMouseEvent *e);
      virtual void mouseReleaseEvent(QMouseEvent *e);
      virtual void mouseDoubleClickEvent(QMouseEvent *e);
      virtual void focusInEvent(QFocusEvent *e);
      virtual void focusOutEvent(QFocusEvent *e);
      virtual void keyPressEvent(QKeyEvent *e);
-     virtual void resizeEvent(QResizeEvent *e);
-     virtual void timerEvent(QTimerEvent *e);
- 
-+%If (PyQt_DragAndDrop)
-     enum DropIndicatorPosition
-     {
-         OnItem,
-@@ -281,6 +290,7 @@
+@@ -275,6 +283,7 @@
      };
  
      QAbstractItemView::DropIndicatorPosition dropIndicatorPosition() const;
  
  public:
  %If (Qt_4_2_0 -)
-@@ -295,6 +305,7 @@
+@@ -289,6 +298,7 @@
  %If (Qt_4_2_0 -)
      QAbstractItemView::ScrollMode horizontalScrollMode() const;
  %End
 +%If (PyQt_DragAndDrop)
  %If (Qt_4_2_0 -)
-     void setDragDropOverwriteMode(bool);
+     void setDragDropOverwriteMode(bool overwrite);
  %End
-@@ -307,6 +318,7 @@
+@@ -301,6 +311,7 @@
  %If (Qt_4_2_0 -)
      QAbstractItemView::DragDropMode dragDropMode() const;
  %End
 +%End
  %If (Qt_4_2_0 -)
-     void setItemDelegateForRow(int, QAbstractItemDelegate * /KeepReference/);
+     void setItemDelegateForRow(int row, QAbstractItemDelegate *delegate /KeepReference/);
  %End
-@@ -341,12 +353,14 @@
+@@ -335,12 +346,14 @@
  %End
  
  public:

File PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/qabstractprintdialog.sip.diff

---- sip/QtGui/qabstractprintdialog.sip.old	2010-09-09 22:47:57.000000000 +0200
-+++ sip/QtGui/qabstractprintdialog.sip	2010-09-09 22:51:42.000000000 +0200
-@@ -67,7 +67,9 @@
+--- sip/QtGui/qabstractprintdialog.sip.old	2012-10-04 17:51:53.896239145 +0200
++++ sip/QtGui/qabstractprintdialog.sip	2012-10-04 17:51:53.896239145 +0200
+@@ -68,7 +68,9 @@
  
      typedef QFlags<QAbstractPrintDialog::PrintDialogOption> PrintDialogOptions;
  %If (PyQt_PrintDialog)

File PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/qabstractscrollarea.sip.diff

---- sip/QtGui/qabstractscrollarea.sip.old	2009-06-14 22:29:37.000000000 +0200
-+++ sip/QtGui/qabstractscrollarea.sip	2009-06-14 22:29:37.000000000 +0200
-@@ -66,12 +66,18 @@
+--- sip/QtGui/qabstractscrollarea.sip.old	2012-10-04 17:51:53.928239146 +0200
++++ sip/QtGui/qabstractscrollarea.sip	2012-10-04 17:51:53.932239146 +0200
+@@ -55,12 +55,18 @@
      virtual void mouseReleaseEvent(QMouseEvent *);
      virtual void mouseDoubleClickEvent(QMouseEvent *);
      virtual void mouseMoveEvent(QMouseEvent *);

File PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/qabstractslider.sip.diff

---- sip/QtGui/qabstractslider.sip.old	2010-09-08 01:08:29.000000000 +0200
-+++ sip/QtGui/qabstractslider.sip	2010-09-08 01:09:19.000000000 +0200
-@@ -103,7 +103,9 @@
+--- sip/QtGui/qabstractslider.sip.old	2012-10-04 17:51:54.540239143 +0200
++++ sip/QtGui/qabstractslider.sip	2012-10-04 17:51:54.548239143 +0200
+@@ -98,7 +98,9 @@
      virtual bool event(QEvent *e);
      virtual void keyPressEvent(QKeyEvent *ev);
      virtual void timerEvent(QTimerEvent *);

File PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/qabstractspinbox.sip.diff

---- sip/QtGui/qabstractspinbox.sip.old	2010-09-08 01:55:08.000000000 +0200
-+++ sip/QtGui/qabstractspinbox.sip	2010-09-08 01:55:41.000000000 +0200
-@@ -98,10 +98,14 @@
+--- sip/QtGui/qabstractspinbox.sip.old	2012-10-04 17:51:54.140239145 +0200
++++ sip/QtGui/qabstractspinbox.sip	2012-10-04 17:51:54.148239145 +0200
+@@ -93,10 +93,14 @@
      virtual void resizeEvent(QResizeEvent *e);
      virtual void keyPressEvent(QKeyEvent *e);
      virtual void keyReleaseEvent(QKeyEvent *e);

File PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/qaction.sip.diff

---- sip/QtGui/qaction.sip.old	2010-10-23 14:51:39.000000000 +0200
-+++ sip/QtGui/qaction.sip	2010-10-23 15:05:08.000000000 +0200
-@@ -49,20 +49,30 @@
+--- sip/QtGui/qaction.sip.old	2012-10-04 17:51:54.584239143 +0200
++++ sip/QtGui/qaction.sip	2012-10-04 17:51:54.588239143 +0200
+@@ -44,20 +44,30 @@
      QString text() const;
      void setIconText(const QString &text);
      QString iconText() const;
      void setFont(const QFont &font);
      QFont font() const;
      void setCheckable(bool);
-@@ -116,6 +126,7 @@
+@@ -111,6 +121,7 @@
      };
  
  %End
 +%If (PyQt_Shortcut)
  %If (Qt_4_2_0 -)
-     void setShortcuts(const QList<QKeySequence> &);
+     void setShortcuts(const QList<QKeySequence> &shortcuts);
  %End
-@@ -131,6 +142,7 @@
+@@ -126,6 +137,7 @@
  %If (Qt_4_2_0 -)
      bool autoRepeat() const;
  %End
 +%End
  %If (Qt_4_2_0 -)
-     void setMenuRole(QAction::MenuRole);
+     void setMenuRole(QAction::MenuRole menuRole);
  %End
-@@ -141,8 +153,10 @@
+@@ -136,8 +148,10 @@
      QList<QWidget*> associatedWidgets() const;
  %End
  %If (Qt_4_5_0 -)
  %End
 +%End
  %If (Qt_4_4_0 -)
-     void setIconVisibleInMenu(bool);
+     void setIconVisibleInMenu(bool visible);
  %End

File PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/qapplication.sip.diff

---- sip/QtGui/qapplication.sip.old	2011-02-27 02:40:55.000000000 +0100
-+++ sip/QtGui/qapplication.sip	2011-02-27 16:32:42.000000000 +0100
-@@ -626,10 +927,12 @@
+--- sip/QtGui/qapplication.sip.old	2012-10-04 17:51:53.956239146 +0200
++++ sip/QtGui/qapplication.sip	2012-10-04 17:51:53.964239146 +0200
+@@ -666,10 +666,12 @@
  
      static int colorSpec();
      static void setColorSpec(int);
 +%End
      static QPalette palette();
      static QPalette palette(const QWidget *);
-     static QPalette palette(const char *);
-@@ -646,7 +949,9 @@
+     static QPalette palette(const char *className);
+@@ -686,7 +688,9 @@
      static QDesktopWidget *desktop();
      static QWidget *activePopupWidget();
      static QWidget *activeModalWidget();
 +%End
      static QWidget *focusWidget();
      static QWidget *activeWindow();
-     static void setActiveWindow(QWidget *);
-@@ -655,7 +960,9 @@
-     static QWidget *topLevelAt(const QPoint &);
-     static QWidget *topLevelAt(int, int);
+     static void setActiveWindow(QWidget *act);
+@@ -695,7 +699,9 @@
+     static QWidget *topLevelAt(const QPoint &p);
+     static QWidget *topLevelAt(int x, int y);
      static void syncX();
 +%If (!WS_QWS)
      static void beep();
      static Qt::KeyboardModifiers keyboardModifiers();
      static Qt::MouseButtons mouseButtons();
      static void setDesktopSettingsAware(bool);
-@@ -666,8 +973,10 @@
+@@ -706,8 +712,10 @@
      static int doubleClickInterval();
      static void setKeyboardInputInterval(int);
      static int keyboardInputInterval();
 +%End
      static void setGlobalStrut(const QSize &);
      static QSize globalStrut();
-     static void setStartDragTime(int);
-@@ -686,6 +995,13 @@
+     static void setStartDragTime(int ms);
+@@ -726,6 +734,13 @@
  %If (WS_X11)
      int x11ProcessEvent(XEvent *);
  %End
  %If (PyQt_SessionManager)
      bool isSessionRestored() const;
  %End
-@@ -701,8 +1017,10 @@
+@@ -741,8 +756,10 @@
  %If (PyQt_SessionManager)
-     virtual void saveState(QSessionManager &);
+     virtual void saveState(QSessionManager &sm);
  %End
 +%If (PyQt_IM)
      void setInputContext(QInputContext * /Transfer/);
 +%End
      static int exec() /PostHook=__pyQtPostEventLoopHook__,PreHook=__pyQtPreEventLoopHook__,PyName=exec_,ReleaseGIL/;
  %If (Py_v3)
-     static int exec() /ReleaseGIL/;
-@@ -711,6 +1029,12 @@
-     static void setQuitOnLastWindowClosed(bool);
+     static int exec() /PostHook=__pyQtPostEventLoopHook__,PreHook=__pyQtPreEventLoopHook__,ReleaseGIL/;
+@@ -751,6 +768,12 @@
+     static void setQuitOnLastWindowClosed(bool quit);
      static bool quitOnLastWindowClosed();
  
 +%If (WS_QWS)
  signals:
  %If (Qt_4_2_0 -)
  %If (PyQt_SessionManager)
-@@ -732,12 +1056,18 @@
+@@ -772,12 +795,18 @@
      static void aboutQt();
      static void closeAllWindows();
  %If (Qt_4_2_0 -)
  public:
  %If (Qt_4_2_0 -)
      static QFont font();
-@@ -755,8 +1085,10 @@
+@@ -795,8 +824,10 @@
      static Qt::LayoutDirection keyboardInputDirection();
  %End
  %If (Qt_4_2_0 -)
  %End
 +%End
  %If (Qt_4_3_0 -)
-     static void alert(QWidget *, int msecs = 0) /ReleaseGIL/;
+     static void alert(QWidget *widget, int msecs = 0) /ReleaseGIL/;
  %End

File PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/qbrush.sip.diff

---- sip/QtGui/qbrush.sip.old	2009-06-14 22:29:38.000000000 +0200
-+++ sip/QtGui/qbrush.sip	2009-06-14 22:29:38.000000000 +0200
-@@ -148,8 +148,10 @@
+--- sip/QtGui/qbrush.sip.old	2012-10-04 17:51:54.352239144 +0200
++++ sip/QtGui/qbrush.sip	2012-10-04 17:51:54.356239144 +0200
+@@ -140,8 +140,10 @@
  %End
  };
  

File PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/qcolor.sip.diff

---- sip/QtGui/qcolor.sip.old	2009-06-14 22:29:35.000000000 +0200
-+++ sip/QtGui/qcolor.sip	2009-06-14 22:29:35.000000000 +0200
-@@ -177,5 +177,7 @@
+--- sip/QtGui/qcolor.sip.old	2012-10-04 17:51:54.564239143 +0200
++++ sip/QtGui/qcolor.sip	2012-10-04 17:51:54.568239143 +0200
+@@ -223,5 +223,7 @@
  %End
  };
  

File PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/qcombobox.sip.diff

---- sip/QtGui/qcombobox.sip.old	2010-09-08 00:14:15.000000000 +0200
-+++ sip/QtGui/qcombobox.sip	2010-09-08 00:29:27.000000000 +0200
-@@ -44,10 +44,12 @@
+--- sip/QtGui/qcombobox.sip.old	2012-10-04 17:51:53.920239146 +0200
++++ sip/QtGui/qcombobox.sip	2012-10-04 17:51:53.920239146 +0200
+@@ -39,10 +39,12 @@
      int count() const /__len__/;
      void setMaxCount(int max);
      int maxCount() const;
      bool duplicatesEnabled() const;
      void setDuplicatesEnabled(bool enable);
      void setFrame(bool);
-@@ -91,8 +93,10 @@
-     void setEditable(bool);
-     void setLineEdit(QLineEdit * /Transfer/);
+@@ -86,8 +88,10 @@
+     void setEditable(bool editable);
+     void setLineEdit(QLineEdit *edit /Transfer/);
      QLineEdit *lineEdit() const;
 +%If (PyQt_Validator)
      void setValidator(const QValidator *v /KeepReference/);
      QAbstractItemDelegate *itemDelegate() const;
      void setItemDelegate(QAbstractItemDelegate *delegate /KeepReference/);
      QAbstractItemModel *model() const;
-@@ -124,12 +128,14 @@
+@@ -119,12 +123,14 @@
      virtual void showPopup();
      virtual void hidePopup();
      virtual bool event(QEvent *event);
  %If (Qt_4_4_0 -)
      void insertSeparator(int index);
  %End
-@@ -163,8 +169,12 @@
+@@ -158,8 +164,12 @@
      virtual void mouseReleaseEvent(QMouseEvent *e);
      virtual void keyPressEvent(QKeyEvent *e);
      virtual void keyReleaseEvent(QKeyEvent *e);

File PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/qcursor.sip.diff

---- sip/QtGui/qcursor.sip.old	2010-09-08 01:27:55.000000000 +0200
-+++ sip/QtGui/qcursor.sip	2010-09-08 01:28:29.000000000 +0200
-@@ -29,6 +29,7 @@
+--- sip/QtGui/qcursor.sip.old	2012-10-04 17:51:53.912239148 +0200
++++ sip/QtGui/qcursor.sip	2012-10-04 17:51:53.912239148 +0200
+@@ -24,6 +24,7 @@
  // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
  // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  
  
  %ModuleCode
  #include <qcursor.h>
-@@ -83,5 +84,9 @@
+@@ -78,5 +79,9 @@
      static void setPos(const QPoint &p);
  };
  

File PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/qdatetimeedit.sip.diff

---- sip/QtGui/qdatetimeedit.sip.old	2010-09-09 01:56:16.000000000 +0200
-+++ sip/QtGui/qdatetimeedit.sip	2010-09-09 02:28:55.000000000 +0200
-@@ -125,7 +125,9 @@
+--- sip/QtGui/qdatetimeedit.sip.old	2012-10-04 17:51:54.172239145 +0200
++++ sip/QtGui/qdatetimeedit.sip	2012-10-04 17:51:54.180239145 +0200
+@@ -120,7 +120,9 @@
      void initStyleOption(QStyleOptionSpinBox *option) const;
  %End
      virtual void keyPressEvent(QKeyEvent *e);

File PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/qdial.sip.diff

---- sip/QtGui/qdial.sip.old	2010-09-08 01:16:44.000000000 +0200
-+++ sip/QtGui/qdial.sip	2010-09-08 01:18:15.000000000 +0200
-@@ -41,7 +41,7 @@
+--- sip/QtGui/qdial.sip.old	2012-10-04 17:51:54.320239146 +0200
++++ sip/QtGui/qdial.sip	2012-10-04 17:51:54.328239144 +0200
+@@ -36,7 +36,7 @@
      virtual ~QDial();
      bool wrapping() const;
      int notchSize() const;

File PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/qdialog.sip.diff

---- sip/QtGui/qdialog.sip.old	2009-06-14 22:29:37.000000000 +0200
-+++ sip/QtGui/qdialog.sip	2009-06-14 22:29:37.000000000 +0200
-@@ -119,7 +119,9 @@
+--- sip/QtGui/qdialog.sip.old	2012-10-04 17:51:54.472239145 +0200
++++ sip/QtGui/qdialog.sip	2012-10-04 17:51:54.480239145 +0200
+@@ -108,7 +108,9 @@
      virtual void closeEvent(QCloseEvent *);
      virtual void showEvent(QShowEvent *);
      virtual void resizeEvent(QResizeEvent *);

File PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/qdockwidget.sip.diff

---- sip/QtGui/qdockwidget.sip.old	2010-09-08 01:06:27.000000000 +0200
-+++ sip/QtGui/qdockwidget.sip	2010-09-08 01:06:49.000000000 +0200
-@@ -77,7 +77,9 @@
+--- sip/QtGui/qdockwidget.sip.old	2012-10-04 17:51:54.020239146 +0200
++++ sip/QtGui/qdockwidget.sip	2012-10-04 17:51:54.028239147 +0200
+@@ -72,7 +72,9 @@
      void setAllowedAreas(Qt::DockWidgetAreas areas);
      Qt::DockWidgetAreas allowedAreas() const;
      bool isAreaAllowed(Qt::DockWidgetArea area) const;
 +%End
  %If (Qt_4_3_0 -)
      void setTitleBarWidget(QWidget *widget /Transfer/);
- %MethodCode
+ %End

File PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/qevent.sip.diff

---- sip/QtGui/qevent.sip.old	2010-10-10 00:37:08.000000000 +0200
-+++ sip/QtGui/qevent.sip	2010-10-10 02:00:48.000000000 +0200
-@@ -43,20 +43,25 @@
+--- sip/QtGui/qevent.sip.old	2012-10-04 17:51:54.008239146 +0200
++++ sip/QtGui/qevent.sip	2012-10-04 17:51:54.016239146 +0200
+@@ -38,20 +38,25 @@
  %ConvertToSubClassCode
      switch (sipCpp->type())
      {
      case QEvent::DragEnter:
          sipType = sipType_QDragEnterEvent;
          break;
-@@ -72,6 +77,7 @@
+@@ -67,6 +72,7 @@
      case QEvent::Drop:
          sipType = sipType_QDropEvent;
          break;
      
      case QEvent::FileOpen:
          sipType = sipType_QFileOpenEvent;
-@@ -125,18 +131,23 @@
+@@ -120,18 +126,23 @@
          sipType = sipType_QResizeEvent;
          break;
      
      case QEvent::TabletMove:
      case QEvent::TabletPress:
      case QEvent::TabletRelease:
-@@ -146,8 +157,10 @@
+@@ -141,8 +152,10 @@
      #endif
          sipType = sipType_QTabletEvent;
          break;
      case QEvent::WhatsThis:
          sipType = sipType_QHelpEvent;
          break;
-@@ -155,26 +168,34 @@
+@@ -150,26 +163,34 @@
      case QEvent::WhatsThisClicked:
          sipType = sipType_QWhatsThisClickedEvent;
          break;
      
      case QEvent::GraphicsSceneHelp:
          sipType = sipType_QGraphicsSceneHelpEvent;
-@@ -196,9 +217,10 @@
+@@ -191,9 +212,10 @@
      case QEvent::GraphicsSceneWheel:
          sipType = sipType_QGraphicsSceneWheelEvent;
          break;
      case QEvent::GraphicsSceneMove:
          sipType = sipType_QGraphicsSceneMoveEvent;
          break;
-@@ -215,10 +237,12 @@
+@@ -210,10 +232,12 @@
          sipType = sipType_QTouchEvent;
          break;
      
      
      default:
          sipType = 0;
-@@ -269,6 +293,8 @@
+@@ -264,6 +288,8 @@
      const QPoint &oldPos() const;
  };
  
  class QWheelEvent : QInputEvent
  {
  %TypeHeaderCode
-@@ -290,6 +316,10 @@
+@@ -285,6 +311,10 @@
      Qt::Orientation orientation() const;
  };
  
  class QTabletEvent : QInputEvent
  {
  %TypeHeaderCode
-@@ -338,6 +368,8 @@
+@@ -333,6 +363,8 @@
      int yTilt() const;
  };
  
  class QKeyEvent : QInputEvent
  {
  %TypeHeaderCode
-@@ -353,8 +385,10 @@