summaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
Diffstat (limited to 'classes')
-rw-r--r--classes/cmake_qt5.bbclass8
-rw-r--r--classes/populate_sdk_qt5.bbclass4
-rw-r--r--classes/populate_sdk_qt5_base.bbclass2
-rw-r--r--classes/qmake5.bbclass4
-rw-r--r--classes/qmake5_base.bbclass2
-rw-r--r--classes/qmake5_paths.bbclass6
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 @@
1inherit cmake 1inherit cmake
2inherit qmake5_paths 2inherit qmake5_paths
3 3
4DEPENDS_prepend = "${QTBASEDEPENDS} " 4DEPENDS:prepend = "${QTBASEDEPENDS} "
5QTBASEDEPENDS = "qtbase qtbase-native" 5QTBASEDEPENDS = "qtbase qtbase-native"
6QTBASEDEPENDS_class-native = "qtbase-native" 6QTBASEDEPENDS:class-native = "qtbase-native"
7QTBASEDEPENDS_class-nativesdk = "nativesdk-qtbase qtbase-native" 7QTBASEDEPENDS:class-nativesdk = "nativesdk-qtbase qtbase-native"
8 8
9EXTRA_OECMAKE_prepend = " \ 9EXTRA_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
3inherit populate_sdk_qt5_base 3inherit populate_sdk_qt5_base
4 4
5TOOLCHAIN_HOST_TASK_append = " nativesdk-packagegroup-qt5-toolchain-host" 5TOOLCHAIN_HOST_TASK:append = " nativesdk-packagegroup-qt5-toolchain-host"
6TOOLCHAIN_TARGET_TASK_append = " packagegroup-qt5-toolchain-target" 6TOOLCHAIN_TARGET_TASK:append = " packagegroup-qt5-toolchain-target"
7 7
8FEATURE_PACKAGES_qtcreator-debug = "packagegroup-qt5-qtcreator-debug" 8FEATURE_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
2inherit qmake5_paths 2inherit qmake5_paths
3 3
4create_sdk_files_prepend () { 4create_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 @@
4inherit qmake5_base 4inherit qmake5_base
5 5
6QT5TOOLSDEPENDS ?= "qtbase-native" 6QT5TOOLSDEPENDS ?= "qtbase-native"
7DEPENDS_prepend = "${QT5TOOLSDEPENDS} " 7DEPENDS:prepend = "${QT5TOOLSDEPENDS} "
8 8
9do_configure() { 9do_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
17do_install_class-native() { 17do_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
2XPLATFORM_toolchain-clang = "linux-oe-clang" 2XPLATFORM:toolchain-clang = "linux-oe-clang"
3XPLATFORM ?= "linux-oe-g++" 3XPLATFORM ?= "linux-oe-g++"
4 4
5OE_QMAKE_PLATFORM_NATIVE = "${XPLATFORM}" 5OE_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}"
9QMAKE_MKSPEC_PATH_TARGET = "${STAGING_LIBDIR}${QT_DIR_NAME}" 9QMAKE_MKSPEC_PATH_TARGET = "${STAGING_LIBDIR}${QT_DIR_NAME}"
10 10
11QMAKE_MKSPEC_PATH = "${QMAKE_MKSPEC_PATH_TARGET}" 11QMAKE_MKSPEC_PATH = "${QMAKE_MKSPEC_PATH_TARGET}"
12QMAKE_MKSPEC_PATH_class-native = "${QMAKE_MKSPEC_PATH_NATIVE}" 12QMAKE_MKSPEC_PATH:class-native = "${QMAKE_MKSPEC_PATH_NATIVE}"
13QMAKE_MKSPEC_PATH_class-nativesdk = "${QMAKE_MKSPEC_PATH_NATIVE}" 13QMAKE_MKSPEC_PATH:class-nativesdk = "${QMAKE_MKSPEC_PATH_NATIVE}"
14 14
15OE_QMAKE_PATH_PREFIX = "${prefix}" 15OE_QMAKE_PATH_PREFIX = "${prefix}"
16OE_QMAKE_PATH_HEADERS = "${includedir}${QT_DIR_NAME}" 16OE_QMAKE_PATH_HEADERS = "${includedir}${QT_DIR_NAME}"
@@ -27,7 +27,7 @@ OE_QMAKE_PATH_SETTINGS = "${sysconfdir}"
27OE_QMAKE_PATH_EXAMPLES = "${datadir}/examples" 27OE_QMAKE_PATH_EXAMPLES = "${datadir}/examples"
28OE_QMAKE_PATH_TESTS = "${datadir}/tests" 28OE_QMAKE_PATH_TESTS = "${datadir}/tests"
29OE_QMAKE_PATH_HOST_PREFIX = "" 29OE_QMAKE_PATH_HOST_PREFIX = ""
30OE_QMAKE_PATH_HOST_PREFIX_class-target = "${STAGING_DIR_NATIVE}" 30OE_QMAKE_PATH_HOST_PREFIX:class-target = "${STAGING_DIR_NATIVE}"
31OE_QMAKE_PATH_HOST_BINS = "${bindir}${QT_DIR_NAME}" 31OE_QMAKE_PATH_HOST_BINS = "${bindir}${QT_DIR_NAME}"
32OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}" 32OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}"
33OE_QMAKE_PATH_HOST_LIBS = "${STAGING_LIBDIR}" 33OE_QMAKE_PATH_HOST_LIBS = "${STAGING_LIBDIR}"