Commits

David Boddie committed 2010503

Fixed patches with incorrect placing of %If and %End directives.

Comments (0)

Files changed (2)

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

---- 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
+--- sip/QtGui/qevent.sip.old	2012-10-16 12:52:02.049282084 +0200
++++ sip/QtGui/qevent.sip	2012-10-16 12:58:05.433280323 +0200
 @@ -38,20 +38,25 @@
  %ConvertToSubClassCode
      switch (sipCpp->type())
  class QInputMethodEvent : QEvent
  {
  %TypeHeaderCode
-@@ -724,6 +764,10 @@
+@@ -697,6 +737,9 @@
+ };
+ 
  %End
- %If (- Qt_5_0_0)
- 
 +%End
 +
 +%If (PyQt_DragAndDrop)
-+
- class QDropEvent : QEvent, QMimeSource
- {
- %TypeHeaderCode
-@@ -788,6 +832,8 @@
+ %If (Qt_5_0_0 -)
+ 
+ class QDropEvent : QEvent
+@@ -788,6 +831,8 @@
      virtual ~QDragLeaveEvent();
  };
  
  class QHelpEvent : QEvent
  {
  %TypeHeaderCode
-@@ -805,6 +851,8 @@
+@@ -805,6 +850,8 @@
      const QPoint &globalPos() const;
  };
  
  class QStatusTipEvent : QEvent
  {
  %TypeHeaderCode
-@@ -822,6 +870,10 @@
+@@ -822,6 +869,10 @@
      QString tip() const;
  };
  
  class QWhatsThisClickedEvent : QEvent
  {
  %TypeHeaderCode
-@@ -839,6 +891,10 @@
+@@ -839,6 +890,10 @@
      QString href() const;
  };
  
  class QActionEvent : QEvent
  {
  %TypeHeaderCode
-@@ -852,6 +908,8 @@
+@@ -852,6 +907,8 @@
      QAction *before() const;
  };
  
  class QFileOpenEvent : QEvent /NoDefaultCtors/
  {
  %TypeHeaderCode
-@@ -869,6 +927,8 @@
+@@ -869,6 +926,8 @@
  %End
  };
  
  class QShortcutEvent : QEvent
  {
  %TypeHeaderCode
-@@ -898,6 +958,8 @@
+@@ -898,6 +957,8 @@
  %End
  };
  
  class QWindowStateChangeEvent : QEvent /NoDefaultCtors/
  {
  %TypeHeaderCode
-@@ -910,6 +972,7 @@
- };
- 
- %If (Qt_4_6_0 -)
-+%If (PyQt_Gestures)
- 
- class QTouchEvent : QInputEvent
- {
-@@ -999,6 +1062,7 @@
+@@ -999,6 +1060,8 @@
  };
  
  %End
-+%End
++
++%If (PyQt_Gestures)
  %If (Qt_5_0_0 -)
  QFlags<QTouchEvent::TouchPoint::InfoFlag> operator|(QTouchEvent::TouchPoint::InfoFlag f1, QFlags<QTouchEvent::TouchPoint::InfoFlag> f2);
  %End
-@@ -1033,7 +1097,9 @@
+@@ -1033,10 +1096,14 @@
      void ignore(Qt::GestureType);
      bool isAccepted(Qt::GestureType) const;
      QWidget *widget() const;
  };
  
  %End
-@@ -1097,9 +1163,11 @@
++%End
++
+ %If (Qt_5_0_0 -)
+ 
+ class QExposeEvent : QEvent
+@@ -1097,9 +1164,11 @@
  };
  
  %End

PyQt4-Qt-Embedded-Linux-patches/sip/QtGui/qstyleoption.sip.diff

---- sip/QtGui/qstyleoption.sip.old	2012-10-14 16:56:24.000000000 +0200
-+++ sip/QtGui/qstyleoption.sip	2012-10-14 17:52:14.000000000 +0200
+--- sip/QtGui/qstyleoption.sip.old	2012-10-16 12:58:50.225280105 +0200
++++ sip/QtGui/qstyleoption.sip	2012-10-16 13:12:12.688691214 +0200
 @@ -118,24 +118,31 @@
          break;
      #endif
  %If (Qt_4_4_0 - Qt_5_0_0)
  
  class QStyleOptionViewItemV4 : QStyleOptionViewItemV3
-@@ -2124,6 +2170,9 @@
+@@ -2102,6 +2148,7 @@
  };
  
  %End
 +%End // PyQt_ItemViews
+ %If (Qt_4_5_0 - Qt_5_0_0)
+ 
+ class QStyleOptionFrameV3 : QStyleOptionFrameV2
+@@ -2124,6 +2171,8 @@
+ };
+ 
+ %End
 +
 +%If (PyQt_TabBar)
  %If (Qt_4_5_0 - Qt_5_0_0)