diff options
Diffstat (limited to 'classes')
-rw-r--r-- | classes/cmake_qt5.bbclass | 8 | ||||
-rw-r--r-- | classes/populate_sdk_qt5.bbclass | 4 | ||||
-rw-r--r-- | classes/populate_sdk_qt5_base.bbclass | 2 | ||||
-rw-r--r-- | classes/qmake5.bbclass | 4 | ||||
-rw-r--r-- | classes/qmake5_base.bbclass | 2 | ||||
-rw-r--r-- | classes/qmake5_paths.bbclass | 6 |
6 files changed, 13 insertions, 13 deletions
diff --git a/classes/cmake_qt5.bbclass b/classes/cmake_qt5.bbclass index e380a0ef..6accb819 100644 --- a/classes/cmake_qt5.bbclass +++ b/classes/cmake_qt5.bbclass | |||
@@ -1,12 +1,12 @@ | |||
1 | inherit cmake | 1 | inherit cmake |
2 | inherit qmake5_paths | 2 | inherit qmake5_paths |
3 | 3 | ||
4 | DEPENDS_prepend = "${QTBASEDEPENDS} " | 4 | DEPENDS:prepend = "${QTBASEDEPENDS} " |
5 | QTBASEDEPENDS = "qtbase qtbase-native" | 5 | QTBASEDEPENDS = "qtbase qtbase-native" |
6 | QTBASEDEPENDS_class-native = "qtbase-native" | 6 | QTBASEDEPENDS:class-native = "qtbase-native" |
7 | QTBASEDEPENDS_class-nativesdk = "nativesdk-qtbase qtbase-native" | 7 | QTBASEDEPENDS:class-nativesdk = "nativesdk-qtbase qtbase-native" |
8 | 8 | ||
9 | EXTRA_OECMAKE_prepend = " \ | 9 | EXTRA_OECMAKE:prepend = " \ |
10 | -DOE_QMAKE_PATH_PREFIX=${OE_QMAKE_PATH_PREFIX} \ | 10 | -DOE_QMAKE_PATH_PREFIX=${OE_QMAKE_PATH_PREFIX} \ |
11 | -DOE_QMAKE_PATH_HEADERS=${OE_QMAKE_PATH_HEADERS} \ | 11 | -DOE_QMAKE_PATH_HEADERS=${OE_QMAKE_PATH_HEADERS} \ |
12 | -DOE_QMAKE_PATH_LIBS=${OE_QMAKE_PATH_LIBS} \ | 12 | -DOE_QMAKE_PATH_LIBS=${OE_QMAKE_PATH_LIBS} \ |
diff --git a/classes/populate_sdk_qt5.bbclass b/classes/populate_sdk_qt5.bbclass index a10341dc..e0b287eb 100644 --- a/classes/populate_sdk_qt5.bbclass +++ b/classes/populate_sdk_qt5.bbclass | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | inherit populate_sdk_qt5_base | 3 | inherit populate_sdk_qt5_base |
4 | 4 | ||
5 | TOOLCHAIN_HOST_TASK_append = " nativesdk-packagegroup-qt5-toolchain-host" | 5 | TOOLCHAIN_HOST_TASK:append = " nativesdk-packagegroup-qt5-toolchain-host" |
6 | TOOLCHAIN_TARGET_TASK_append = " packagegroup-qt5-toolchain-target" | 6 | TOOLCHAIN_TARGET_TASK:append = " packagegroup-qt5-toolchain-target" |
7 | 7 | ||
8 | FEATURE_PACKAGES_qtcreator-debug = "packagegroup-qt5-qtcreator-debug" | 8 | FEATURE_PACKAGES_qtcreator-debug = "packagegroup-qt5-qtcreator-debug" |
diff --git a/classes/populate_sdk_qt5_base.bbclass b/classes/populate_sdk_qt5_base.bbclass index c26fee44..56341cd1 100644 --- a/classes/populate_sdk_qt5_base.bbclass +++ b/classes/populate_sdk_qt5_base.bbclass | |||
@@ -1,7 +1,7 @@ | |||
1 | # This allow reuse of Qt paths | 1 | # This allow reuse of Qt paths |
2 | inherit qmake5_paths | 2 | inherit qmake5_paths |
3 | 3 | ||
4 | create_sdk_files_prepend () { | 4 | create_sdk_files:prepend () { |
5 | # Generate a qt.conf file to be deployed with the SDK | 5 | # Generate a qt.conf file to be deployed with the SDK |
6 | qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf | 6 | qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf |
7 | touch $qtconf | 7 | touch $qtconf |
diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass index 1a960e8f..befb5bfd 100644 --- a/classes/qmake5.bbclass +++ b/classes/qmake5.bbclass | |||
@@ -4,7 +4,7 @@ | |||
4 | inherit qmake5_base | 4 | inherit qmake5_base |
5 | 5 | ||
6 | QT5TOOLSDEPENDS ?= "qtbase-native" | 6 | QT5TOOLSDEPENDS ?= "qtbase-native" |
7 | DEPENDS_prepend = "${QT5TOOLSDEPENDS} " | 7 | DEPENDS:prepend = "${QT5TOOLSDEPENDS} " |
8 | 8 | ||
9 | do_configure() { | 9 | do_configure() { |
10 | qmake5_base_do_configure | 10 | qmake5_base_do_configure |
@@ -14,6 +14,6 @@ do_install() { | |||
14 | qmake5_base_do_install | 14 | qmake5_base_do_install |
15 | } | 15 | } |
16 | 16 | ||
17 | do_install_class-native() { | 17 | do_install:class-native() { |
18 | qmake5_base_native_do_install | 18 | qmake5_base_native_do_install |
19 | } | 19 | } |
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 6266c55c..459d2dae 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass | |||
@@ -1,5 +1,5 @@ | |||
1 | # hardcode linux, because that's what 0001-Add-linux-oe-g-platform.patch adds | 1 | # hardcode linux, because that's what 0001-Add-linux-oe-g-platform.patch adds |
2 | XPLATFORM_toolchain-clang = "linux-oe-clang" | 2 | XPLATFORM:toolchain-clang = "linux-oe-clang" |
3 | XPLATFORM ?= "linux-oe-g++" | 3 | XPLATFORM ?= "linux-oe-g++" |
4 | 4 | ||
5 | OE_QMAKE_PLATFORM_NATIVE = "${XPLATFORM}" | 5 | OE_QMAKE_PLATFORM_NATIVE = "${XPLATFORM}" |
diff --git a/classes/qmake5_paths.bbclass b/classes/qmake5_paths.bbclass index ca7e4fc2..abed93b7 100644 --- a/classes/qmake5_paths.bbclass +++ b/classes/qmake5_paths.bbclass | |||
@@ -9,8 +9,8 @@ QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}${QT_DIR_NAME}" | |||
9 | QMAKE_MKSPEC_PATH_TARGET = "${STAGING_LIBDIR}${QT_DIR_NAME}" | 9 | QMAKE_MKSPEC_PATH_TARGET = "${STAGING_LIBDIR}${QT_DIR_NAME}" |
10 | 10 | ||
11 | QMAKE_MKSPEC_PATH = "${QMAKE_MKSPEC_PATH_TARGET}" | 11 | QMAKE_MKSPEC_PATH = "${QMAKE_MKSPEC_PATH_TARGET}" |
12 | QMAKE_MKSPEC_PATH_class-native = "${QMAKE_MKSPEC_PATH_NATIVE}" | 12 | QMAKE_MKSPEC_PATH:class-native = "${QMAKE_MKSPEC_PATH_NATIVE}" |
13 | QMAKE_MKSPEC_PATH_class-nativesdk = "${QMAKE_MKSPEC_PATH_NATIVE}" | 13 | QMAKE_MKSPEC_PATH:class-nativesdk = "${QMAKE_MKSPEC_PATH_NATIVE}" |
14 | 14 | ||
15 | OE_QMAKE_PATH_PREFIX = "${prefix}" | 15 | OE_QMAKE_PATH_PREFIX = "${prefix}" |
16 | OE_QMAKE_PATH_HEADERS = "${includedir}${QT_DIR_NAME}" | 16 | OE_QMAKE_PATH_HEADERS = "${includedir}${QT_DIR_NAME}" |
@@ -27,7 +27,7 @@ OE_QMAKE_PATH_SETTINGS = "${sysconfdir}" | |||
27 | OE_QMAKE_PATH_EXAMPLES = "${datadir}/examples" | 27 | OE_QMAKE_PATH_EXAMPLES = "${datadir}/examples" |
28 | OE_QMAKE_PATH_TESTS = "${datadir}/tests" | 28 | OE_QMAKE_PATH_TESTS = "${datadir}/tests" |
29 | OE_QMAKE_PATH_HOST_PREFIX = "" | 29 | OE_QMAKE_PATH_HOST_PREFIX = "" |
30 | OE_QMAKE_PATH_HOST_PREFIX_class-target = "${STAGING_DIR_NATIVE}" | 30 | OE_QMAKE_PATH_HOST_PREFIX:class-target = "${STAGING_DIR_NATIVE}" |
31 | OE_QMAKE_PATH_HOST_BINS = "${bindir}${QT_DIR_NAME}" | 31 | OE_QMAKE_PATH_HOST_BINS = "${bindir}${QT_DIR_NAME}" |
32 | OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}" | 32 | OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}" |
33 | OE_QMAKE_PATH_HOST_LIBS = "${STAGING_LIBDIR}" | 33 | OE_QMAKE_PATH_HOST_LIBS = "${STAGING_LIBDIR}" |