t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-09 23:54:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Convert to new override syntax

Browse Source 
This is the result of automated script (0.9.0) conversion:

oe-core/scripts/contrib/convert-overrides.py .

converting the metadata to use ":" as the override character instead of "_".

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2021-07-29 17:05:32 +02:00
parent 10f3673fd4
commit a6bee8ea4c
57 changed files with 245 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
classes/cmake_qt5.bbclass
View File

@@ -1,12 +1,12 @@
inherit cmake
inherit qmake5_paths
DEPENDS_prepend = "${QTBASEDEPENDS} "
DEPENDS:prepend = "${QTBASEDEPENDS} "
QTBASEDEPENDS = "qtbase qtbase-native"
QTBASEDEPENDS_class-native = "qtbase-native"
QTBASEDEPENDS_class-nativesdk = "nativesdk-qtbase qtbase-native"
QTBASEDEPENDS:class-native = "qtbase-native"
QTBASEDEPENDS:class-nativesdk = "nativesdk-qtbase qtbase-native"
EXTRA_OECMAKE_prepend = " \
EXTRA_OECMAKE:prepend = " \
-DOE_QMAKE_PATH_PREFIX=${OE_QMAKE_PATH_PREFIX} \
-DOE_QMAKE_PATH_HEADERS=${OE_QMAKE_PATH_HEADERS} \
-DOE_QMAKE_PATH_LIBS=${OE_QMAKE_PATH_LIBS} \

4
classes/populate_sdk_qt5.bbclass
View File

@@ -2,7 +2,7 @@
inherit populate_sdk_qt5_base
TOOLCHAIN_HOST_TASK_append = " nativesdk-packagegroup-qt5-toolchain-host"
TOOLCHAIN_TARGET_TASK_append = " packagegroup-qt5-toolchain-target"
TOOLCHAIN_HOST_TASK:append = " nativesdk-packagegroup-qt5-toolchain-host"
TOOLCHAIN_TARGET_TASK:append = " packagegroup-qt5-toolchain-target"
FEATURE_PACKAGES_qtcreator-debug = "packagegroup-qt5-qtcreator-debug"

2
classes/populate_sdk_qt5_base.bbclass
View File

@@ -1,7 +1,7 @@
# This allow reuse of Qt paths
inherit qmake5_paths
create_sdk_files_prepend () {
create_sdk_files:prepend () {
# Generate a qt.conf file to be deployed with the SDK
qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf
touch $qtconf

4
classes/qmake5.bbclass
View File

@@ -4,7 +4,7 @@
inherit qmake5_base
QT5TOOLSDEPENDS ?= "qtbase-native"
DEPENDS_prepend = "${QT5TOOLSDEPENDS} "
DEPENDS:prepend = "${QT5TOOLSDEPENDS} "
do_configure() {
qmake5_base_do_configure
@@ -14,6 +14,6 @@ do_install() {
qmake5_base_do_install
}
do_install_class-native() {
do_install:class-native() {
qmake5_base_native_do_install
}

2
classes/qmake5_base.bbclass
View File

@@ -1,5 +1,5 @@
# hardcode linux, because that's what 0001-Add-linux-oe-g-platform.patch adds
XPLATFORM_toolchain-clang = "linux-oe-clang"
XPLATFORM:toolchain-clang = "linux-oe-clang"
XPLATFORM ?= "linux-oe-g++"
OE_QMAKE_PLATFORM_NATIVE = "${XPLATFORM}"

6
classes/qmake5_paths.bbclass
View File

@@ -9,8 +9,8 @@ QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}${QT_DIR_NAME}"
QMAKE_MKSPEC_PATH_TARGET = "${STAGING_LIBDIR}${QT_DIR_NAME}"
QMAKE_MKSPEC_PATH = "${QMAKE_MKSPEC_PATH_TARGET}"
QMAKE_MKSPEC_PATH_class-native = "${QMAKE_MKSPEC_PATH_NATIVE}"
QMAKE_MKSPEC_PATH_class-nativesdk = "${QMAKE_MKSPEC_PATH_NATIVE}"
QMAKE_MKSPEC_PATH:class-native = "${QMAKE_MKSPEC_PATH_NATIVE}"
QMAKE_MKSPEC_PATH:class-nativesdk = "${QMAKE_MKSPEC_PATH_NATIVE}"
OE_QMAKE_PATH_PREFIX = "${prefix}"
OE_QMAKE_PATH_HEADERS = "${includedir}${QT_DIR_NAME}"
@@ -27,7 +27,7 @@ OE_QMAKE_PATH_SETTINGS = "${sysconfdir}"
OE_QMAKE_PATH_EXAMPLES = "${datadir}/examples"
OE_QMAKE_PATH_TESTS = "${datadir}/tests"
OE_QMAKE_PATH_HOST_PREFIX = ""
OE_QMAKE_PATH_HOST_PREFIX_class-target = "${STAGING_DIR_NATIVE}"
OE_QMAKE_PATH_HOST_PREFIX:class-target = "${STAGING_DIR_NATIVE}"
OE_QMAKE_PATH_HOST_BINS = "${bindir}${QT_DIR_NAME}"
OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}"
OE_QMAKE_PATH_HOST_LIBS = "${STAGING_LIBDIR}"