13 files changed, 223 insertions, 94 deletions

diff --git a/meta-boot2qt-distro/conf/distro/include/boundary.inc b/meta-boot2qt-distro/conf/distro/include/boundary.inc
index b08e11a..8dcf16b 100644
--- a/meta-boot2qt-distro/conf/distro/include/boundary.inc
+++ b/meta-boot2qt-distro/conf/distro/include/boundary.inc
@@ -30,12 +30,10 @@
 include conf/distro/include/fsl.inc
 
 BBMASK += " \
-    meta-boundary/recipes-browser/chromium \
     meta-boundary/recipes-core/init-ifupdown \
-    meta-boundary/recipes-mozilla/firefox \
     "
 
 MACHINE_EXTRA_INSTALL += "\
     kernel-module-qcacld \
-    linux-firmware-bdsdmac-wlan \
+    linux-firmware-bdsdmac \
     "
diff --git a/meta-boot2qt-distro/conf/distro/include/draak.conf b/meta-boot2qt-distro/conf/distro/include/draak.conf
index 94ca09e..daf68f7 100644
--- a/meta-boot2qt-distro/conf/distro/include/draak.conf
+++ b/meta-boot2qt-distro/conf/distro/include/draak.conf
@@ -40,9 +40,10 @@ WKS_FILE_DEPENDS_remove = "optee-os"
 QBSP_IMAGE_CONTENT_remove = "tee-${MACHINE}.srec"
 
 BBMASK += "\
-    meta-rcar-gen3/recipes-multimedia/webp \
     meta-rcar-gen3/recipes-connectivity/ppp \
     meta-rcar-gen3/recipes-graphics/wayland/wayland-protocols \
-    meta-renesas/meta-rcar-gen3/recipes-graphics/drm \
     meta-rcar-gen3/recipes-multimedia/gstreamer \
+    meta-rcar-gen3/recipes-multimedia/webp \
+    meta-renesas/meta-rcar-gen3/recipes-graphics/drm \
+    meta-renesas-extras/recipes/arm-trusted-firmware \
     "
diff --git a/meta-boot2qt-distro/conf/distro/include/imx6qdlsabresd.conf b/meta-boot2qt-distro/conf/distro/include/imx6qdlsabresd.conf
index 5f3ddb3..644dac0 100644
--- a/meta-boot2qt-distro/conf/distro/include/imx6qdlsabresd.conf
+++ b/meta-boot2qt-distro/conf/distro/include/imx6qdlsabresd.conf
@@ -28,7 +28,6 @@
 ############################################################################
 
 include conf/distro/include/fsl.inc
-include conf/distro/include/opencv.inc
 
 DEPLOY_CONF_NAME = "NXP i.MX6QP/Q/DL SABRE Smart Device"
 
diff --git a/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf b/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf
index f6871be..7883ab5 100644
--- a/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf
+++ b/meta-boot2qt-distro/conf/distro/include/nitrogen6x.conf
@@ -28,7 +28,6 @@
 ############################################################################
 
 include conf/distro/include/boundary.inc
-include conf/distro/include/opencv.inc
 
 DEPLOY_CONF_NAME = "Boundary Devices i.MX6"
 
