diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-05-23 10:28:00 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-05-23 10:34:18 +0300 |
| commit | baf9b8e6918c76d7f58d557d9a102b5b5d1727c0 (patch) | |
| tree | 9cbaaa54acd3ce1d0cc52b7a9045240723f8b9da /recipes-python/pyqt5/python-pyqt5_5.12.1.bb | |
| parent | 89ac66bf3969b48eb771ef4c06a0b8df00fd178a (diff) | |
| parent | 60e61ea26a0f221fdb8c992990686c9f449f27c5 (diff) | |
| download | meta-qt5-baf9b8e6918c76d7f58d557d9a102b5b5d1727c0.tar.gz | |
Merge remote-tracking branch 'qtyocto/upstream/warrior' into 5.12
* qtocto/upstream/warrior:
60e61ea qt3d-runtime: update to v2.3
cad5f8c qtbase: add no-opengl to PACKAGECONFIG_GL when opengl isn't in DISTRO_FEATURES
44aab3a qtbase: add accessibility from PACKAGECONFIG_KDE to PACKAGECONFIG_DEFAULT
000e298 qtbase: add libxext dependency for xcb PACKAGECONFIG
ba08444 python-pyqt5: Update to version 5.12.1.
6a1a387 python-pyqt: Fix annoying problems.
c7e0ba5 qtwebengine: arm: use OE specified -mcpu option
9c62c01 qtbase-tools: Fix error during pkg_postinst
f4531ec qtwebengine: restore the fix for build with clang/libc++ on aarch64/arm
Conflicts:
recipes-qt/qt5/qtbase_git.bb
Change-Id: I853b6669bd4e42224b278587c412032903ba5555
Diffstat (limited to 'recipes-python/pyqt5/python-pyqt5_5.12.1.bb')
| -rw-r--r-- | recipes-python/pyqt5/python-pyqt5_5.12.1.bb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/recipes-python/pyqt5/python-pyqt5_5.12.1.bb b/recipes-python/pyqt5/python-pyqt5_5.12.1.bb new file mode 100644 index 00000000..6b1b5701 --- /dev/null +++ b/recipes-python/pyqt5/python-pyqt5_5.12.1.bb | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | require python-pyqt5.inc | ||
| 2 | |||
| 3 | inherit pythonnative python-dir | ||
| 4 | |||
| 5 | DEPENDS += "sip sip-native python" | ||
| 6 | |||
| 7 | RDEPENDS_${PN} += "python-core python-sip" | ||
| 8 | |||