Commits

David Boddie  committed 2375548

Updated the PyQt4 patches for PyQt 4.9.4.

  • Participants
  • Parent commits 7c82782

Comments (0)

Files changed (132)

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

---- 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
+--- qpy/QtCore/qpycore_api.h.old	2012-10-13 21:16:19.000000000 +0200
++++ qpy/QtCore/qpycore_api.h	2012-10-13 21:16:19.000000000 +0200
 @@ -28,6 +28,7 @@
  #define _QPYCORE_API_H
  

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

---- 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
+--- qpy/QtCore/qpycore_init.cpp.old	2012-10-13 21:16:19.000000000 +0200
++++ qpy/QtCore/qpycore_init.cpp	2012-10-13 21:16:19.000000000 +0200
 @@ -25,6 +25,7 @@
  
  #include <Python.h>

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

---- 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
+--- qpy/QtCore/qpycore_pyqtconfigure.cpp.old	2012-10-13 21:16:19.000000000 +0200
++++ qpy/QtCore/qpycore_pyqtconfigure.cpp	2012-10-13 21:16:19.000000000 +0200
 @@ -23,6 +23,8 @@
  // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  

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

---- 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
+--- qpy/QtCore/qpycore_qstring.cpp.old	2012-10-13 21:16:19.000000000 +0200
++++ qpy/QtCore/qpycore_qstring.cpp	2012-10-13 21:16:19.000000000 +0200
 @@ -26,8 +26,11 @@
  #include <Python.h>
  #include <string.h>
  #include <QVector>
  
  #include "qpycore_sip.h"
-@@ -116,6 +119,7 @@
+@@ -165,6 +168,7 @@
          }
          else
          {
              QTextCodec *codec = QTextCodec::codecForTr();
  
              if (codec)
-@@ -135,6 +139,9 @@
+@@ -184,6 +188,9 @@
              {
                  obj = PyUnicode_AsLatin1String(obj);
              }

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

---- sip/QtCore/QtCoremod.sip.old	2012-10-05 12:14:35.090890538 +0200
-+++ sip/QtCore/QtCoremod.sip	2012-10-05 13:15:40.858872761 +0200
+--- sip/QtCore/QtCoremod.sip.old	2012-10-13 21:16:19.000000000 +0200
++++ sip/QtCore/QtCoremod.sip	2012-10-13 21:16:19.000000000 +0200
 @@ -29,17 +29,155 @@
  
- %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}
+ %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 Qt_4_8_1 Qt_4_8_2 Qt_5_0_0}
  
 -%Platforms {WS_X11 WS_WIN WS_MACX}
 +%Platforms {WS_X11 WS_WIN WS_MACX WS_QWS}
  %Include qbasictimer.sip
  %Include qbitarray.sip
  %Include qbuffer.sip
-@@ -146,78 +290,132 @@
+@@ -146,24 +290,38 @@
  %Include qcoreapplication.sip
  %Include qcoreevent.sip
  %Include qcryptographichash.sip
 +  %Include qhistorystate.sip
 +%End
  %Include qiodevice.sip
+-%Include qlibrary.sip
 -%Include qlibraryinfo.sip
++%If (PyQt_Library)
++  %Include qlibrary.sip
++%End
 +%If (PyQt_Settings)
 +  %Include qlibraryinfo.sip
 +%End
  %Include qline.sip
  %Include qlist.sip
--%Include qlibrary.sip
-+%If (PyQt_Library)
-+  %Include qlibrary.sip
-+%End
  %Include qlocale.sip
- %Include qmap.sip
- %Include qmargins.sip
+@@ -172,52 +330,92 @@
  %Include qmetaobject.sip
  %Include qmetatype.sip
  %Include qmimedata.sip

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

---- 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:
+--- sip/QtCore/qabstracteventdispatcher.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtCore/qabstracteventdispatcher.sip	2012-10-13 21:16:20.000000000 +0200
+@@ -52,7 +52,9 @@
+ %End
      explicit QAbstractEventDispatcher(QObject *parent /TransferThis/ = 0);
      virtual ~QAbstractEventDispatcher();
 +%If (PyQt_Thread)

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

---- 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 @@
+--- sip/QtCore/qabstractitemmodel.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtCore/qabstractitemmodel.sip	2012-10-13 21:16:20.000000000 +0200
+@@ -214,8 +214,10 @@
  %End
  
  protected:

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

---- 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
+--- sip/QtCore/qabstracttransition.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtCore/qabstracttransition.sip	2012-10-13 21:16:20.000000000 +0200
 @@ -42,9 +42,11 @@
      QList<QAbstractState*> targetStates() const;
      void setTargetStates(const QList<QAbstractState*> &targets /KeepReference/);

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

---- 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
+--- sip/QtCore/qbitarray.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtCore/qbitarray.sip	2012-10-13 21:16:20.000000000 +0200
 @@ -93,8 +93,10 @@
  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	2012-10-04 17:51:54.844239142 +0200
-+++ sip/QtCore/qbytearray.sip	2012-10-04 17:51:54.852239143 +0200
-@@ -411,8 +411,10 @@
+--- sip/QtCore/qbytearray.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtCore/qbytearray.sip	2012-10-13 21:16:20.000000000 +0200
+@@ -416,8 +416,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	2012-10-04 17:51:55.152239140 +0200
-+++ sip/QtCore/qchar.sip	2012-10-04 17:51:55.160239140 +0200
-@@ -414,5 +414,7 @@
+--- sip/QtCore/qchar.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtCore/qchar.sip	2012-10-13 21:16:20.000000000 +0200
+@@ -423,6 +423,7 @@
  bool operator>=(QChar c1, QChar c2);
  bool operator<(QChar c1, QChar c2);
  bool operator>(QChar c1, QChar c2);
 +%If (PyQt_DataStream)
+ %If (Qt_5_0_0 -)
+ QDataStream &operator<<(QDataStream &, QChar /Constrained/);
+ %End
+@@ -430,3 +431,4 @@
  QDataStream &operator<<(QDataStream &, const QChar & /Constrained/);
+ %End
  QDataStream &operator>>(QDataStream &, QChar & /Constrained/);
 +%End

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

