qtivi: enable ivigenerator for toolchain

Fix yocto build issues with nativesdk-qtivi and include
the ivigenerator to the toolchain.

ivigenerator is disabled for mingw build since it is using
the prebuild python binaries and doesn't work with virtualenv.

Task-number: AUTOSUITE-176
Change-Id: I4765652919649f4aafeb723127b0e75194325f92
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>

2 files changed, 6 insertions, 0 deletions

diff --git a/recipes-qt/automotive/qtivi_git.bb b/recipes-qt/automotive/qtivi_git.bb
index de12d54..f422b15 100644
--- a/recipes-qt/automotive/qtivi_git.bb
+++ b/recipes-qt/automotive/qtivi_git.bb
@@ -68,6 +68,9 @@ PACKAGECONFIG[simulator-native] = "QMAKE_EXTRA_ARGS+=-feature-simulator QMAKE_EX
 
 PACKAGECONFIG_class-native ??= "host-tools-only ivigenerator-native"
 PACKAGECONFIG_class-nativesdk ??= "${PACKAGECONFIG_class-native}"
+PACKAGECONFIG_class-nativesdk_mingw32 ??= "host-tools-only"
+
+ALLOW_EMPTY_${PN}-tools = "1"
 
 EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS} ${@bb.utils.contains_any('PACKAGECONFIG', 'ivigenerator ivigenerator-native', '', 'QMAKE_EXTRA_ARGS+=-no-ivigenerator', d)}"
 
@@ -90,3 +93,5 @@ do_install_prepend() {
 BBCLASSEXTEND += "native nativesdk"
 
 INSANE_SKIP_${PN}_class-native = "already-stripped"
+INSANE_SKIP_${PN}_class-nativesdk = "already-stripped"
+INSANE_SKIP_${PN}-tools_class-nativesdk = "staticdev"
diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb
index acae372..1ba6d97 100644
--- a/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb
+++ b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb
@@ -36,4 +36,5 @@ inherit nativesdk packagegroup qtquickcompiler
 RDEPENDS_${PN} += "\
     nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host \
     nativesdk-qtapplicationmanager-tools \
+    nativesdk-qtivi-tools \
     "