summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/images/qt4e-demo-image.bb6
-rw-r--r--meta/recipes-qt/meta/meta-toolchain-qte.bb4
-rw-r--r--meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb (renamed from meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb)2
-rw-r--r--meta/recipes-qt/packagegroups/packagegroup-core-qt.bb (renamed from meta/recipes-qt/tasks/task-core-qt.bb)8
-rw-r--r--meta/recipes-qt/packagegroups/packagegroup-qt4e.bb (renamed from meta/recipes-qt/tasks/task-qt4e.bb)2
-rw-r--r--meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb (renamed from meta/recipes-qt/tasks/task-qte-toolchain-target.bb)2
6 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-qt/images/qt4e-demo-image.bb b/meta/recipes-qt/images/qt4e-demo-image.bb
index 8f9478d961..205c912168 100644
--- a/meta/recipes-qt/images/qt4e-demo-image.bb
+++ b/meta/recipes-qt/images/qt4e-demo-image.bb
@@ -5,15 +5,15 @@ PR="r2"
5LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 5LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
6 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 6 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
7 7
8DEPENDS += "task-qt4e" 8DEPENDS += "packagegroup-qt4e"
9 9
10RDEPENDS_${PN} += " \ 10RDEPENDS_${PN} += " \
11 task-qt4e-base \ 11 packagegroup-qt4e-base \
12 " 12 "
13 13
14IMAGE_INSTALL += "\ 14IMAGE_INSTALL += "\
15 ${CORE_IMAGE_BASE_INSTALL} \ 15 ${CORE_IMAGE_BASE_INSTALL} \
16 task-qt4e-base \ 16 packagegroup-qt4e-base \
17" 17"
18 18
19inherit core-image 19inherit core-image
diff --git a/meta/recipes-qt/meta/meta-toolchain-qte.bb b/meta/recipes-qt/meta/meta-toolchain-qte.bb
index 116db914a1..20dd354e17 100644
--- a/meta/recipes-qt/meta/meta-toolchain-qte.bb
+++ b/meta/recipes-qt/meta/meta-toolchain-qte.bb
@@ -1,7 +1,7 @@
1# Qt Embedded toolchain 1# Qt Embedded toolchain
2PR = "r5" 2PR = "r5"
3TOOLCHAIN_HOST_TASK = "nativesdk-task-qte-toolchain-host task-cross-canadian-${TRANSLATED_TARGET_ARCH}" 3TOOLCHAIN_HOST_TASK = "nativesdk-packagegroup-qte-toolchain-host packagegroup-cross-canadian-${TRANSLATED_TARGET_ARCH}"
4TOOLCHAIN_TARGET_TASK = "task-qte-toolchain-target" 4TOOLCHAIN_TARGET_TASK = "packagegroup-qte-toolchain-target"
5TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-qte-${DISTRO_VERSION}" 5TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-qte-${DISTRO_VERSION}"
6 6
7require recipes-core/meta/meta-toolchain.bb 7require recipes-core/meta/meta-toolchain.bb
diff --git a/meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb b/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb
index 5098d11388..1c53a9ce2a 100644
--- a/meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb
+++ b/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb
@@ -1,4 +1,4 @@
1require recipes-core/tasks/nativesdk-task-sdk-host.bb 1require recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
2 2
3DESCRIPTION = "Host packages for Qt Embedded SDK" 3DESCRIPTION = "Host packages for Qt Embedded SDK"
4LICENSE = "MIT" 4LICENSE = "MIT"
diff --git a/meta/recipes-qt/tasks/task-core-qt.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
index 69512a4b9f..4fe07c654e 100644
--- a/meta/recipes-qt/tasks/task-core-qt.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
@@ -9,9 +9,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
9PR = "r3" 9PR = "r3"
10 10
11PACKAGES = "\ 11PACKAGES = "\
12 task-core-qt-demos \ 12 packagegroup-core-qt-demos \
13 task-core-qt-demos-dbg \ 13 packagegroup-core-qt-demos-dbg \
14 task-core-qt-demos-dev \ 14 packagegroup-core-qt-demos-dev \
15 " 15 "
16 16
17ALLOW_EMPTY = "1" 17ALLOW_EMPTY = "1"
@@ -19,4 +19,4 @@ ALLOW_EMPTY = "1"
19QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall" 19QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall"
20#QTDEMOS_disabled = "fotowall" 20#QTDEMOS_disabled = "fotowall"
21 21
22RDEPENDS_task-core-qt-demos = "${QTDEMOS}" 22RDEPENDS_packagegroup-core-qt-demos = "${QTDEMOS}"
diff --git a/meta/recipes-qt/tasks/task-qt4e.bb b/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb
index c95c898538..4b6d6a70c1 100644
--- a/meta/recipes-qt/tasks/task-qt4e.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb
@@ -5,7 +5,7 @@ LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 5LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
6 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 6 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
7 7
8inherit task 8inherit packagegroup
9 9
10TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' 10TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
11 11
diff --git a/meta/recipes-qt/tasks/task-qte-toolchain-target.bb b/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb
index 7ee575f2eb..abd6a1fcbe 100644
--- a/meta/recipes-qt/tasks/task-qte-toolchain-target.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
9 9
10RDEPENDS_${PN} += " \ 10RDEPENDS_${PN} += " \
11 task-core-standalone-sdk-target \ 11 packagegroup-core-standalone-sdk-target \
12 qt4-embedded-mkspecs \ 12 qt4-embedded-mkspecs \
13 libqt-embeddedmultimedia4-dev \ 13 libqt-embeddedmultimedia4-dev \
14 libqt-embeddedphonon4-dev \ 14 libqt-embeddedphonon4-dev \