---- 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 @@
+--- sip/QtCore/qcoreapplication.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtCore/qcoreapplication.sip	2012-10-13 21:16:20.000000000 +0200
+@@ -186,12 +186,16 @@
      static bool closingDown();
      static QString applicationDirPath();
      static QString applicationFilePath();
  
      enum Encoding
      {
-@@ -340,18 +344,23 @@
+@@ -403,18 +407,23 @@
      }
  }
  %End
  %ModuleCode
  #include <QCoreApplication>
  #include <QThread>
-@@ -397,8 +406,11 @@
+@@ -460,8 +469,11 @@
      return 0;
  }
  %End

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

---- 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
+--- sip/QtCore/qcoreevent.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtCore/qcoreevent.sip	2012-10-13 21:16:20.000000000 +0200
 @@ -50,7 +50,7 @@
              break;
      #endif
      case QEvent::StateMachineSignal:
              sipType = sipType_QStateMachine_SignalEvent;
              break;
-@@ -269,12 +269,14 @@
+@@ -275,12 +275,14 @@
  %If (Qt_4_6_0 -)
          WinIdChange,
  %End
 +%End
          User,
          MaxUser,
-     };
+ %If (Qt_5_0_0 -)

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

---- 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
+--- sip/QtCore/qdatetime.sip.old	2012-10-13 21:16:19.000000000 +0200
++++ sip/QtCore/qdatetime.sip	2012-10-13 21:16:20.000000000 +0200
 @@ -104,6 +104,7 @@
          }
  %End
  
  %If (Py_DateTime)
      SIP_PYOBJECT toPyDate() const /DocType="datetime.date"/;
-@@ -143,12 +145,16 @@
+@@ -143,6 +145,7 @@
      int daysInMonth() const;
      int daysInYear() const;
      int weekNumber(int *yearNumber = 0) const;
 +%If (PyQt_TextDate)
-     static QString shortMonthName(int month);
-     static QString shortDayName(int weekday);
-     static QString longMonthName(int month);
-     static QString longDayName(int weekday);
+ %If (Qt_5_0_0 -)
+     static QString shortMonthName(int month, QDate::MonthNameType type = QDate::DateFormat);
+ %End
+@@ -179,8 +182,11 @@
+ %If (Qt_4_5_0 - Qt_5_0_0)
+     static QString longDayName(int weekday, QDate::MonthNameType type);
+ %End
 +%End
 +%If (PyQt_DateString)
      QString toString(Qt::DateFormat format = Qt::TextDate) const;
      QString toString(const QString &format) const;
 +%End
      bool setYMD(int y, int m, int d);
-     QDate addDays(int days) const;
-     QDate addMonths(int months) const;
-@@ -161,8 +167,10 @@
+ %If (Qt_5_0_0 -)
+     QDate addDays(qint64 days) const;
+@@ -203,8 +209,10 @@
      bool operator>(const QDate &other) const;
      bool operator>=(const QDate &other) const;
      static QDate currentDate();
 +%End
      static bool isValid(int y, int m, int d);
      static bool isLeapYear(int year);
-     static uint gregorianToJulian(int y, int m, int d);
-@@ -184,6 +192,7 @@
-     };
- 
+ %If (- Qt_5_0_0)
+@@ -228,6 +236,7 @@
+ %If (Qt_4_2_0 -)
+     bool setDate(int year, int month, int date);
  %End
 +%If (PyQt_TextDate)
  %If (Qt_4_5_0 -)
-     static QString shortMonthName(int month, QDate::MonthNameType type);
+     void getDate(int *year, int *month, int *day);
  %End
-@@ -196,6 +205,7 @@
- %If (Qt_4_5_0 -)
-     static QString longDayName(int weekday, QDate::MonthNameType type);
+@@ -240,6 +249,7 @@
+     };
+ 
  %End
 +%End
  };
  
  class QTime
-@@ -297,6 +307,7 @@
+@@ -341,6 +351,7 @@
          }
  %End
  
      long __hash__() const;
  %MethodCode
          if (sipIsAPIEnabled("QTime", 2, 0))
-@@ -309,6 +320,7 @@
+@@ -353,6 +364,7 @@
              sipRes = _Py_HashPointer(sipSelf);
          }
  %End
  
  %If (Py_DateTime)
      SIP_PYOBJECT toPyTime() const /DocType="datetime.time"/;
-@@ -332,8 +344,10 @@
+@@ -376,8 +388,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;
-@@ -346,8 +360,10 @@
+@@ -390,8 +404,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();
-@@ -495,6 +511,7 @@
+@@ -539,6 +555,7 @@
          }
  %End
  
      long __hash__() const;
  %MethodCode
          if (sipIsAPIEnabled("QDateTime", 2, 0))
-@@ -507,6 +524,7 @@
+@@ -551,6 +568,7 @@
              sipRes = _Py_HashPointer(sipSelf);
          }
  %End
  
  %If (Py_DateTime)
      SIP_PYOBJECT toPyDateTime() const /DocType="datetime.datetime"/;
-@@ -538,8 +556,10 @@
+@@ -582,8 +600,10 @@
      void setTime(const QTime &time);
      void setTimeSpec(Qt::TimeSpec spec);
      void setTime_t(uint secsSince1Jan1970UTC);
      QString toString(Qt::DateFormat format = Qt::TextDate) const;
      QString toString(const QString &format) const;
 +%End
-     QDateTime addDays(int days) const;
-     QDateTime addMonths(int months) const;
-     QDateTime addYears(int years) const;
-@@ -557,8 +577,10 @@
+ %If (Qt_5_0_0 -)
+     QDateTime addDays(qint64 days) const;
+ %End
+@@ -611,8 +631,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
-@@ -582,9 +604,11 @@
+@@ -636,9 +658,11 @@
  %End
  };
  

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

---- 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
+--- sip/QtCore/qline.sip.old	2012-10-13 21:16:19.000000000 +0200
++++ sip/QtCore/qline.sip	2012-10-13 21:16:19.000000000 +0200
 @@ -104,8 +104,10 @@
  %End
  };

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

---- 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 @@
+--- sip/QtCore/qlocale.sip.old	2012-10-13 21:16:19.000000000 +0200
++++ sip/QtCore/qlocale.sip	2012-10-13 21:16:19.000000000 +0200
+@@ -745,6 +745,7 @@
  %If (Qt_4_4_0 -)
      QString toString(const QDateTime &dateTime, const QString &format) const;
  %End
  %If (Qt_4_4_0 -)
      QString toString(const QDateTime &dateTime, QLocale::FormatType format = QLocale::LongFormat) const;
  %End