diff --git a/meta-boot2qt-distro/recipes-qt/images/b2qt-automation-qt5-image.bb b/meta-boot2qt-distro/recipes-qt/images/b2qt-automation-qt5-image.bb
new file mode 100644
index 0000000..25bfb4d
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-qt/images/b2qt-automation-qt5-image.bb
@@ -0,0 +1,55 @@
+############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+DESCRIPTION = "B2Qt Automation Qt5 image"
+LICENSE = "The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
+
+DEPLOY_CONF_TYPE = "Qt for Automation ($QT_VERSION)"
+
+IMAGE_FEATURES += "\
+        package-management \
+        ssh-server-dropbear \
+        tools-debug \
+        debug-tweaks \
+        hwcodecs \
+        "
+
+inherit core-image qbsp-image
+inherit consistent_timestamps
+
+IMAGE_INSTALL += "\
+    packagegroup-b2qt-embedded-base \
+    packagegroup-b2qt-embedded-tools \
+    ${@bb.utils.contains("DISTRO_FEATURES", "gstreamer010", "packagegroup-b2qt-embedded-gstreamer010", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "gstreamer", "packagegroup-b2qt-embedded-gstreamer", "", d)} \
+    packagegroup-b2qt-qt5-modules \
+    packagegroup-b2qt-embedded-addons \
+    packagegroup-b2qt-automation-addons \
+    "
diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automation-qbsp.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automation-qbsp.bb
new file mode 100644
index 0000000..16a1530
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-qt/meta/meta-b2qt-automation-qbsp.bb
@@ -0,0 +1,50 @@
+############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+DESCRIPTION = "Meta task for QBSP creation"
+
+LICENSE = "The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
+
+# get Qt version number
+require recipes-qt/qt5/qt5-git.inc
+S = "${WORKDIR}"
+
+inherit qbsp
+
+PV := "${@d.getVar('PV').split('+')[0]}"
+
+VERSION_SHORT = "${@d.getVar('PV').replace('.','')}"
+QBSP_NAME = "Automation ${PV}"
+QBSP_MACHINE = "${@d.getVar('MACHINE').replace('-','')}"
+QBSP_INSTALLER_COMPONENT = "automation.${VERSION_SHORT}.yocto.${QBSP_MACHINE}"
+QBSP_INSTALL_PATH = "/${PV}/Automation/${MACHINE}"
+
+QBSP_SDK_TASK = "meta-toolchain-b2qt-automation-qt5-sdk"
+QBSP_IMAGE_TASK = "b2qt-automation-qt5-image"
diff --git a/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automation-qt5-sdk.bb b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automation-qt5-sdk.bb
new file mode 100644
index 0000000..8cd0d04
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-qt/meta/meta-toolchain-b2qt-automation-qt5-sdk.bb
@@ -0,0 +1,39 @@
+############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+DESCRIPTION = "B2Qt embedded Qt5 SDK toolchain"
+
+LICENSE = "The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=948f8877345cd66106f11031977a4625"
+
+inherit populate_b2qt_qt5_sdk
+
+TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host"
+TOOLCHAIN_TARGET_TASK += "packagegroup-b2qt-embedded-qt5-toolchain-target \
+                          packagegroup-b2qt-automation-qt5-toolchain-target"
diff --git a/meta-boot2qt-distro/conf/distro/include/opencv.inc b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automation-addons.bb
index a1d37df..d90e1b9 100644
--- a/meta-boot2qt-distro/conf/distro/include/opencv.inc
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automation-addons.bb
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -27,13 +27,15 @@
 ##
 ############################################################################
 
-MACHINE_EXTRA_INSTALL += "\
-    libopencv-core \
-    libopencv-imgproc \
-    libopencv-objdetect \
-    "
+DESCRIPTION = "Automation specific Qt packages"
+LICENSE = "The-Qt-Company-Commercial"
 
-MACHINE_EXTRA_INSTALL_SDK += " \
-    opencv-dev \
-    "
+inherit packagegroup
 
+PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
+
+RDEPENDS_${PN} += " \
+    qtmqtt \
+    qtknx \
+    qtopcua \
+    "
diff --git a/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automation-qt5-toolchain-target.bb b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automation-qt5-toolchain-target.bb
new file mode 100644
index 0000000..257ef0f
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-qt/packagegroups/packagegroup-b2qt-automation-qt5-toolchain-target.bb
@@ -0,0 +1,42 @@
+############################################################################
+##
+## Copyright (C) 2018 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+DESCRIPTION = "Target packages for B2Qt Automation Qt5 SDK"
+LICENSE = "The-Qt-Company-Commercial"
+PR = "r0"
+
+inherit packagegroup
+
+PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
+
+RDEPENDS_${PN} += " \
+    qtmqtt-dev \
+    qtknx-dev \
+    qtopcua-dev \
+    "
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch
index ac4fe40..7b13555 100644
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch
@@ -1,4 +1,4 @@
-From 0386cb5f9a46e56a0a94f2a92e87ed52d41cf4ea Mon Sep 17 00:00:00 2001
+From 8d720921ddda76fcf77c0f7ebc5ac0b873ab1595 Mon Sep 17 00:00:00 2001
 From: David Schulz <david.schulz@theqtcompany.com>
 Date: Fri, 3 Jul 2015 16:06:59 +0200
 Subject: [PATCH] Add win32-g++-oe mkspec that uses the OE_ environment.
@@ -8,108 +8,52 @@ Upstream-Status: Inappropriate [embedded specific]
 
 Change-Id: Ic60b32f88ee6a792b0d8938e40e2d6cb19fb93aa
 ---
- mkspecs/win32-g++-oe/qmake.conf      | 87 ++++++++++++++++++++++++++++++++++++
- mkspecs/win32-g++-oe/qplatformdefs.h | 42 +++++++++++++++++
- 2 files changed, 129 insertions(+)
+ mkspecs/win32-g++-oe/qmake.conf      | 31 ++++++++++++++++++++
+ mkspecs/win32-g++-oe/qplatformdefs.h | 42 ++++++++++++++++++++++++++++
+ 2 files changed, 73 insertions(+)
  create mode 100644 mkspecs/win32-g++-oe/qmake.conf
  create mode 100644 mkspecs/win32-g++-oe/qplatformdefs.h
 
 diff --git a/mkspecs/win32-g++-oe/qmake.conf b/mkspecs/win32-g++-oe/qmake.conf
 new file mode 100644
