ecb26b1add
[Thomas: - Remove dependency on python (already a dependency of python-sip), and add a dependency on host-python-sip, since python-sip no longer depends on host-python-sip. - Make the code Python 2 / Python 3 compatible (both have been tested). - Fix indentation all over the place. - Remove double quotes when defining variable values, not needed. - Add <pkg>_BUILD_CMDS to do the build process separately from the installation. - Create a PYTHON_PYQT_CONF_OPTS variable with all the config options, since some of them are now conditional. - Use 'compileall' to byte-compile the dummy __init__.py.] Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> Cc: Sergey Kostanbaev <sergey.kostanbaev@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
25 lines
845 B
Diff
25 lines
845 B
Diff
Fix build issue in QWS flavor
|
|
|
|
Change HANDLE to void* to get rid of :
|
|
buildroot/output/build/python-pyqt-4.11.3/QtCore/sipQtCoreQThread.cpp:318:50:
|
|
error: invalid conversion from 'Qt::HANDLE {aka void*}' to 'long
|
|
unsigned int' [-fpermissive] error during compilation.
|
|
|
|
Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
|
|
Signed-off-by: Sergey Kostanbaev <sergey.kostanbaev@gmail.com>
|
|
---
|
|
Index: PyQt-x11-gpl-4.11.3/sip/QtCore/qnamespace.sip
|
|
===================================================================
|
|
--- PyQt-x11-gpl-4.11.3.orig/sip/QtCore/qnamespace.sip
|
|
+++ PyQt-x11-gpl-4.11.3/sip/QtCore/qnamespace.sip
|
|
@@ -1673,6 +1673,9 @@ namespace Qt
|
|
%If (WS_X11)
|
|
typedef unsigned long HANDLE;
|
|
%End
|
|
+%If (WS_QWS)
|
|
+ typedef void* HANDLE;
|
|
+%End
|
|
%End
|
|
%If (PyQt_Deprecated_5_0)
|
|
typedef Qt::WindowFlags WFlags;
|