1 files changed, 28 insertions, 23 deletions

diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc
index d601d2ce..06320aae 100644
--- a/recipes-qt/qt5/qtbase-native.inc
+++ b/recipes-qt/qt5/qtbase-native.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://qt-project.org"
 
 INC_PR = "r1"
 
-inherit native
+inherit native qmake5_base
 
 QT_MODULE = "qtbase"
 
@@ -13,18 +13,30 @@ SSTATE_SCAN_FILES += "*.pri *.prl"
 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 \
+    file://0001-Add-linux-oe-g-platform.patch \
+    file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
+    file://0003-Add-external-hostbindir-option.patch \
+    file://0006-qt_functions-temporary-remove-isEmpty-check.patch \
 "
 
+SEPB = "${WORKDIR}/build"
+B = "${SEPB}"
+
 EXTRA_ENV = 'MAKE="make -e ${PARALLEL_MAKE}"'
 EXTRA_OEMAKE = " MAKEFLAGS='${PARALLEL_MAKE}'"
 
+QT_CONF_PATH = "${B}/qt.conf"
+
+do_generate_qt_config_file() {
+    :
+#    echo >> ${WORKDIR}/qt.conf
+}
+
+#-dont-process 
 EXTRA_OECONF = " \
     -prefix ${prefix} \
-    -L ${STAGING_LIBDIR_NATIVE} \
-    -I ${STAGING_INCDIR_NATIVE} \
+    -sysroot ${STAGING_DIR_NATIVE} \
+    -no-gcc-sysroot \
     -system-zlib \
     -no-libjpeg \
     -no-libpng \
@@ -39,15 +51,14 @@ EXTRA_OECONF = " \
     -no-opengl \
     -no-openssl \
     -no-xcb \
-    -verbose -release \
+    -verbose \
+    -release \
     -prefix ${prefix} \
     -bindir ${bindir}/${QT_DIR_NAME} \
     -headerdir ${includedir}/${QT_DIR_NAME} \
     -archdatadir ${libdir}/${QT_DIR_NAME} \
     -datadir ${datadir}/${QT_DIR_NAME} \
     -docdir ${docdir}/${QT_DIR_NAME} \
-    -hostdatadir ${datadir}/${QT_DIR_NAME} \
-    -hostbindir ${bindir}/${QT_DIR_NAME} \
     -no-glib \
     -no-iconv \
     -silent \
@@ -55,27 +66,21 @@ EXTRA_OECONF = " \
     -nomake tests \
     -nomake demos \
     -no-rpath \
+    -platform linux-oe-g++ \
 "
 
-# 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}/
-}
+    # Similar logic is in autotools.bbclass
+    if [ -d ${B} -a "${S}" != "${B}" ] ; then
+        # Existing separate build directory, exists, remove
+        rm -rf "${B}/*"
+    fi  
 
-do_configure() {
     # Avoid setting QMAKE_LINK from LD (since we want the linker to be g++)
     unset LD
 
-    (echo o; echo yes) | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+    (echo o; echo yes) | ${S}/configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+#    bin/qmake -r -d ${S} || die "Configuring qt with qmake failed. EXTRA_OECONF was ${EXTRA_OECONF}"
 }
 
 do_install() {