-@@ -745,6 +746,7 @@
+@@ -775,6 +776,7 @@
  %If (Qt_4_4_0 -)
      QDateTime toDateTime(const QString &string, const QString &format) const;
  %End
      QChar decimalPoint() const;
      QChar groupSeparator() const;
      QChar percent() const;
-@@ -893,8 +895,10 @@
+@@ -929,8 +931,10 @@
  %End
  };
  

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

---- 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 @@
+--- sip/QtCore/qnamespace.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtCore/qnamespace.sip	2012-10-13 21:16:20.000000000 +0200
+@@ -1639,7 +1639,7 @@
      };
  
      typedef QFlags<Qt::MatchFlag> MatchFlags;
      typedef void *HANDLE;
  %End
  %If (WS_X11)
-@@ -1729,6 +1729,7 @@
+@@ -1882,6 +1882,7 @@
  %If (Qt_4_6_0 -)
      typedef QFlags<Qt::TouchPointState> TouchPointStates;
  %End
  %If (Qt_4_6_0 -)
  
      enum GestureState
-@@ -1768,6 +1769,7 @@
+@@ -1921,6 +1922,7 @@
  %If (Qt_4_6_0 -)
      typedef QFlags<Qt::GestureFlag> GestureFlags;
  %End
  %If (Qt_4_6_0 -)
  
      enum NavigationMode
-@@ -1992,5 +1994,7 @@
- QFlags<Qt::TouchPointState> operator|(Qt::TouchPointState f1, QFlags<Qt::TouchPointState> f2);
- %End
- %If (Qt_4_6_0 -)
-+%If (PyQt_Gestures)
- QFlags<Qt::GestureFlag> operator|(Qt::GestureFlag f1, QFlags<Qt::GestureFlag> f2);
- %End
-+%End

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

---- 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
+--- sip/QtCore/qobject.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtCore/qobject.sip	2012-10-13 21:16:20.000000000 +0200
 @@ -243,31 +243,41 @@
          int yes, no;
      } graph[] = {
      SIP_PYOBJECT findChild(SIP_PYTYPE type, const QString &name /DocValue="Py_v3:''"/ = QString()) const /DocType="QObject"/;
  %MethodCode
          sipRes = qtcore_FindChild(sipCpp, qtcore_type_to_tuple(a0), *a1);
-@@ -578,8 +600,10 @@
-     bool isWidgetType() const;
+@@ -581,8 +603,10 @@
+ %End
      bool signalsBlocked() const;
      bool blockSignals(bool b);
 +%If (PyQt_Thread)
      QThread *thread() const;
      void moveToThread(QThread *thread);
 +%End
-     int startTimer(int interval);
-     void killTimer(int id);
-     const QObjectList &children() const;
-@@ -613,11 +637,13 @@
+ %If (Qt_5_0_0 -)
+     int startTimer(int interval, Qt::TimerType timerType = Qt::CoarseTimer);
+ %End
+@@ -621,11 +645,13 @@
  
      void dumpObjectInfo();
      void dumpObjectTree();

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

---- 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
+--- sip/QtCore/qpoint.sip.old	2012-10-13 21:16:19.000000000 +0200
++++ sip/QtCore/qpoint.sip	2012-10-13 21:16:19.000000000 +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	2012-10-04 17:51:54.824239142 +0200
-+++ sip/QtCore/qprocess.sip	2012-10-04 17:51:54.828239142 +0200
+--- sip/QtCore/qprocess.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtCore/qprocess.sip	2012-10-13 21:16:20.000000000 +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.

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

---- 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
+--- sip/QtCore/qreadwritelock.sip.old	2012-10-13 21:16:19.000000000 +0200
++++ sip/QtCore/qreadwritelock.sip	2012-10-13 21:16:19.000000000 +0200
 @@ -33,6 +33,7 @@
  
  public:
  
      enum RecursionMode
      {
-@@ -41,10 +42,13 @@
+@@ -41,6 +42,7 @@
      };
  
  %End
++%End
+ %If (Qt_5_0_0 -)
+     explicit QReadWriteLock(QReadWriteLock::RecursionMode recursionMode = QReadWriteLock::NonRecursive);
+ %End
+@@ -48,8 +50,10 @@
+     QReadWriteLock();
+ %End
  %If (Qt_4_4_0 - Qt_5_0_0)
 +%If (PyQt_Thread)
      QReadWriteLock(QReadWriteLock::RecursionMode recursionMode);

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

---- 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
+--- sip/QtCore/qrect.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtCore/qrect.sip	2012-10-13 21:16:20.000000000 +0200
 @@ -153,8 +153,10 @@
  %End
  };

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

---- 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 @@
+--- sip/QtCore/qregexp.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtCore/qregexp.sip	2012-10-13 21:16:20.000000000 +0200
+@@ -148,5 +148,7 @@
  %End
  };
  

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

---- 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
+--- sip/QtCore/qsettings.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtCore/qsettings.sip	2012-10-13 21:16:20.000000000 +0200
 @@ -114,6 +114,7 @@
  %If (Qt_4_4_0 -)
      static QSettings::Format defaultFormat();

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

---- 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
+--- sip/QtCore/qsharedmemory.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtCore/qsharedmemory.sip	2012-10-13 21:16:20.000000000 +0200
 @@ -73,8 +73,10 @@
          sipRes = sipConvertFromConstVoidPtrAndSize(sipCpp->constData(), sipCpp->size());
  %End

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

---- 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;
+--- sip/QtCore/qsize.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtCore/qsize.sip	2012-10-13 21:16:20.000000000 +0200
+@@ -96,8 +96,10 @@
+ %End
  };
  
 +%If (PyQt_DataStream)

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

---- 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
+--- sip/QtCore/qstate.sip.old	2012-10-13 21:16:19.000000000 +0200
++++ sip/QtCore/qstate.sip	2012-10-13 21:16:19.000000000 +0200
 @@ -73,7 +73,9 @@
      void setInitialState(QAbstractState *state /KeepReference/);
      QState::ChildMode childMode() const;

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