-index 0000000..76eefe5
+index 0000000000..ab759e2093
 --- /dev/null
 +++ b/mkspecs/win32-g++-oe/qmake.conf
-@@ -0,0 +1,87 @@
+@@ -0,0 +1,31 @@
 +#
 +# qmake configuration for win32-g++
 +#
-+# Written for MinGW / gcc 4.6 or higher
++# Written for MinGW-w64 / gcc 5.3 or higher
 +#
 +# Cross compile example for i686-w64-mingw32-g++:
 +#   configure -xplatform win32-g++ -device-option CROSS_COMPILE=i686-w64-mingw32-
 +#
 +
-+load(device_config)
-+include(../common/g++-base.conf)
++include(../common/g++-win32.conf)
 +
-+MAKEFILE_GENERATOR      = MINGW
-+QMAKE_PLATFORM          = win32 mingw
-+CONFIG                 += debug_and_release debug_and_release_target precompile_header
-+DEFINES                += UNICODE
-+QMAKE_COMPILER_DEFINES += __GNUC__ WIN32
-+
-+QMAKE_EXT_OBJ           = .o
-+QMAKE_EXT_RES           = _res.o
-+
-+QMAKE_COMPILER          = $$(OE_QMAKE_COMPILER)
++# modifications to g++-win32.conf
 +
 +QMAKE_CC                = $$(OE_QMAKE_CC)
-+QMAKE_LEX               = flex
-+QMAKE_LEXFLAGS          =
-+QMAKE_YACC              = bison -y
-+QMAKE_YACCFLAGS         = -d
 +QMAKE_CFLAGS           += -fno-keep-inline-dllexport $$(OE_QMAKE_CFLAGS)
 +QMAKE_CFLAGS_WARN_ON   += -Wextra
-+QMAKE_CFLAGS_SSE2      += -mstackrealign
 +
 +QMAKE_CXX               = $$(OE_QMAKE_CXX)
-+QMAKE_CXXFLAGS_THREAD   = $$QMAKE_CFLAGS_THREAD
-+QMAKE_CXXFLAGS_RTTI_ON  = -frtti
-+QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti
-+QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads
-+
-+QMAKE_INCDIR            =
-+
-+QMAKE_RUN_CC            = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
-+QMAKE_RUN_CC_IMP        = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-+QMAKE_RUN_CXX           = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
-+QMAKE_RUN_CXX_IMP       = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
++QMAKE_CXXFLAGS         += -fno-keep-inline-dllexport
++QMAKE_CXXFLAGS_WARN_ON  = $$QMAKE_CFLAGS_WARN_ON
 +
 +QMAKE_LINK              = $$(OE_QMAKE_LINK)
-+QMAKE_LINK_C            = $$(OE_QMAKE_LINK)
++QMAKE_LINK_C            = $$(OE_QMAKE_CC)
 +QMAKE_LFLAGS            = $$(OE_QMAKE_LDFLAGS)
-+QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads
-+QMAKE_LFLAGS_RELEASE    = -Wl,-s
-+QMAKE_LFLAGS_CONSOLE    = -Wl,-subsystem,console
-+QMAKE_LFLAGS_WINDOWS    = -Wl,-subsystem,windows
-+QMAKE_LFLAGS_DLL        = -shared
-+QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections
-+QMAKE_LINK_OBJECT_MAX   = 10
-+QMAKE_LINK_OBJECT_SCRIPT = object_script
-+QMAKE_PREFIX_SHLIB      =
-+QMAKE_EXTENSION_SHLIB   = dll
-+QMAKE_PREFIX_STATICLIB  = lib
-+QMAKE_EXTENSION_STATICLIB = a
-+QMAKE_LIB_EXTENSIONS    = a dll.a
 +
-+QMAKE_LIBS              =
-+QMAKE_LIBS_CORE         = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32
-+QMAKE_LIBS_GUI          = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32
-+QMAKE_LIBS_NETWORK      = -lws2_32
-+QMAKE_LIBS_OPENGL       = -lglu32 -lopengl32 -lgdi32 -luser32
-+QMAKE_LIBS_OPENGL_ES2   = -lgdi32 -luser32
-+QMAKE_LIBS_OPENGL_ES2_DEBUG = -lgdi32 -luser32
-+QMAKE_LIBS_COMPAT       = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
-+QMAKE_LIBS_QT_ENTRY     = -lmingw32 -lqtmain
-+
-+QMAKE_IDL               = midl
 +QMAKE_LIB               = $$(OE_QMAKE_AR) -rc
 +QMAKE_RC                = $$(RC)
 +
 +QMAKE_STRIP             = $$(OE_QMAKE_STRIP)
