diff options
author | Diego Rondini <diego.rondini@kynetics.com> | 2017-07-20 14:07:01 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-07-21 11:00:47 +0200 |
commit | 3c4f2cba1ff6925da20bcf4469526aceee80ad90 (patch) | |
tree | 1cc1e71fdf4581e3dd07d739f010671ae4c947f2 /recipes-python | |
parent | 045e39b7d487733b03dc54590702e4c9373ed0f1 (diff) | |
download | meta-qt5-3c4f2cba1ff6925da20bcf4469526aceee80ad90.tar.gz |
python-pyqt5: include QtWidgets module
Signed-off-by: Diego Rondini <diego.rondini@kynetics.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-python')
-rw-r--r-- | recipes-python/pyqt5/files/0001-qtabbar.sip-fix-build-with-accessibility-disabled.patch | 35 | ||||
-rw-r--r-- | recipes-python/pyqt5/python-pyqt5_5.8.2.bb | 5 |
2 files changed, 38 insertions, 2 deletions
diff --git a/recipes-python/pyqt5/files/0001-qtabbar.sip-fix-build-with-accessibility-disabled.patch b/recipes-python/pyqt5/files/0001-qtabbar.sip-fix-build-with-accessibility-disabled.patch new file mode 100644 index 00000000..7e1c7bf4 --- /dev/null +++ b/recipes-python/pyqt5/files/0001-qtabbar.sip-fix-build-with-accessibility-disabled.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 8a2f852417414e19d060da66cd7c5cba76e43c7d Mon Sep 17 00:00:00 2001 | ||
2 | From: Diego Rondini <diego.rondini@kynetics.com> | ||
3 | Date: Wed, 19 Jul 2017 14:17:51 +0200 | ||
4 | Subject: [PATCH] qtabbar.sip: fix build with accessibility disabled | ||
5 | |||
6 | Upstream-Status: Submitted | ||
7 | |||
8 | Signed-off-by: Diego Rondini <diego.rondini@kynetics.com> | ||
9 | --- | ||
10 | sip/QtWidgets/qtabbar.sip | 4 ++++ | ||
11 | 1 file changed, 4 insertions(+) | ||
12 | |||
13 | diff --git a/sip/QtWidgets/qtabbar.sip b/sip/QtWidgets/qtabbar.sip | ||
14 | index ffe2d3b..80ad816 100644 | ||
15 | --- a/sip/QtWidgets/qtabbar.sip | ||
16 | +++ b/sip/QtWidgets/qtabbar.sip | ||
17 | @@ -166,11 +166,15 @@ protected: | ||
18 | |||
19 | public: | ||
20 | %If (Qt_5_8_0 -) | ||
21 | +%If (PyQt_Accessibility) | ||
22 | QString accessibleTabName(int index) const; | ||
23 | %End | ||
24 | +%End | ||
25 | %If (Qt_5_8_0 -) | ||
26 | +%If (PyQt_Accessibility) | ||
27 | void setAccessibleTabName(int index, const QString &name); | ||
28 | %End | ||
29 | +%End | ||
30 | |||
31 | private: | ||
32 | QTabBar(const QTabBar &); | ||
33 | -- | ||
34 | 2.7.4 | ||
35 | |||
diff --git a/recipes-python/pyqt5/python-pyqt5_5.8.2.bb b/recipes-python/pyqt5/python-pyqt5_5.8.2.bb index 3fa3d644..fdfa1205 100644 --- a/recipes-python/pyqt5/python-pyqt5_5.8.2.bb +++ b/recipes-python/pyqt5/python-pyqt5_5.8.2.bb | |||
@@ -11,6 +11,7 @@ DEPENDS = "sip sip-native qtbase python" | |||
11 | SRC_URI = "\ | 11 | SRC_URI = "\ |
12 | ${SOURCEFORGE_MIRROR}/pyqt/PyQt5_gpl-${PV}.tar.gz \ | 12 | ${SOURCEFORGE_MIRROR}/pyqt/PyQt5_gpl-${PV}.tar.gz \ |
13 | file://fix-sm.patch \ | 13 | file://fix-sm.patch \ |
14 | file://0001-qtabbar.sip-fix-build-with-accessibility-disabled.patch \ | ||
14 | " | 15 | " |
15 | SRC_URI[md5sum] = "c3048e9d242f3e72fd393630da1d971a" | 16 | SRC_URI[md5sum] = "c3048e9d242f3e72fd393630da1d971a" |
16 | SRC_URI[sha256sum] = "ebd70515b30bbd6098fee29e6271a6696b1183c5530ee30e6ba9aaab195536e8" | 17 | SRC_URI[sha256sum] = "ebd70515b30bbd6098fee29e6271a6696b1183c5530ee30e6ba9aaab195536e8" |
@@ -31,8 +32,8 @@ DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager" | |||
31 | 32 | ||
32 | DISABLED_FEATURES_append_arm = " PyQt_qreal_double" | 33 | DISABLED_FEATURES_append_arm = " PyQt_qreal_double" |
33 | 34 | ||
34 | PYQT_MODULES = "QtCore QtGui QtNetwork" | 35 | PYQT_MODULES = "QtCore QtGui QtNetwork QtWidgets" |
35 | PYQT_MODULES_aarch64 = "QtCore QtGui QtNetwork" | 36 | PYQT_MODULES_aarch64 = "QtCore QtGui QtNetwork QtWidgets" |
36 | 37 | ||
37 | do_configure_prepend() { | 38 | do_configure_prepend() { |
38 | cd ${S} | 39 | cd ${S} |