diff options
-rw-r--r-- | classes/qmake5_base.bbclass | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index c91f7bd1..ba13242c 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass | |||
@@ -1,6 +1,8 @@ | |||
1 | QMAKE_MKSPEC_PATH ?= "${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs" | 1 | QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/mkspecs" |
2 | OE_QMAKE_PLATFORM_NATIVE = "${BUILD_OS}-oe-g++" | ||
3 | |||
4 | QMAKE_MKSPEC_PATH = "${STAGING_DATADIR}/${QT_DIR_NAME}/mkspecs" | ||
2 | OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++" | 5 | OE_QMAKE_PLATFORM = "${TARGET_OS}-oe-g++" |
3 | QMAKESPEC := "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}" | ||
4 | 6 | ||
5 | EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'" | 7 | EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'" |
6 | 8 | ||
@@ -13,7 +15,8 @@ EXTRA_ENV = 'QMAKE="${OE_QMAKE_QMAKE} -d -after \ | |||
13 | RCC="${OE_QMAKE_RCC}" \ | 15 | RCC="${OE_QMAKE_RCC}" \ |
14 | MAKE="make -e ${PARALLEL_MAKE}"' | 16 | MAKE="make -e ${PARALLEL_MAKE}"' |
15 | 17 | ||
16 | export QMAKESPEC = "${QMAKE_MKSPEC_PATH}/${TARGET_OS}-oe-g++" | 18 | export OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/${OE_QMAKE_PLATFORM_NATIVE}" |
19 | export OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/${OE_QMAKE_PLATFORM}" | ||
17 | export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake" | 20 | export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake" |
18 | export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/uic" | 21 | export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/uic" |
19 | export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/moc" | 22 | export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/moc" |