---- 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
+--- sip/QtCore/qstatemachine.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtCore/qstatemachine.sip	2012-10-13 21:16:20.000000000 +0200
 @@ -87,11 +87,13 @@
      QString errorString() const;
      void clearError();

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

---- 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
+--- sip/QtCore/qstring.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtCore/qstring.sip	2012-10-13 21:16:20.000000000 +0200
 @@ -83,7 +83,9 @@
  
  
              enc = sipCpp->toAscii();
      
          // A Python string is the most convenient method to save the encoded
-@@ -620,8 +626,10 @@
+@@ -698,8 +704,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	2012-10-04 17:51:55.012239141 +0200
-+++ sip/QtCore/qstringlist.sip	2012-10-04 17:51:55.020239141 +0200
-@@ -263,5 +263,7 @@
+--- sip/QtCore/qstringlist.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtCore/qstringlist.sip	2012-10-13 21:16:20.000000000 +0200
+@@ -268,5 +268,7 @@
  QStringList &operator+=(const QString &value);
  };
  

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

---- 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
+--- sip/QtCore/qtextstream.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtCore/qtextstream.sip	2012-10-13 21:16:20.000000000 +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);
      void setDevice(QIODevice *device);
      QIODevice *device() const;
      void setString(QString *string /Constrained/, QFlags<QIODevice::OpenModeFlag> mode = QIODevice::ReadWrite) /API=QString: - 2/;
-@@ -164,7 +166,9 @@
+@@ -169,7 +171,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	2012-10-04 17:51:54.836239142 +0200
-+++ sip/QtCore/qthread.sip	2012-10-04 17:51:54.840239142 +0200
+--- sip/QtCore/qthread.sip.old	2012-10-13 21:16:19.000000000 +0200
++++ sip/QtCore/qthread.sip	2012-10-13 21:16:19.000000000 +0200
 @@ -33,7 +33,9 @@
  
  public:

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

---- 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 @@
+--- sip/QtCore/qurl.sip.old	2012-10-13 21:16:19.000000000 +0200
++++ sip/QtCore/qurl.sip	2012-10-13 21:16:19.000000000 +0200
+@@ -289,8 +289,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:51:55.112239142 +0200
-+++ sip/QtCore/quuid.sip	2012-10-04 17:51:55.116239142 +0200
-@@ -55,10 +55,13 @@
+--- sip/QtCore/quuid.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtCore/quuid.sip	2012-10-13 21:16:20.000000000 +0200
+@@ -132,10 +132,13 @@
  
      QUuid();
      QUuid(uint l, ushort w1, ushort w2, uchar b1, uchar b2, uchar b3, uchar b4, uchar b5, uchar b6, uchar b7, uchar b8);
      SIP_PYOBJECT __repr__() const /DocType="str"/;
  %MethodCode
          PyObject *uni = qpycore_PyObject_FromQString(sipCpp->toString());
-@@ -76,8 +79,11 @@
+@@ -153,8 +156,11 @@
              Py_DECREF(uni);
          }
  %End
      bool isNull() const;
      bool operator==(const QUuid &orig) const;
      bool operator!=(const QUuid &orig) const;
-@@ -86,7 +92,9 @@
+@@ -163,7 +169,9 @@
      static QUuid createUuid();
      QUuid::Variant variant() const;
      QUuid::Version version() const;
  %If (Qt_4_8_0 -)
      QByteArray toByteArray() const;
  %End
-@@ -98,5 +106,7 @@
- %End
+@@ -176,5 +184,7 @@
  };
  
+ %End
 +%If (PyQt_DataStream)
  QDataStream &operator<<(QDataStream &, const QUuid & /Constrained/);
  QDataStream &operator>>(QDataStream &, QUuid & /Constrained/);

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

---- 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 @@
+--- sip/QtCore/qvariant.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtCore/qvariant.sip	2012-10-13 21:16:20.000000000 +0200
+@@ -231,8 +231,10 @@
          sipRes = qpycore_PyObject_FromQVariant(*sipCpp);
  %End
  
      void load(QDataStream &ds);
      void save(QDataStream &ds) const;
 +%End
-     static const char *typeToName(QVariant::Type type);
-     static QVariant::Type nameToType(const char *name);
-     void *data();
-@@ -354,11 +356,13 @@
+ %If (Qt_5_0_0 -)
+     static const char *typeToName(int typeId);
+ %End
+@@ -392,11 +394,13 @@
  %If (Qt_4_5_0 -)
  typedef QHash<QString, QVariant> QVariantHash /DocType="Py_v3:dict-of-str-object"/;
  %End

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

---- 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
+--- sip/QtCore/qwaitcondition.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtCore/qwaitcondition.sip	2012-10-13 21:16:20.000000000 +0200
 @@ -36,8 +36,10 @@
      ~QWaitCondition();
      bool wait(QMutex *mutex, unsigned long msecs = ULONG_MAX) /ReleaseGIL/;

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

---- 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
+--- sip/QtCore/qxmlstream.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtCore/qxmlstream.sip	2012-10-13 21:16:20.000000000 +0200
 @@ -335,6 +335,7 @@
  
  %End
  
  class QXmlStreamReader
  {
-@@ -449,7 +450,9 @@
+@@ -464,7 +465,9 @@
  };
  
  %End
  
  class QXmlStreamWriter
  {
-@@ -465,9 +468,11 @@
+@@ -495,9 +498,11 @@
      ~QXmlStreamWriter();
      void setDevice(QIODevice *device);
      QIODevice *device() const;
      void setAutoFormatting(bool);
      bool autoFormatting() const;
      void setAutoFormattingIndent(int spaces);
-@@ -497,7 +502,9 @@
+@@ -527,7 +532,9 @@
  %End
      void writeStartElement(const QString &qualifiedName);
      void writeStartElement(const QString &namespaceUri, const QString &name);
  %If (Qt_4_8_0 -)
      bool hasError() const;
  %End
-@@ -507,3 +514,4 @@
+@@ -537,3 +544,4 @@
  };
  
  %End

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

---- sip/QtGui/QtGuimod.sip.old	2012-10-05 12:14:34.334890542 +0200
-+++ sip/QtGui/QtGuimod.sip	2012-10-05 12:34:29.778884744 +0200
+--- sip/QtGui/QtGuimod.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtGui/QtGuimod.sip	2012-10-13 21:16:20.000000000 +0200
 @@ -58,201 +58,431 @@
  %DefaultSupertype sip.simplewrapper
  
 -%Include qabstractprintdialog.sip
 -%Include qabstractproxymodel.sip
 -%Include qabstractscrollarea.sip
