# # Patch managed by http://www.holgerschurig.de/patcher.html # --- PyQt-x11-gpl-3.13/sip/qtcanvas/qcanvas.sip~qt2-fix +++ PyQt-x11-gpl-3.13/sip/qtcanvas/qcanvas.sip @@ -235,7 +235,7 @@ sipClass = sipClass_QCanvasLine; break; -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 case 8: sipClass = sipClass_QCanvasSpline; break; --- PyQt-x11-gpl-3.13/sip/qttable/qtable.sip~qt2-fix +++ PyQt-x11-gpl-3.13/sip/qttable/qtable.sip @@ -114,7 +114,7 @@ %ConvertToSubClassCode Py_BEGIN_ALLOW_THREADS -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 int rtti = sipCpp -> rtti(); if (rtti == QCheckTableItem::RTTI) --- PyQt-x11-gpl-3.13/sip/qt/qobject.sip~qt2-fix +++ PyQt-x11-gpl-3.13/sip/qt/qobject.sip @@ -102,7 +102,7 @@ #endif {sipName_QComboBox, &sipClass_QComboBox}, {sipName_QCommonStyle, &sipClass_QCommonStyle}, -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 {sipName_QDateEdit, &sipClass_QDateEdit}, {sipName_QDateTimeEdit, &sipClass_QDateTimeEdit}, {sipName_QDesktopWidget, &sipClass_QDesktopWidget}, @@ -111,13 +111,13 @@ {sipName_QDial, &sipClass_QDial}, #endif {sipName_QDialog, &sipClass_QDialog}, -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 {sipName_QDockArea, &sipClass_QDockArea}, {sipName_QDockWindow, &sipClass_QDockWindow}, #endif {sipName_QDoubleValidator, &sipClass_QDoubleValidator}, {sipName_QDragObject, &sipClass_QDragObject}, -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 {sipName_QErrorMessage, &sipClass_QErrorMessage}, #endif #if QT_VERSION >= 0x030100 @@ -133,7 +133,7 @@ {sipName_QFrame, &sipClass_QFrame}, {sipName_QGrid, &sipClass_QGrid}, {sipName_QGridLayout, &sipClass_QGridLayout}, -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 {sipName_QGridView, &sipClass_QGridView}, #endif {sipName_QGroupBox, &sipClass_QGroupBox}, @@ -175,7 +175,7 @@ {sipName_QNetworkOperation, &sipClass_QNetworkOperation}, {sipName_QNetworkProtocol, &sipClass_QNetworkProtocol}, #endif -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 {sipName_QObjectCleanupHandler, &sipClass_QObjectCleanupHandler}, #endif #if defined(SIP_FEATURE_Qt_STYLE_PLATINUM) @@ -185,7 +185,7 @@ #if defined(WS_X11) && defined(SIP_FEATURE_Qt_PRINTDIALOG) {sipName_QPrintDialog, &sipClass_QPrintDialog}, #endif -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 {sipName_QProcess, &sipClass_QProcess}, #endif {sipName_QProgressBar, &sipClass_QProgressBar}, @@ -194,7 +194,7 @@ #endif {sipName_QPushButton, &sipClass_QPushButton}, {sipName_QRadioButton, &sipClass_QRadioButton}, -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 {sipName_QRegExpValidator, &sipClass_QRegExpValidator}, #endif #if QT_VERSION >= 220 && defined(SIP_FEATURE_Qt_STYLE_SGI) @@ -229,11 +229,11 @@ {sipName_QTabWidget, &sipClass_QTabWidget}, {sipName_QTextBrowser, &sipClass_QTextBrowser}, {sipName_QTextDrag, &sipClass_QTextDrag}, -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 {sipName_QTextEdit, &sipClass_QTextEdit}, #endif {sipName_QTextView, &sipClass_QTextView}, -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 {sipName_QTimeEdit, &sipClass_QTimeEdit}, #endif {sipName_QTimer, &sipClass_QTimer}, --- PyQt-x11-gpl-3.13/sip/qt/qevent.sip~qt2-fix +++ PyQt-x11-gpl-3.13/sip/qt/qevent.sip @@ -528,7 +528,7 @@ sipClass = sipClass_QChildEvent; break; -#if QT_VERSION >= 300 +#if QT_VERSION >= 0x030000 case QEvent::ContextMenu: sipClass = sipClass_QContextMenuEvent; break; @@ -539,7 +539,7 @@ break; #endif -#if QT_VERSION >= 300 && QT_VERSION < 0x030100 +#if QT_VERSION >= 0x030000 && QT_VERSION < 0x030100 case QEvent::IMCompose: sipClass = sipClass_QIMEvent; break; class='left'>Commit message (Collapse)AuthorFiles 2010-09-10autotools: enable siteconfig by defaultJeff Polk1 eglibc glibc ncurses uclibc zlib: remove explicit siteconfig Signed-off-by: Jeff Polk <jeff.polk@windriver.com> 2010-08-19autotools.bbclass: Drop a number of legacy functions that shouldn't be (and ↵Richard Purdie1 aren't) used in poky now Signed-off-by: Richard Purdie <rpurdie@linux.intel.com> 2010-07-22Finally deprecate all legacy do_stage functions. This changes the existing ↵Richard Purdie1 warning into a fatal error if any legacy do_stage functions are found. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com> 2010-04-27autotools: deprecate autotools_stage classJoshua Lock1 Move the functionality into autotools and ensure all our Poky recipes are no longer using it. Keep the autools_stage class around for OE compatability but just have it inherit autools. Signed-off-by: Joshua Lock <josh@linux.intel.com> 2010-03-29autotools.bbclass: Allow extraction of the configure arguments for use in ↵Richard Purdie1 strange testcases Signed-off-by: Richard Purdie <rpurdie@linux.intel.com> 2010-03-19base.bbclass: Don't inherit siteinfo in base.bbclass [based on an OE patch ↵Richard Purdie1 from Chris Larson] 2009-11-30autotools.bbclass: Make sure config.rpath is present if neededRichard Purdie1 Signed-off-by: Richard Purdie <rpurdie@linux.intel.com> 2009-11-13base/autotools.bbclass: Make sure extra dependencies are not lost for native ↵Richard Purdie1 and nativesdk BBCLASSEXTEND. Ugly but no simpler/neater way seems possible Signed-off-by: Richard Purdie <rpurdie@linux.intel.com> 2009-11-13classes: Remove and sanitise import statementsRichard Purdie1 Signed-off-by: Richard Purdie <rpurdie@linux.intel.com> 2009-11-13classes: Various staging improvement fixupsRichard Purdie1 Signed-off-by: Richard Purdie <rpurdie@linux.intel.com> 2009-11-13autotools.bbclass: Separate out useful staging functions into base.bbclass ↵Richard Purdie1 and call from autotools classes Signed-off-by: Richard Purdie <rpurdie@linux.intel.com> 2009-11-13autotools.bbclass: No need to fork sed each timeRichard Purdie1 Signed-off-by: Richard Purdie <rpurdie@linux.intel.com> 2009-11-13autotools.bbclass: Convert .la file mangling to package preprocessing hookRichard Purdie1 Signed-off-by: Richard Purdie <rpurdie@linux.intel.com> 2009-09-17Remove layout_* variablesRichard Purdie1 Remove layout_* variables and replace them with variables specific to the different classes. The layout variables were only useful for the native/cross classes and caused more confusion than they solved. They didn't scale to the sdk class. It now clear a small set of native/cross variables fulfil the needs. This patch also changes native.bbclass to use "/" as the STAGING_DIR which makes sense since we're installing binaries into the locations we're compiling them for. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com> 2009-08-12autotools.bbclass: Remove pointless inheritRichard Purdie1 Signed-off-by: Richard Purdie <rpurdie@linux.intel.com> 2009-07-16autotools.bbclass: Fix to work with configure files with leading whitespaceRichard Purdie1 Signed-off-by: Richard Purdie <rpurdie@linux.intel.com> 2009-06-11packaged-staging.bbclass: Detect when we're using autotools_stage_all and ↵Richard Purdie1 don't hold the lock for as long when that is the case giving a significant performance boost with less lock contention and staging area file timestamp checking required Signed-off-by: Richard Purdie <rpurdie@linux.intel.com> 2008-11-04autotools.bbclass: Handle /lib as well as /usr/lib in autotools_stage_allRichard Purdie1