@@ -38,7 +38,7 @@ EXTRA_OEMAKE = " \
OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/mkspecs/${OE_QMAKE_PLATFORM_NATIVE}"
OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/mkspecs/${OE_QMAKE_PLATFORM}"
-OE_QMAKE_QMAKE = "${STAGE_DIR}/native/bin/${QT_DIR_NAME}/qmake"
+OE_QMAKE_QMAKE ?= "${STAGE_DIR}/native/bin/${QT_DIR_NAME}/qmake"
OE_QMAKE_COMPILER = "${CC}"
OE_QMAKE_CC = "${CC}"
OE_QMAKE_CFLAGS = "${CFLAGS}"
@@ -70,8 +70,8 @@ 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_BINS = "${bindir}"
-OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}"
+OE_QMAKE_PATH_HOST_BINS ?= "${bindir}"
+OE_QMAKE_PATH_HOST_DATA ?= "${QMAKE_MKSPEC_PATH_TARGET}"
OE_QMAKE_PATH_QT_HEADERS = "${includedir}/${QT_DIR_NAME}"
OE_QMAKE_PATH_QT_ARCHDATA = "${libdir}/${QT_DIR_NAME}"
@@ -3,7 +3,10 @@
## Setups everything needed for compilation of qt5 modules.
inherit c++ make qmake5 pkgconfig
-OE_QMAKE_PATH_HOST_BINS = "${STAGE_DIR}/native/bin/${QT_DIR_NAME}"
+
+OE_QMAKE_PATH_HOST_BINS = "${STAGE_DIR}/native/bin/"
+OE_QMAKE_QMAKE = "${STAGE_DIR}/native/bin/qmake"
+
CLASS_DEPENDS += "\
qtbase-dev zlib-dev libpthread \
libdl libz librt libpng-dev libpng \
From: Jacob Kjaergaard <jacob.kjaergaard@prevas.dk> --- classes/qmake5_base.oeclass | 6 +++--- classes/qt5module.oeclass | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-)