+-%Include qabstractslider.sip
 -%Include qabstractspinbox.sip
--%Include qabstractslider.sip
 +%If (PyQt_ItemViews)
 +  %Include qabstractitemdelegate.sip
 +  %Include qabstractitemview.sip
 +%If (PyQt_ScrollArea)
 +  %Include qabstractscrollarea.sip
 +%End
++%If (PyQt_Slider)
++  %Include qabstractslider.sip
++%End
 +%If (PyQt_SpinBox)
 +  %Include qabstractspinbox.sip
 +%End
-+%If (PyQt_Slider)
-+  %Include qabstractslider.sip
-+%End
  %Include qabstracttextdocumentlayout.sip
 -%Include qaction.sip
 -%Include qactiongroup.sip
 +//%End
  %Include qx11embed_x11.sip
  %Include qx11info_x11.sip
- %Include qpytextobject.sip
+ %Include qguiapplication.sip

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

---- 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
+--- sip/QtGui/qabstractbutton.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtGui/qabstractbutton.sip	2012-10-13 21:16:20.000000000 +0200
 @@ -51,8 +51,10 @@
      void setIcon(const QIcon &icon);
      QIcon icon() const;

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

---- 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
+--- sip/QtGui/qabstractitemview.sip.old	2012-10-13 22:05:21.000000000 +0200
++++ sip/QtGui/qabstractitemview.sip	2012-10-13 22:09:27.000000000 +0200
 @@ -37,6 +37,7 @@
  
  public:
      void setAlternatingRowColors(bool enable);
      bool alternatingRowColors() const;
      void setIconSize(const QSize &size);
-@@ -227,7 +231,9 @@
+@@ -232,7 +236,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
-@@ -256,10 +262,12 @@
+@@ -261,16 +267,19 @@
      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);
-@@ -275,6 +283,7 @@
+     virtual void resizeEvent(QResizeEvent *e);
+     virtual void timerEvent(QTimerEvent *e);
+ 
++%If (PyQt_DragAndDrop)
+     enum DropIndicatorPosition
+     {
+         OnItem,
+@@ -280,6 +289,7 @@
      };
  
      QAbstractItemView::DropIndicatorPosition dropIndicatorPosition() const;
  
  public:
  %If (Qt_4_2_0 -)
-@@ -289,6 +298,7 @@
+@@ -294,6 +304,7 @@
  %If (Qt_4_2_0 -)
      QAbstractItemView::ScrollMode horizontalScrollMode() const;
  %End
  %If (Qt_4_2_0 -)
      void setDragDropOverwriteMode(bool overwrite);
  %End
-@@ -301,6 +311,7 @@
+@@ -306,6 +317,7 @@
  %If (Qt_4_2_0 -)
      QAbstractItemView::DragDropMode dragDropMode() const;
  %End
  %If (Qt_4_2_0 -)
      void setItemDelegateForRow(int row, QAbstractItemDelegate *delegate /KeepReference/);
  %End
-@@ -335,12 +346,14 @@
+@@ -340,12 +352,14 @@
  %End
  
  public:

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

---- 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
+--- sip/QtGui/qabstractprintdialog.sip.old	2012-10-13 21:16:21.000000000 +0200
++++ sip/QtGui/qabstractprintdialog.sip	2012-10-13 21:16:21.000000000 +0200
 @@ -68,7 +68,9 @@
  
      typedef QFlags<QAbstractPrintDialog::PrintDialogOption> PrintDialogOptions;

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

---- 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
+--- sip/QtGui/qabstractscrollarea.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtGui/qabstractscrollarea.sip	2012-10-13 21:16:20.000000000 +0200
 @@ -55,12 +55,18 @@
      virtual void mouseReleaseEvent(QMouseEvent *);
      virtual void mouseDoubleClickEvent(QMouseEvent *);

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

---- 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
+--- sip/QtGui/qabstractslider.sip.old	2012-10-13 21:16:21.000000000 +0200
++++ sip/QtGui/qabstractslider.sip	2012-10-13 21:16:21.000000000 +0200
 @@ -98,7 +98,9 @@
      virtual bool event(QEvent *e);
      virtual void keyPressEvent(QKeyEvent *ev);

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

---- 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
+--- sip/QtGui/qabstractspinbox.sip.old	2012-10-13 21:16:21.000000000 +0200
++++ sip/QtGui/qabstractspinbox.sip	2012-10-13 21:16:21.000000000 +0200
 @@ -93,10 +93,14 @@
      virtual void resizeEvent(QResizeEvent *e);
      virtual void keyPressEvent(QKeyEvent *e);

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

---- 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
+--- sip/QtGui/qaction.sip.old	2012-10-13 21:16:21.000000000 +0200
++++ sip/QtGui/qaction.sip	2012-10-13 21:16:21.000000000 +0200
 @@ -44,20 +44,30 @@
      QString text() const;
      void setIconText(const QString &text);

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

---- 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 @@
+--- sip/QtGui/qapplication.sip.old	2012-10-13 21:16:21.000000000 +0200
++++ sip/QtGui/qapplication.sip	2012-10-13 21:16:21.000000000 +0200
+@@ -1077,10 +1077,12 @@
  
      static int colorSpec();
      static void setColorSpec(int);
      static QPalette palette();
      static QPalette palette(const QWidget *);
      static QPalette palette(const char *className);
-@@ -686,7 +688,9 @@
+@@ -1097,7 +1099,9 @@
      static QDesktopWidget *desktop();
      static QWidget *activePopupWidget();
      static QWidget *activeModalWidget();
      static QWidget *focusWidget();
      static QWidget *activeWindow();
      static void setActiveWindow(QWidget *act);
-@@ -695,7 +699,9 @@
+@@ -1106,7 +1110,9 @@
      static QWidget *topLevelAt(const QPoint &p);
      static QWidget *topLevelAt(int x, int y);
      static void syncX();
      static Qt::KeyboardModifiers keyboardModifiers();
      static Qt::MouseButtons mouseButtons();
      static void setDesktopSettingsAware(bool);
