Index: conf/distro/ely.conf
===================================================================
diff -u -r780802b79d587d5c384b44a1489890e7dac36342 -rdead01d367e57cf8933701fb1c2c5ca465085582
--- conf/distro/ely.conf	(.../ely.conf)	(revision 780802b79d587d5c384b44a1489890e7dac36342)
+++ conf/distro/ely.conf	(.../ely.conf)	(revision dead01d367e57cf8933701fb1c2c5ca465085582)
@@ -78,7 +78,8 @@
 SDKPATHINSTALL = "/opt/${DISTRO}/${SDK_VERSION}/${MACHINE}"
 
 # Some packages need this (e.g. gstreamer1.0-plugins-ugly)
-LICENSE_FLAGS_ACCEPTED += "commercial"
+# LICENSE_FLAGS_ACCEPTED += "commercial"
+QT_EDITION = "commercial"
 
 # Use systemd init manager by default
 INIT_MANAGER = "systemd"
Index: recipes-bsp/manufacturing/leahi-manufacturing_1.0.bb
===================================================================
diff -u -r29253527e92266ba3d86f7bf7342defafea209e2 -rdead01d367e57cf8933701fb1c2c5ca465085582
--- recipes-bsp/manufacturing/leahi-manufacturing_1.0.bb	(.../leahi-manufacturing_1.0.bb)	(revision 29253527e92266ba3d86f7bf7342defafea209e2)
+++ recipes-bsp/manufacturing/leahi-manufacturing_1.0.bb	(.../leahi-manufacturing_1.0.bb)	(revision dead01d367e57cf8933701fb1c2c5ca465085582)
@@ -9,6 +9,7 @@
 
 # the cloned repo is located in the ${WORKDIR}/git/UI/<BETA>
 S = "${WORKDIR}/git/UI/${BUILD_VARIANT}"
+#S = "${WORKDIR}/git/UI/BETA"
 
 # Optionally, you can specify a specific tag or branch to use
 # PV = "1.0+git${SRCPV}"
@@ -21,6 +22,7 @@
 # 1 - get files from git repository
 do_install() {
     bbplain    " ---------- Leahi: Install : <${BUILD_VARIANT}>"
+    #bbplain    " ---------- Leahi: Install : <BETA>"
     # build the required folders
     install -d                              ${D}/opt/leahi
     install -d                              ${D}/opt/leahi/scripts
@@ -66,4 +68,5 @@
     qtdeclarative       \
     qtquickcontrols     \
     qtcharts            \
+    qtscxml		\
 "
Index: recipes-core/images/ely-image-qt.bb
===================================================================
diff -u -r780802b79d587d5c384b44a1489890e7dac36342 -rdead01d367e57cf8933701fb1c2c5ca465085582
--- recipes-core/images/ely-image-qt.bb	(.../ely-image-qt.bb)	(revision 780802b79d587d5c384b44a1489890e7dac36342)
+++ recipes-core/images/ely-image-qt.bb	(.../ely-image-qt.bb)	(revision dead01d367e57cf8933701fb1c2c5ca465085582)
@@ -42,6 +42,7 @@
         nano                    \
         htop                    \
         can-utils               \
+        kmod                    \
 "
 
 # Packages List - Addition
@@ -69,6 +70,7 @@
     qtquickcontrols2            \
     qtvirtualkeyboard           \
     qtgraphicaleffects          \
+    qtscxml                     \
 "
 
 IMAGE_INSTALL += "              \
@@ -96,6 +98,7 @@
 inherit core-image
 inherit dey-image
 inherit features_check
+inherit populate_sdk_qt5
 
 CONFLICT_DISTRO_FEATURES = "directfb"
 
Index: sdk/ely-build-image.sh
===================================================================
diff -u -r901975d0b5855f6ec39c38ccba4ef1a43eee9f25 -rdead01d367e57cf8933701fb1c2c5ca465085582
--- sdk/ely-build-image.sh	(.../ely-build-image.sh)	(revision 901975d0b5855f6ec39c38ccba4ef1a43eee9f25)
+++ sdk/ely-build-image.sh	(.../ely-build-image.sh)	(revision dead01d367e57cf8933701fb1c2c5ca465085582)
@@ -27,4 +27,8 @@
 # bitbake dey-image-recovery-initramfs
 # time bitbake dey-image-qt-swu -c clean 2>&1 | tee "BUILD-$TARGET-$BUILD_VARIANT-$(date +"%Y%m%d-%H%M")".log
 
+if [[ "$EXTRA" == "" ]]; then
+  exit 0
+fi
+
 time bitbake $TARGET$EXTRA 2>&1 | tee "BUILD-$TARGET-$BUILD_VARIANT-$(date +"%Y%m%d-%H%M")".log