1 files changed, 15 insertions, 5 deletions

diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc
index d9cc4870..0f196e4e 100644
--- a/recipes-qt/qt5/qtbase-native.inc
+++ b/recipes-qt/qt5/qtbase-native.inc
@@ -15,6 +15,7 @@ QT_DIR_NAME ?= "qt5"
 SRC_URI += " \
   file://0001-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
   file://0001-Always-build-uic.patch \
+  file://qmake.conf \
 "
 
 EXTRA_ENV = 'MAKE="make -e ${PARALLEL_MAKE}"'
@@ -56,6 +57,20 @@ EXTRA_OECONF = " \
   -no-rpath \
 "
 
+# qtbase is exception, we need to use mkspecs from ${S}
+QMAKE_MKSPEC_PATH_NATIVE = "${S}/mkspecs"
+
+do_configure_prepend() {
+    if [ ! -e ${OE_QMAKESPEC} ]; then
+        mkdir -p ${OE_QMAKESPEC}
+    fi
+    # use default qplatformdefs.h from linux-g++
+    cp -va ${QMAKE_MKSPEC_PATH_NATIVE}/linux-g++/qplatformdefs.h ${OE_QMAKESPEC}/
+    # use modified qmake.conf which is using OE_QMAKE_* shell variables
+    # exported from qmake5_base.bbclass to define toolchain and flags
+    cp -va ${WORKDIR}/qmake.conf ${OE_QMAKESPEC}/
+}
+
 do_configure() {
         # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++)
         unset LD
@@ -65,9 +80,4 @@ do_configure() {
 
 do_install() {
         oe_runmake install INSTALL_ROOT=${D}
-        ln -sf linux-g++ ${D}${datadir}/${QT_DIR_NAME}/mkspecs/${BUILD_OS}-oe-g++
-
-        # replace common files with our version
-        cp -f ${WORKDIR}/g++.conf ${D}${datadir}/${QT_DIR_NAME}/mkspecs/common/g++-unix.conf
-        cp -f ${WORKDIR}/linux.conf ${D}${datadir}/${QT_DIR_NAME}/mkspecs/common/linux.conf
 }