-+QMAKE_STRIPFLAGS_LIB   += --strip-unneeded
-+QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
-+QMAKE_NM                = $${CROSS_COMPILE}nm -P
-+
-+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$(OE_QMAKE_QT_CONFIG)
-+
-+include(../common/angle.conf)
-+include(../common/gcc-base.conf)
 +
 +load(qt_config)
 diff --git a/mkspecs/win32-g++-oe/qplatformdefs.h b/mkspecs/win32-g++-oe/qplatformdefs.h
 new file mode 100644
-index 0000000..9d63527
+index 0000000000..9d63527955
 --- /dev/null
 +++ b/mkspecs/win32-g++-oe/qplatformdefs.h
 @@ -0,0 +1,42 @@
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0015-Disable-ltcg-for-host_build.patch b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0002-Disable-ltcg-for-host_build.patch
index a7ee953..b1a755f 100644
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0015-Disable-ltcg-for-host_build.patch
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0002-Disable-ltcg-for-host_build.patch
@@ -1,4 +1,4 @@
-From 9b541f4f6272c4ed4bb5bf6591e9a65cded6fdfa Mon Sep 17 00:00:00 2001
+From 4de366eeb48038da4140c3dcb3e96070e7d56429 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Tue, 23 Oct 2018 09:54:57 +0300
 Subject: [PATCH] Disable ltcg for host_build
@@ -22,11 +22,11 @@ Upstream-Status: Inappropriate [embedded specific]
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf
-index ccf0226272..00118be872 100644
+index 482e5b5..de00842 100644
 --- a/mkspecs/features/ltcg.prf
 +++ b/mkspecs/features/ltcg.prf
 @@ -1,4 +1,4 @@
--CONFIG(release, debug|release) {
+-CONFIG(release, debug|release):!host_build {
 +CONFIG(release, debug|release):!host_build:!equals(QMAKE_HOST.os, Windows):!staticlib {
      # We need fat object files when creating static libraries on some platforms
      # so the linker will know to load a particular object from the library
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend
index 5684832..95ca956 100644
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase_git.bbappend
@@ -47,7 +47,7 @@ PACKAGECONFIG += " \
     ltcg \
     sql-sqlite \
     tslib \
-    xkbcommon-evdev \
+    xkbcommon \
     "
 
 PACKAGECONFIG_remove = "tests"
@@ -60,6 +60,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 SRC_URI += " \
     file://oe-device-extra.pri \
     file://0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch \
+    file://0002-Disable-ltcg-for-host_build.patch \
     "
 do_configure_prepend() {
     install -m 0644 ${WORKDIR}/oe-device-extra.pri ${S}/mkspecs
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch b/meta-boot2qt-distro/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch
index b90d2f8..c5e9fbf 100644
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtlocation/0001-location-disable-simulator-content-under-plugins.patch
@@ -1,20 +1,19 @@
-From 5a68ac7a0121eff661a448e2fcbe5c02981c50a1 Mon Sep 17 00:00:00 2001
+From 1362ec91854e9d56be56dc3556a9991eb3b17a5c Mon Sep 17 00:00:00 2001
 From: Mikko Gronoff <mikko.gronoff@qt.io>
 Date: Wed, 25 Oct 2017 13:22:16 +0300
 Subject: [PATCH] location: disable simulator content under plugins
 
 Does not build against more recent simulator
-
 ---
  src/plugins/position/position.pro | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/plugins/position/position.pro b/src/plugins/position/position.pro
-index 4453b8a3..c36a1b58 100644
+index 6800d5a3..a6d3edba 100644
 --- a/src/plugins/position/position.pro
 +++ b/src/plugins/position/position.pro
-@@ -6,7 +6,7 @@ qtHaveModule(dbus):SUBDIRS += geoclue
- qtHaveModule(dbus):SUBDIRS += geoclue2
+@@ -6,7 +6,7 @@ linux:qtHaveModule(dbus):SUBDIRS += geoclue
+ linux:qtHaveModule(dbus):SUBDIRS += geoclue2
  qtConfig(gypsy):SUBDIRS += gypsy
  qtConfig(winrt_geolocation):SUBDIRS += winrt
 -qtHaveModule(simulator):SUBDIRS += simulator