diff options
Diffstat (limited to 'meta/recipes-qt')
| -rw-r--r-- | meta/recipes-qt/meta/meta-toolchain-qte.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/files/qt-dbus-const.patch | 2 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb (renamed from meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb) | 0 | ||||
| -rw-r--r-- | meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb | 7 | ||||
| -rw-r--r-- | meta/recipes-qt/tasks/task-qte-toolchain-host-nativesdk.bb | 7 |
5 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-qt/meta/meta-toolchain-qte.bb b/meta/recipes-qt/meta/meta-toolchain-qte.bb index 735ccd10ab..116db914a1 100644 --- a/meta/recipes-qt/meta/meta-toolchain-qte.bb +++ b/meta/recipes-qt/meta/meta-toolchain-qte.bb @@ -1,6 +1,6 @@ # Qt Embedded toolchain PR = "r5" -TOOLCHAIN_HOST_TASK = "task-qte-toolchain-host-nativesdk task-cross-canadian-${TRANSLATED_TARGET_ARCH}" +TOOLCHAIN_HOST_TASK = "nativesdk-task-qte-toolchain-host task-cross-canadian-${TRANSLATED_TARGET_ARCH}" TOOLCHAIN_TARGET_TASK = "task-qte-toolchain-target" TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-qte-${DISTRO_VERSION}" diff --git a/meta/recipes-qt/qt4/files/qt-dbus-const.patch b/meta/recipes-qt/qt4/files/qt-dbus-const.patch index f3de77e3e6..6ee402fdc1 100644 --- a/meta/recipes-qt/qt4/files/qt-dbus-const.patch +++ b/meta/recipes-qt/qt4/files/qt-dbus-const.patch @@ -1,4 +1,4 @@ -Remove "const" usage that causes compile failure building qt4-tools-nativesdk +Remove "const" usage that causes compile failure building nativesdk-qt4-tools Upstream-Status: Denied [possible retry] diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb index e17a8ad808..e17a8ad808 100644 --- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.1.bb +++ b/meta/recipes-qt/qt4/nativesdk-qt4-tools_4.8.1.bb diff --git a/meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb b/meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb new file mode 100644 index 0000000000..5098d11388 --- /dev/null +++ b/meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb @@ -0,0 +1,7 @@ +require recipes-core/tasks/nativesdk-task-sdk-host.bb + +DESCRIPTION = "Host packages for Qt Embedded SDK" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +RDEPENDS_${PN} += "nativesdk-qt4-tools" diff --git a/meta/recipes-qt/tasks/task-qte-toolchain-host-nativesdk.bb b/meta/recipes-qt/tasks/task-qte-toolchain-host-nativesdk.bb deleted file mode 100644 index cfa45ef939..0000000000 --- a/meta/recipes-qt/tasks/task-qte-toolchain-host-nativesdk.bb +++ /dev/null @@ -1,7 +0,0 @@ -require recipes-core/tasks/task-sdk-host-nativesdk.bb - -DESCRIPTION = "Host packages for Qt Embedded SDK" -LICENSE = "MIT" -ALLOW_EMPTY = "1" - -RDEPENDS_${PN} += "qt4-tools-nativesdk" |