summaryrefslogtreecommitdiffstats
path: root/recipes-python/pyqt5
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2019-11-26 16:07:49 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2019-11-27 07:38:23 +0200
commit3bd81f1997683774dd28e6b8673c9b19b66a73ec (patch)
tree368a37454e3d7031b33a609ef9a428fa43c73880 /recipes-python/pyqt5
parent08cc9ad2579f897b84d4fb430d898103dc568d26 (diff)
parent929b2ef266c6eb4cc1f5500f421fda449cd8900b (diff)
downloadmeta-qt5-3bd81f1997683774dd28e6b8673c9b19b66a73ec.tar.gz
Merge remote-tracking branch 'qt/5.14' into 5.15
* qt/5.14: (22 commits) qtwebengine: add clang fix qt5: update submodules qt5: use PACKAGECONFIG to disable tests and examples qt5: update submodules qt5: update submodules qt5: update submodules qt5: update submodules ogl-runtime: update to v2.5.0 release qttools: don't install tst_qtattributionsscanner qt5: Upgrade to Qt 5.13.2 python(3)-pyqt5: add qml support libqofono: bump SRCREV and add a fix for voicecall qt5: update submodules qt5: update submodules qtbase: add openssl PACKAGECONFIG for native nativesdk ogl-runtime: update to 2.5 qtbase: Add PACKAGECONFIG for lttng layer: Mark zeus as compatible release ogl-runtime: Fix build on x86_64 README.md: Document need for 32bit host compiler ... Change-Id: I3892eef7a2ee02cde0f493df7aa1a27f683f1799
Diffstat (limited to 'recipes-python/pyqt5')
-rw-r--r--recipes-python/pyqt5/python-pyqt5.inc7
1 files changed, 3 insertions, 4 deletions
diff --git a/recipes-python/pyqt5/python-pyqt5.inc b/recipes-python/pyqt5/python-pyqt5.inc
index 11d246d7..bbeb75af 100644
--- a/recipes-python/pyqt5/python-pyqt5.inc
+++ b/recipes-python/pyqt5/python-pyqt5.inc
@@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "3718ce847d824090fd5f95ff3f13847ee75c2507368d4cbaeb48338f50
14S = "${WORKDIR}/PyQt5_gpl-${PV}" 14S = "${WORKDIR}/PyQt5_gpl-${PV}"
15 15
16inherit qmake5 16inherit qmake5
17DEPENDS = "qtbase" 17DEPENDS = "qtbase qtdeclarative qtquickcontrols2"
18 18
19export BUILD_SYS 19export BUILD_SYS
20export HOST_SYS 20export HOST_SYS
@@ -27,8 +27,7 @@ DISABLED_FEATURES = "PyQt_Desktop_OpenGL PyQt_Accessibility PyQt_SessionManager"
27 27
28DISABLED_FEATURES_append_arm = " PyQt_qreal_double" 28DISABLED_FEATURES_append_arm = " PyQt_qreal_double"
29 29
30PYQT_MODULES = "QtCore QtGui QtNetwork QtWidgets" 30PYQT_MODULES = "QtCore QtGui QtNetwork QtWidgets QtXml QtNetwork QtQml QtQuick QtQuickWidgets"
31PYQT_MODULES_aarch64 = "QtCore QtGui QtNetwork QtWidgets"
32 31
33do_configure_prepend() { 32do_configure_prepend() {
34 cd ${S} 33 cd ${S}
@@ -60,4 +59,4 @@ do_install() {
60 59
61FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt5/" 60FILES_${PN} += "${libdir}/${PYTHON_DIR}/site-packages ${datadir}/sip/PyQt5/"
62 61
63RDEPENDS_${PN} = "qtbase" 62RDEPENDS_${PN} = "qtbase qtdeclarative qtquickcontrols2 qtquickcontrols2-mkspecs"