-@@ -706,8 +712,10 @@
+@@ -1117,8 +1123,10 @@
      static int doubleClickInterval();
      static void setKeyboardInputInterval(int);
      static int keyboardInputInterval();
      static void setGlobalStrut(const QSize &);
      static QSize globalStrut();
      static void setStartDragTime(int ms);
-@@ -726,6 +734,13 @@
+@@ -1137,6 +1145,13 @@
  %If (WS_X11)
      int x11ProcessEvent(XEvent *);
  %End
  %If (PyQt_SessionManager)
      bool isSessionRestored() const;
  %End
-@@ -741,8 +756,10 @@
+@@ -1152,8 +1167,10 @@
  %If (PyQt_SessionManager)
      virtual void saveState(QSessionManager &sm);
  %End
      static int exec() /PostHook=__pyQtPostEventLoopHook__,PreHook=__pyQtPreEventLoopHook__,PyName=exec_,ReleaseGIL/;
  %If (Py_v3)
      static int exec() /PostHook=__pyQtPostEventLoopHook__,PreHook=__pyQtPreEventLoopHook__,ReleaseGIL/;
-@@ -751,6 +768,12 @@
+@@ -1162,6 +1179,12 @@
      static void setQuitOnLastWindowClosed(bool quit);
      static bool quitOnLastWindowClosed();
  
  signals:
  %If (Qt_4_2_0 -)
  %If (PyQt_SessionManager)
-@@ -772,12 +795,18 @@
+@@ -1183,12 +1206,18 @@
      static void aboutQt();
      static void closeAllWindows();
  %If (Qt_4_2_0 -)
  public:
  %If (Qt_4_2_0 -)
      static QFont font();
-@@ -795,8 +824,10 @@
+@@ -1206,8 +1235,10 @@
      static Qt::LayoutDirection keyboardInputDirection();
  %End
  %If (Qt_4_2_0 -)

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

---- 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
+--- sip/QtGui/qbrush.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtGui/qbrush.sip	2012-10-13 21:16:20.000000000 +0200
 @@ -140,8 +140,10 @@
  %End
  };
  QDataStream &operator>>(QDataStream &, QBrush & /Constrained/);
  QDataStream &operator<<(QDataStream &, const QBrush & /Constrained/);
 +%End
- typedef QVector<QPair<qreal, QColor>> QGradientStops;
- 
- class QGradient
+ %If (Qt_5_0_0 -)
+ typedef QVector<QPair<double, QColor>> QGradientStops;
+ %End

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

---- 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
+--- sip/QtGui/qcolor.sip.old	2012-10-13 21:16:21.000000000 +0200
++++ sip/QtGui/qcolor.sip	2012-10-13 21:16:21.000000000 +0200
 @@ -223,5 +223,7 @@
  %End
  };

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

---- 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
+--- sip/QtGui/qcombobox.sip.old	2012-10-13 21:16:21.000000000 +0200
++++ sip/QtGui/qcombobox.sip	2012-10-13 21:16:21.000000000 +0200
 @@ -39,10 +39,12 @@
      int count() const /__len__/;
      void setMaxCount(int max);

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

---- 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
+--- sip/QtGui/qcursor.sip.old	2012-10-13 21:16:21.000000000 +0200
++++ sip/QtGui/qcursor.sip	2012-10-13 21:16:21.000000000 +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.

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

---- 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
+--- sip/QtGui/qdatetimeedit.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtGui/qdatetimeedit.sip	2012-10-13 21:16:20.000000000 +0200
 @@ -120,7 +120,9 @@
      void initStyleOption(QStyleOptionSpinBox *option) const;
  %End

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

---- 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
+--- sip/QtGui/qdial.sip.old	2012-10-13 21:16:21.000000000 +0200
++++ sip/QtGui/qdial.sip	2012-10-13 21:16:21.000000000 +0200
 @@ -36,7 +36,7 @@
      virtual ~QDial();
      bool wrapping() const;

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

---- 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
+--- sip/QtGui/qdialog.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtGui/qdialog.sip	2012-10-13 21:16:20.000000000 +0200
 @@ -108,7 +108,9 @@
      virtual void closeEvent(QCloseEvent *);
      virtual void showEvent(QShowEvent *);

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

---- 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
+--- sip/QtGui/qdockwidget.sip.old	2012-10-13 21:16:21.000000000 +0200
++++ sip/QtGui/qdockwidget.sip	2012-10-13 21:16:21.000000000 +0200
 @@ -72,7 +72,9 @@
      void setAllowedAreas(Qt::DockWidgetAreas areas);
      Qt::DockWidgetAreas allowedAreas() const;

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

---- 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
+--- sip/QtGui/qevent.sip.old	2012-10-13 22:10:40.000000000 +0200
++++ sip/QtGui/qevent.sip	2012-10-13 22:13:28.000000000 +0200
 @@ -38,20 +38,25 @@
  %ConvertToSubClassCode
      switch (sipCpp->type())
      #endif
 +    #endif
      
