diff mbox

[qt] qt5module: fix building modules

Message ID CFDF955F78BEAB47A018765A600E2BDC938F0596@VMPREVAS1.prevas.se
State Accepted
Delegated to: Christian Sørensen
Headers show

Commit Message

christian.braunersorensen@prevas.dk July 25, 2014, 10:26 a.m. UTC 
Hi Jacob

Thanks for the patch!

I did not merge your patch as shown below. 
Instead I took the liberty to set the QMAKE path correct in the qmake5_base.oeclass.

By doing so, it was only needed to set the HOST_BIN_PATH in the qt5module class.

/Christian
diff mbox

Patch

diff --git a/classes/qmake5_base.oeclass b/classes/qmake5_base.oeclass
index 5bc497f..25f6fbe 100644
--- a/classes/qmake5_base.oeclass
+++ b/classes/qmake5_base.oeclass
@@ -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}"
diff --git a/classes/qt5module.oeclass b/classes/qt5module.oeclass
index dbbb44c..8575a41 100644
--- a/classes/qt5module.oeclass
+++ b/classes/qt5module.oeclass
@@ -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 \