summaryrefslogtreecommitdiffstats
path: root/recipes-qt/packagegroups
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/packagegroups')
-rw-r--r--recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb1
-rwxr-xr-xrecipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb8
2 files changed, 2 insertions, 7 deletions
diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb
index e92cb9d4..facd2763 100644
--- a/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb
+++ b/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb
@@ -11,5 +11,6 @@ RDEPENDS_${PN} += " \
11 nativesdk-packagegroup-sdk-host \ 11 nativesdk-packagegroup-sdk-host \
12 nativesdk-qttools-tools \ 12 nativesdk-qttools-tools \
13 nativesdk-qtbase \ 13 nativesdk-qtbase \
14 nativesdk-qtbase-dev \
14 nativesdk-perl-modules \ 15 nativesdk-perl-modules \
15" 16"
diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
index 0fca38e6..8c8bed30 100755
--- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb
@@ -3,16 +3,11 @@
3DESCRIPTION = "Target packages for Qt5 SDK" 3DESCRIPTION = "Target packages for Qt5 SDK"
4LICENSE = "MIT" 4LICENSE = "MIT"
5 5
6PACKAGE_ARCH = "${MACHINE_ARCH}" 6PACKAGE_ARCH = "${TUNE_PKGARCH}"
7inherit packagegroup 7inherit packagegroup
8 8
9PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" 9PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
10 10
11# Requires Ruby to work
12USE_RUBY = " \
13 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtwebkit-dev', '', d)} \
14"
15
16# Requires Wayland to work 11# Requires Wayland to work
17USE_WAYLAND = " \ 12USE_WAYLAND = " \
18 qtwayland-dev \ 13 qtwayland-dev \
@@ -90,7 +85,6 @@ RDEPENDS_${PN} += " \
90 qttools-staticdev \ 85 qttools-staticdev \
91 qttools-tools \ 86 qttools-tools \
92 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '${USE_WAYLAND}', '', d)} \ 87 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '${USE_WAYLAND}', '', d)} \
93 ${USE_RUBY} \
94 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${USE_X11}', '', d)} \ 88 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${USE_X11}', '', d)} \
95 qtwebsockets-dev \ 89 qtwebsockets-dev \
96 qtwebsockets-mkspecs \ 90 qtwebsockets-mkspecs \