diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2012-08-01 11:51:02 +0200 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2012-08-07 12:21:23 +0200 |
| commit | 878a0c84727a3f709400a93289bef7025432a946 (patch) | |
| tree | d005d8384da1480ce5dc6a8c9f339e01fadaf846 /meta-oe/recipes-devtools/python/python-pyqt-4.8.4/pyqt-generated.patch | |
| parent | 910feab3e7cae1a74562c930be032566824968eb (diff) | |
| download | meta-openembedded-contrib-878a0c84727a3f709400a93289bef7025432a946.tar.gz | |
python-pyqt: import from oe-classic
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/python/python-pyqt-4.8.4/pyqt-generated.patch')
| -rw-r--r-- | meta-oe/recipes-devtools/python/python-pyqt-4.8.4/pyqt-generated.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/pyqt-generated.patch b/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/pyqt-generated.patch new file mode 100644 index 0000000000..0af5549535 --- /dev/null +++ b/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/pyqt-generated.patch @@ -0,0 +1,24 @@ +diff -uNr PyQt-x11-gpl-4.8.4.orig/QtGui/sipQtGuiQSystemTrayIcon.cpp PyQt-x11-gpl-4.8.4/QtGui/sipQtGuiQSystemTrayIcon.cpp +--- PyQt-x11-gpl-4.8.4.orig/QtGui/sipQtGuiQSystemTrayIcon.cpp 2012-08-01 16:37:34.000000000 +0200 ++++ PyQt-x11-gpl-4.8.4/QtGui/sipQtGuiQSystemTrayIcon.cpp 2012-08-01 17:05:45.000000000 +0200 +@@ -957,8 +957,6 @@ + qtgui_untrack(sipCpp); + #line 959 "QtGui/sipQtGuiQSystemTrayIcon.cpp" + +- QSystemTrayIcon *sipCpp = reinterpret_cast<QSystemTrayIcon *>(sipCppV); +- + if (QThread::currentThread() == sipCpp->thread()) + delete sipCpp; + else +diff -uNr PyQt-x11-gpl-4.8.4.orig/QtGui/sipQtGuiQGraphicsScene.cpp PyQt-x11-gpl-4.8.4/QtGui/sipQtGuiQGraphicsScene.cpp +--- PyQt-x11-gpl-4.8.4.orig/QtGui/sipQtGuiQGraphicsScene.cpp 2012-08-01 16:37:35.000000000 +0200 ++++ PyQt-x11-gpl-4.8.4/QtGui/sipQtGuiQGraphicsScene.cpp 2012-08-01 17:26:58.000000000 +0200 +@@ -4016,8 +4016,6 @@ + qtgui_untrack(sipCpp); + #line 4018 "QtGui/sipQtGuiQGraphicsScene.cpp" + +- QGraphicsScene *sipCpp = reinterpret_cast<QGraphicsScene *>(sipCppV); +- + if (QThread::currentThread() == sipCpp->thread()) + delete sipCpp; + else |