-     default:
-         sipType = 0;
-@@ -264,6 +288,8 @@
-     const QPoint &oldPos() const;
- };
+     #if QT_VERSION >= 0x050000
+     case QEvent::InputMethodQuery:
+@@ -342,6 +366,8 @@
+ 
+ %End
  
 +%If (PyQt_WheelEvent)
 +
  class QWheelEvent : QInputEvent
  {
  %TypeHeaderCode
-@@ -285,6 +311,10 @@
-     Qt::Orientation orientation() const;
+@@ -398,6 +424,10 @@
+ %End
  };
  
 +%End
  class QTabletEvent : QInputEvent
  {
  %TypeHeaderCode
-@@ -333,6 +363,8 @@
-     int yTilt() const;
+@@ -467,6 +497,8 @@
+ %End
  };
  
 +%End
  class QKeyEvent : QInputEvent
  {
  %TypeHeaderCode
-@@ -348,8 +380,10 @@
+@@ -482,8 +514,10 @@
      bool isAutoRepeat() const;
      int count() const /__len__/;
  %If (Qt_4_2_0 -)
  %If (Qt_4_2_0 -)
      quint32 nativeModifiers() const;
  %End
-@@ -464,6 +498,8 @@
+@@ -608,6 +642,8 @@
      virtual ~QHideEvent();
  };
  
  class QContextMenuEvent : QInputEvent
  {
  %TypeHeaderCode
-@@ -493,6 +529,10 @@
+@@ -637,6 +673,10 @@
      QContextMenuEvent::Reason reason() const;
  };
  
  class QInputMethodEvent : QEvent
  {
  %TypeHeaderCode
-@@ -536,6 +576,10 @@
-     int replacementLength() const;
- };
+@@ -724,6 +764,10 @@
+ %End
+ %If (- Qt_5_0_0)
  
 +%End
 +
  class QDropEvent : QEvent, QMimeSource
  {
  %TypeHeaderCode
-@@ -598,6 +642,8 @@
+@@ -788,6 +832,8 @@
      virtual ~QDragLeaveEvent();
  };
  
  class QHelpEvent : QEvent
  {
  %TypeHeaderCode
-@@ -615,6 +661,8 @@
+@@ -805,6 +851,8 @@
      const QPoint &globalPos() const;
  };
  
  class QStatusTipEvent : QEvent
  {
  %TypeHeaderCode
-@@ -627,6 +675,10 @@
+@@ -822,6 +870,10 @@
      QString tip() const;
  };
  
  class QWhatsThisClickedEvent : QEvent
  {
  %TypeHeaderCode
-@@ -639,6 +691,10 @@
+@@ -839,6 +891,10 @@
      QString href() const;
  };
  
  class QActionEvent : QEvent
  {
  %TypeHeaderCode
-@@ -652,6 +708,8 @@
+@@ -852,6 +908,8 @@
      QAction *before() const;
  };
  
  class QFileOpenEvent : QEvent /NoDefaultCtors/
  {
  %TypeHeaderCode
-@@ -669,6 +727,8 @@
+@@ -869,6 +927,8 @@
  %End
  };
  
  class QShortcutEvent : QEvent
  {
  %TypeHeaderCode
-@@ -698,6 +758,8 @@
+@@ -898,6 +958,8 @@
  %End
  };
  
  class QWindowStateChangeEvent : QEvent /NoDefaultCtors/
  {
  %TypeHeaderCode
-@@ -709,12 +771,14 @@
-     Qt::WindowStates oldState() const;
+@@ -910,6 +972,7 @@
  };
  
-+%If (PyQt_Shortcut)
- %If (Qt_4_2_0 -)
- bool operator==(QKeyEvent *e, QKeySequence::StandardKey key);
- %End
- %If (Qt_4_2_0 -)
- bool operator==(QKeySequence::StandardKey key, QKeyEvent *e);
- %End
-+%End
- %If (Qt_4_6_0 -)
- 
- class QTouchEvent : QInputEvent
-@@ -768,6 +832,7 @@
- 
- %End
  %If (Qt_4_6_0 -)
 +%If (PyQt_Gestures)
  
- class QGestureEvent : QEvent
+ class QTouchEvent : QInputEvent
  {
-@@ -795,7 +860,10 @@
+@@ -999,6 +1062,7 @@
+ };
+ 
+ %End
++%End
+ %If (Qt_5_0_0 -)
+ QFlags<QTouchEvent::TouchPoint::InfoFlag> operator|(QTouchEvent::TouchPoint::InfoFlag f1, QFlags<QTouchEvent::TouchPoint::InfoFlag> f2);
+ %End
+@@ -1033,7 +1097,9 @@
      void ignore(Qt::GestureType);
      bool isAccepted(Qt::GestureType) const;
      QWidget *widget() const;
  };
  
  %End
+@@ -1097,9 +1163,11 @@
+ };
+ 
+ %End
++%If (PyQt_Shortcut)
+ %If (Qt_4_2_0 -)
+ bool operator==(QKeyEvent *e, QKeySequence::StandardKey key);
+ %End
+ %If (Qt_4_2_0 -)
+ bool operator==(QKeySequence::StandardKey key, QKeyEvent *e);
+ %End
 +%End

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

---- sip/QtGui/qfont.sip.old	2012-10-04 17:51:53.992239146 +0200
-+++ sip/QtGui/qfont.sip	2012-10-04 17:51:53.996239146 +0200
+--- sip/QtGui/qfont.sip.old	2012-10-13 21:16:21.000000000 +0200
++++ sip/QtGui/qfont.sip	2012-10-13 21:16:21.000000000 +0200
 @@ -172,7 +172,9 @@
      static void removeSubstitution(const QString &);
      static void initialize();

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

---- sip/QtGui/qgraphicsitem.sip.old	2012-10-04 17:51:53.976239146 +0200
-+++ sip/QtGui/qgraphicsitem.sip	2012-10-04 17:51:53.984239146 +0200
+--- sip/QtGui/qgraphicsitem.sip.old	2012-10-13 21:16:21.000000000 +0200
++++ sip/QtGui/qgraphicsitem.sip	2012-10-13 21:16:21.000000000 +0200
 @@ -262,12 +262,16 @@
      QFlags<QGraphicsItem::GraphicsItemFlag> flags() const;
      void setFlag(QGraphicsItem::GraphicsItemFlag flag, bool enabled = true);
      Qt::MouseButtons acceptedMouseButtons() const;
      void setAcceptedMouseButtons(Qt::MouseButtons buttons);
      bool acceptsHoverEvents() const;
-@@ -356,11 +362,15 @@
+@@ -358,11 +364,15 @@
      void removeSceneEventFilter(QGraphicsItem *filterItem);
  
  protected:
      virtual void focusInEvent(QFocusEvent *event);
      virtual void focusOutEvent(QFocusEvent *event);
      virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
-@@ -378,7 +388,9 @@
+@@ -380,7 +390,9 @@
      void prepareGeometryChange();
      virtual bool sceneEvent(QEvent *event);
      virtual bool sceneEventFilter(QGraphicsItem *watched, QEvent *event);
  
  public:
      void setPos(qreal ax, qreal ay);
-@@ -935,10 +947,12 @@
+@@ -937,10 +949,12 @@
      virtual void keyReleaseEvent(QKeyEvent *event);
      virtual void focusInEvent(QFocusEvent *event);
      virtual void focusOutEvent(QFocusEvent *event);
      virtual void inputMethodEvent(QInputMethodEvent *event);
      virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
      virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *event);
