5 files changed, 9 insertions, 63 deletions

diff --git a/meta-boot2qt-distro/conf/distro/b2qt.conf b/meta-boot2qt-distro/conf/distro/b2qt.conf
index 1aa4bd5..ad091e7 100644
--- a/meta-boot2qt-distro/conf/distro/b2qt.conf
+++ b/meta-boot2qt-distro/conf/distro/b2qt.conf
@@ -73,6 +73,9 @@ PREFERRED_PROVIDER_jpeg-native ?= "libjpeg-turbo-native"
 OE_QMAKE_PLATFORM_NATIVE_mingw32 = "win32-g++-oe"
 OE_QMAKE_PLATFORM_mingw32 = "win32-g++-oe"
 
+# Default to commercially licensed Qt
+QT_EDITION = "commercial"
+
 # Disable SHA validation for branch
 QT_MODULE_BRANCH_PARAM = "nobranch=1"
 
diff --git a/meta-boot2qt-distro/conf/distro/include/beagleboard.conf b/meta-boot2qt-distro/conf/distro/include/ci.inc
index d9b92f0..f6e3fd7 100644
--- a/meta-boot2qt-distro/conf/distro/include/beagleboard.conf
+++ b/meta-boot2qt-distro/conf/distro/include/ci.inc
@@ -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,8 +27,4 @@
 ##
 ############################################################################
 
-include conf/distro/include/ti.inc
-
-DEPLOY_CONF_NAME = "BeagleBoard"
-
-DISTRO_FEATURES_remove = "webengine opengl"
+MACHINE_EXTRA_INSTALL += "libnss-mdns"
diff --git a/meta-boot2qt-distro/conf/distro/include/am335x-evm.conf b/meta-boot2qt-distro/conf/distro/include/qemuarm64.conf
index 4ec3e4d..a7ed514 100644
--- a/meta-boot2qt-distro/conf/distro/include/am335x-evm.conf
+++ b/meta-boot2qt-distro/conf/distro/include/qemuarm64.conf
@@ -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,8 +27,4 @@
 ##
 ############################################################################
 
-include conf/distro/include/ti.inc
-
-DEPLOY_CONF_NAME = "Sitara AM335x Starter Kit"
-
-DISTRO_FEATURES_remove = "webengine"
+include conf/distro/include/ci.inc
diff --git a/meta-boot2qt-distro/conf/distro/include/beaglebone.conf b/meta-boot2qt-distro/conf/distro/include/qemuarmv7.conf
index 099be56..a7ed514 100644
--- a/meta-boot2qt-distro/conf/distro/include/beaglebone.conf
+++ b/meta-boot2qt-distro/conf/distro/include/qemuarmv7.conf
@@ -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,10 +27,4 @@
 ##
 ############################################################################
 
-include conf/distro/include/ti.inc
-
-DEPLOY_CONF_NAME = "BeagleBone Black"
-
-DISTRO_FEATURES_remove = "webengine"
-
-BOOT_SPACE = "33792"
+include conf/distro/include/ci.inc
diff --git a/meta-boot2qt-distro/conf/distro/include/ti.inc b/meta-boot2qt-distro/conf/distro/include/ti.inc
deleted file mode 100644
index 80f90f2..0000000
--- a/meta-boot2qt-distro/conf/distro/include/ti.inc
+++ /dev/null
@@ -1,43 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2016 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$
-##
-############################################################################
-
-include conf/distro/include/fsl.inc
-
-UBOOT_SUFFIX = "img"
-BOOT_SCRIPTS += "\
-    MLO-${MACHINE}:MLO \
-    u-boot-${MACHINE}.img:u-boot.img \
-    "
-
-EXTRA_IMAGEDEPENDS += "u-boot"
-
-PREFERRED_PROVIDER_virtual/egl = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/libgles1 = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/libgles2 = "ti-sgx-ddk-um"
-PREFERRED_PROVIDER_virtual/mesa = "ti-sgx-ddk-um"