5 files changed, 19 insertions, 28 deletions

diff --git a/recipes-qt/meta/b2qt-sdk.inc b/classes/populate_b2qt_qt5_sdk.bbclass
index 4a3a00b..78ad457 100644
--- a/recipes-qt/meta/b2qt-sdk.inc
+++ b/classes/populate_b2qt_qt5_sdk.bbclass
@@ -20,27 +20,26 @@
 ##
 #############################################################################
 
-LICENSE = "QtEnterprise"
-LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9"
-
 inherit populate_b2qt_sdk populate_sdk_qt5_base
 
-SRC_URI = " \
-    file://qmake.conf \
-    file://qplatformdefs.h \
-    "
-S = "${WORKDIR}"
-
 SDK_MKSPEC_DIR = "${SDK_OUTPUT}${SDKTARGETSYSROOT}${libdir}/${QT_DIR_NAME}/mkspecs"
 SDK_MKSPEC = "devices/linux-oe-generic-g++"
 SDK_DEVICE_PRI = "${SDK_MKSPEC_DIR}/qdevice.pri"
 SDK_DYNAMIC_FLAGS = "-O. -pipe -g"
 
 create_sdk_files_append () {
-    # Install the toolchain user's generic device mkspec
+    # Create the toolchain user's generic device mkspec
     install -d ${SDK_MKSPEC_DIR}/${SDK_MKSPEC}
-    install -m 0644 ${WORKDIR}/qmake.conf ${SDK_MKSPEC_DIR}/${SDK_MKSPEC}
-    install -m 0644 ${WORKDIR}/qplatformdefs.h ${SDK_MKSPEC_DIR}/${SDK_MKSPEC}
+    cat > ${SDK_MKSPEC_DIR}/${SDK_MKSPEC}/qmake.conf <<EOF
+include(../common/linux_device_pre.conf)
+exists(../../oe-device-extra.pri):include(../../oe-device-extra.pri)
+include(../common/linux_device_post.conf)
+load(qt_config)
+EOF
+
+    cat > ${SDK_MKSPEC_DIR}/${SDK_MKSPEC}/qplatformdefs.h <<EOF
+#include "../../linux-g++/qplatformdefs.h"
+EOF
 
     # Fill in the qdevice.pri file which will be used by the device mksspec
     static_cflags="${TARGET_CFLAGS}"
diff --git a/recipes-qt/meta/files/qmake.conf b/recipes-qt/meta/files/qmake.conf
deleted file mode 100644
index b5962dc..0000000
--- a/recipes-qt/meta/files/qmake.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# qmake configuration for using yocto-built b2qt toolchain
-#
-
-include(../common/linux_device_pre.conf)
-
-# Load device-specific qmake.conf part, if any
-exists(../../oe-device-extra.pri):include(../../oe-device-extra.pri)
-
-include(../common/linux_device_post.conf)
-
-load(qt_config)
diff --git a/recipes-qt/meta/files/qplatformdefs.h b/recipes-qt/meta/files/qplatformdefs.h
deleted file mode 100644
index e10ebcf..0000000
--- a/recipes-qt/meta/files/qplatformdefs.h
+++ /dev/null
@@ -1,2 +0,0 @@
-
-#include "../../linux-g++/qplatformdefs.h"
diff --git a/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb b/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb
index 6b95276..124adbe 100644
--- a/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb
+++ b/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb
@@ -22,7 +22,10 @@
 
 DESCRIPTION = "B2Qt embedded Qt5 SDK toolchain"
 
-require b2qt-sdk.inc
+LICENSE = "QtEnterprise"
+LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9"
+
+inherit populate_b2qt_qt5_sdk
 
 TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host"
 TOOLCHAIN_TARGET_TASK += "packagegroup-b2qt-embedded-qt5-toolchain-target \
diff --git a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
index 43f29b3..eb114cd 100644
--- a/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
+++ b/recipes-qt/meta/meta-toolchain-b2qt-embedded-qt5-sdk.bb
@@ -22,7 +22,10 @@
 
 DESCRIPTION = "B2Qt embedded Qt5 SDK toolchain"
 
-require b2qt-sdk.inc
+LICENSE = "QtEnterprise"
+LIC_FILES_CHKSUM = "file://${QT_LICENCE};md5=7bc9c54e450006250a60e96604c186c9"
+
+inherit populate_b2qt_qt5_sdk
 
 TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host"
 TOOLCHAIN_TARGET_TASK += "packagegroup-b2qt-embedded-qt5-toolchain-target"