-@@ -1032,8 +1046,10 @@
+@@ -1034,8 +1048,10 @@
  
  public:
      QGraphicsObject(QGraphicsItem *parent /TransferThis/ = 0);
  
  signals:
      void parentChanged();
-@@ -1109,10 +1125,12 @@
+@@ -1111,10 +1127,12 @@
      virtual void keyReleaseEvent(QKeyEvent *event);
      virtual void focusInEvent(QFocusEvent *event);
      virtual void focusOutEvent(QFocusEvent *event);

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

---- sip/QtGui/qgraphicsproxywidget.sip.old	2012-10-04 17:51:54.332239144 +0200
-+++ sip/QtGui/qgraphicsproxywidget.sip	2012-10-04 17:51:54.336239144 +0200
+--- sip/QtGui/qgraphicsproxywidget.sip.old	2012-10-13 21:16:21.000000000 +0200
++++ sip/QtGui/qgraphicsproxywidget.sip	2012-10-13 21:16:21.000000000 +0200
 @@ -69,7 +69,9 @@
      virtual bool eventFilter(QObject *object, QEvent *event);
      virtual void showEvent(QShowEvent *event);

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

---- sip/QtGui/qgraphicsscene.sip.old	2012-10-04 17:51:54.108239148 +0200
-+++ sip/QtGui/qgraphicsscene.sip	2012-10-04 17:51:54.116239146 +0200
+--- sip/QtGui/qgraphicsscene.sip.old	2012-10-13 21:16:21.000000000 +0200
++++ sip/QtGui/qgraphicsscene.sip	2012-10-13 21:16:21.000000000 +0200
 @@ -128,11 +128,15 @@
  
  protected:

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

---- sip/QtGui/qgraphicssceneevent.sip.old	2012-10-04 17:51:54.312239147 +0200
-+++ sip/QtGui/qgraphicssceneevent.sip	2012-10-04 17:51:54.316239147 +0200
+--- sip/QtGui/qgraphicssceneevent.sip.old	2012-10-13 21:16:21.000000000 +0200
++++ sip/QtGui/qgraphicssceneevent.sip	2012-10-13 21:16:21.000000000 +0200
 @@ -186,6 +186,7 @@
  
  %End

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

---- sip/QtGui/qgraphicsview.sip.old	2012-10-04 17:51:54.528239144 +0200
-+++ sip/QtGui/qgraphicsview.sip	2012-10-04 17:51:54.536239143 +0200
-@@ -137,11 +137,15 @@
+--- sip/QtGui/qgraphicsview.sip.old	2012-10-13 21:16:21.000000000 +0200
++++ sip/QtGui/qgraphicsview.sip	2012-10-13 21:16:21.000000000 +0200
+@@ -142,11 +142,15 @@
  protected:
      virtual bool event(QEvent *event);
      virtual bool viewportEvent(QEvent *event);
      virtual void focusInEvent(QFocusEvent *event);
      virtual void focusOutEvent(QFocusEvent *event);
  %If (Qt_4_4_0 -)
-@@ -153,7 +157,9 @@
+@@ -158,7 +162,9 @@
      virtual void mousePressEvent(QMouseEvent *event);
      virtual void mouseMoveEvent(QMouseEvent *event);
      virtual void mouseReleaseEvent(QMouseEvent *event);
      virtual void paintEvent(QPaintEvent *event);
      virtual void resizeEvent(QResizeEvent *event);
      virtual void scrollContentsBy(int dx, int dy);
-@@ -305,12 +311,14 @@
+@@ -310,12 +316,14 @@
  %If (Qt_4_3_0 -)
      void setOptimizationFlags(QFlags<QGraphicsView::OptimizationFlag> flags);
  %End

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

---- sip/QtGui/qgraphicswidget.sip.old	2012-10-04 17:51:54.360239144 +0200
-+++ sip/QtGui/qgraphicswidget.sip	2012-10-04 17:51:54.368239144 +0200
+--- sip/QtGui/qgraphicswidget.sip.old	2012-10-13 21:16:20.000000000 +0200
++++ sip/QtGui/qgraphicswidget.sip	2012-10-13 21:16:20.000000000 +0200
 @@ -143,6 +143,7 @@
      virtual void ungrabKeyboardEvent(QEvent *event);
  

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

---- sip/QtGui/qicon.sip.old	2012-10-04 17:51:53.916239147 +0200
-+++ sip/QtGui/qicon.sip	2012-10-04 17:51:53.920239146 +0200
+--- sip/QtGui/qicon.sip.old	2012-10-13 21:16:21.000000000 +0200
++++ sip/QtGui/qicon.sip	2012-10-13 21:16:21.000000000 +0200
 @@ -109,12 +109,14 @@
  %End
  };

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

---- sip/QtGui/qiconengine.sip.old	2012-10-04 17:51:54.452239145 +0200
-+++ sip/QtGui/qiconengine.sip	2012-10-04 17:51:54.456239145 +0200
-@@ -51,8 +51,10 @@
+--- sip/QtGui/qiconengine.sip.old	2012-10-13 21:16:21.000000000 +0200
++++ sip/QtGui/qiconengine.sip	2012-10-13 21:16:21.000000000 +0200
+@@ -92,8 +92,10 @@
  public:
      virtual QString key() const;
      virtual QIconEngineV2 *clone() const /Factory/;

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

---- sip/QtGui/qimage.sip.old	2012-10-04 17:51:54.496239145 +0200
-+++ sip/QtGui/qimage.sip	2012-10-04 17:51:54.504239143 +0200
+--- sip/QtGui/qimage.sip.old	2012-10-13 21:16:21.000000000 +0200
++++ sip/QtGui/qimage.sip	2012-10-13 21:16:21.000000000 +0200
 @@ -98,6 +98,7 @@
  %If (Qt_4_3_0 -)
      QImage(void *data, int width, int height, int bytesPerLine, QImage::Format format) [(uchar *data, int width, int height, int bytesPerLine, QImage::Format format)];

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

---- sip/QtGui/qinputcontext.sip.old	2012-10-04 17:51:54.096239145 +0200
-+++ sip/QtGui/qinputcontext.sip	2012-10-04 17:51:54.104239148 +0200
-@@ -44,7 +44,9 @@
+--- sip/QtGui/qinputcontext.sip.old	2012-10-13 21:16:21.000000000 +0200
++++ sip/QtGui/qinputcontext.sip	2012-10