Merge remote-tracking branch 'origin/krogoth' into dev

* origin/krogoth:
  AM: update revision
  Add appman versions of Kit and Qt to creator
  fonts: add recipe for GNU FreeFonts
  Add multiscreen automotive demo
  neptune: update to include fix for i18ndemo
  fonts: update URL for lohit font
  Update GammaRay to the same version as used by the QtAS 1.1 host tools
  emulator: correctly append qtsimulator configuration
  Update automotive components
  setup-environment: don't exit the shell on error
  neptune-ui: add runtime dependencies
  update meta-qt5 (merged upstream/master) SHA1 to manifest.xml
  AM: Add appman tools to automotive nativesdk
  configure-qtcreator: suppress unnecessary error
  Update GammaRay to the latest 2.7 branch

Conflicts:
	recipes-qt/automotive/neptune-ui_git.bb
	recipes-qt/automotive/qtapplicationmanager_git.bb
	recipes-qt/qt5/qtlocation_git.bbappend
	scripts/manifest.xml

Change-Id: I96601e7d7a1827a6631fe59d18101d2ad3b70871

12 files changed, 137 insertions, 20 deletions

diff --git a/recipes-qt/automotive/gammaray_git.bb b/recipes-qt/automotive/gammaray_git.bb
index 6304096..6317040 100644
--- a/recipes-qt/automotive/gammaray_git.bb
+++ b/recipes-qt/automotive/gammaray_git.bb
@@ -2,15 +2,15 @@ SUMMARY = "GammaRay Qt introspection probe"
 HOMEPAGE = "http://www.kdab.com/gammaray"
 
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE.GPL.txt;md5=5996517d53e3c2722d457fb633e970ed"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL.txt;md5=560b8b2e529f7a17ee5dde6e5d0c0d69"
 
 inherit cmake_qt5
 
 SRC_URI = "git://github.com/KDAB/GammaRay;branch=${BRANCH}"
 
-BRANCH = "master"
-SRCREV = "b961eb1b84718256acc678ec16a2b45e98990cd7"
-PV = "master+git${SRCPV}"
+BRANCH = "2.7"
+SRCREV = "a22da6d63cab08f3ef8588611fdbda3f96731efe"
+PV = "${BRANCH}+git${SRCPV}"
 
 DEPENDS = "qtdeclarative qtlocation qtsvg qttools qtconnectivity qt3d qtivi qtscxml \
            ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}"
diff --git a/recipes-qt/automotive/multiscreen-demo_git.bb b/recipes-qt/automotive/multiscreen-demo_git.bb
new file mode 100644
index 0000000..1997bd5
--- /dev/null
+++ b/recipes-qt/automotive/multiscreen-demo_git.bb
@@ -0,0 +1,65 @@
+############################################################################
+##
+## Copyright (C) 2017 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 = "Multiscreen Demo"
+LICENSE = "GPLv3 | The-Qt-Company-DCLA-2.1"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073"
+
+inherit qt5-module systemd
+require recipes-qt/qt5/qt5-git.inc
+
+QT_GIT = "git://code.qt.io/qt-apps"
+QT_MODULE_BRANCH = "master"
+
+SRC_URI += "git://github.com/qtproject/qt-apps-demo-assets;protocol=git;name=assets;destsuffix=git/demo-assets"
+
+SRCREV_multiscreen = "77ecd7d03aeea3bb7d10ac8ef448920da11ae306"
+SRCREV_assets = "0d47d21f082d6c9e355a55809ebd38a31ea02264"
+
+SRCREV_FORMAT = "multiscreen_assets"
+SRCREV = "${SRCREV_multiscreen}"
+
+DEPENDS = "qtbase qtdeclarative qt3d"
+RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard"
+
+EXTRA_QMAKEVARS_PRE += "INSTALL_PREFIX=/opt"
+
+do_install_append() {
+    install -m 0755 ${S}/start.sh ${D}/opt/automotivedemo/
+
+    install -d ${D}${systemd_system_unitdir}
+    install -m 0644 ${S}/scripts/automotivedemo.service ${D}${systemd_system_unitdir}/
+}
+
+FILES_${PN} += "\
+    /opt/automotivedemo \
+    "
+
+SYSTEMD_SERVICE_${PN} = "automotivedemo.service"
+SYSTEMD_AUTO_ENABLE = "disable"
diff --git a/recipes-qt/automotive/neptune-ui_git.bb b/recipes-qt/automotive/neptune-ui_git.bb
index 2db4765..ceceec8 100644
--- a/recipes-qt/automotive/neptune-ui_git.bb
+++ b/recipes-qt/automotive/neptune-ui_git.bb
@@ -36,22 +36,18 @@ require recipes-qt/qt5/qt5-git.inc
 
 QT_GIT = "git://github.com/qtproject"
 QT_MODULE = "qt-apps-neptune-ui"
-QT_MODULE_BRANCH = "master"
 
 SRC_URI += " \
     file://neptune.service \
     "
 
-SRCREV = "fd18dcbb9f53eb3948da890704530007327c476f"
+SRCREV = "504d9720ed7ef921af7e5f1ebf709662baac6555"
 
 DEPENDS = "qtbase qtdeclarative"
 RDEPENDS_${PN} = "qtapplicationmanager qtivi qtvirtualkeyboard \
+                  qtquickcontrols-qmlplugins qtgraphicaleffects-qmlplugins \
                   ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)}"
 
-do_configure_prepend() {
-    echo "qml.path = /opt/neptune" >> ${S}/neptuneui.pro
-}
-
 do_install_append() {
     install -m 0755 -d ${D}${systemd_unitdir}/system
     install -m 0644 ${WORKDIR}/neptune.service ${D}${systemd_unitdir}/system/
diff --git a/recipes-qt/automotive/qtapplicationmanager_git.bb b/recipes-qt/automotive/qtapplicationmanager_git.bb
index e22196c..52ee20e 100644
--- a/recipes-qt/automotive/qtapplicationmanager_git.bb
+++ b/recipes-qt/automotive/qtapplicationmanager_git.bb
@@ -29,16 +29,18 @@
 
 DESCRIPTION = "Qt component for application lifecycle management"
 LICENSE = "(GFDL-1.3 & The-Qt-Company-GPL-Exception-1.0 & (LGPL-3.0 | GPL-2.0+)) | The-Qt-Company-DCLA-2.1"
-LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=317fda864ac33d41406ff3938c3e78d1"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=43a31c6abffdd61c938811959b3c1b71"
 
 inherit qt5-module
 require recipes-qt/qt5/qt5-git.inc
 
-SRCREV = "be9e9a37c2cd848cfdbb97990e0047f1a0834a8a"
+SRCREV = "f472ef3662cf0a9bc2bf727c7cef18fd884df5a2"
 
 DEPENDS = "qtbase qtdeclarative libyaml libarchive \
            ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "", d)}"
+
 RDEPENDS_${PN} = "libcrypto ${PN}-tools"
+RDEPENDS_${PN}_remove_mingw32 = "libcrypto"
 
 EXTRA_QMAKEVARS_PRE += "\
     ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "-config force-multiprocess", "-config force-singleprocess", d)} \
@@ -55,3 +57,12 @@ do_install_append() {
 FILES_${PN} += "\
     /opt/am \
     "
+
+BBCLASSEXTEND += "nativesdk"
+
+DEPENDS_class-nativesdk = "qtbase nativesdk-glibc-locale"
+DEPENDS_class-nativesdk_remove_mingw32 += "nativesdk-glibc-locale"
+
+EXTRA_QMAKEVARS_PRE_class-nativesdk += "\
+    -config tools-only \
+    "
diff --git a/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf b/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf
index 64226cb..7236378 100644
--- a/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf
+++ b/recipes-qt/b2qt-addons/b2qt-appcontroller/tegra-t18x/appcontroller.conf
@@ -3,5 +3,5 @@ env=QT_IM_MODULE=qtvirtualkeyboard
 env=QT_QPA_EGLFS_FORCE888=0
 env=QT_QUICK_CONTROLS_STYLE=Flat
 env=XDG_RUNTIME_DIR=/tmp
-env=QSG_RENDER_LOOP=windows
+env=QSG_RENDER_LOOP=basic
 base=linux
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 e74dd92..94bf48d 100644
--- a/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb
+++ b/recipes-qt/meta/meta-toolchain-b2qt-automotive-qt5-sdk.bb
@@ -34,6 +34,6 @@ LIC_FILES_CHKSUM = "file://${QT_LICENSE};md5=80e06902b5f0e94ad0a78ee4f7fcb74b"
 
 inherit populate_b2qt_qt5_sdk
 
-TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host"
+TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host"
 TOOLCHAIN_TARGET_TASK += "packagegroup-b2qt-embedded-qt5-toolchain-target \
                           packagegroup-b2qt-automotive-qt5-toolchain-target"
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
new file mode 100644
index 0000000..acae372
--- /dev/null
+++ b/recipes-qt/packagegroups/nativesdk-packagegroup-b2qt-automotive-qt5-toolchain-host.bb
@@ -0,0 +1,39 @@
+############################################################################
+##
+## 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$
+##
+############################################################################
+
+DESCRIPTION = "Host packages for B2Qt automotive Qt5 SDK"
+LICENSE = "The-Qt-Company-DCLA-2.1"
+PR = "r0"
+
+inherit nativesdk packagegroup qtquickcompiler
+
+RDEPENDS_${PN} += "\
+    nativesdk-packagegroup-b2qt-embedded-qt5-toolchain-host \
+    nativesdk-qtapplicationmanager-tools \
+    "
diff --git a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
index 1bf8da1..be15207 100644
--- a/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-b2qt-automotive-addons.bb
@@ -42,4 +42,5 @@ RDEPENDS_${PN} += " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebbrowser', '', d)} \
     gammaray \
     qmllive-target \
+    multiscreen-demo \
     "
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
index 78106f8..d79bf57 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bbappend
@@ -33,5 +33,10 @@ SRC_URI += "\
     file://0001-Add-win32-g-oe-mkspec-that-uses-the-OE_-environment.patch \
     "
 
+PACKAGECONFIG += "openssl"
+PACKAGECONFIG_remove_mingw32 += "openssl"
+
+PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl"
+
 fakeroot do_generate_qt_environment_file_mingw32() {
 }
diff --git a/recipes-qt/qt5/qtlocation_git.bbappend b/recipes-qt/qt5/qtlocation_git.bbappend
index f199937..2a949eb 100644
--- a/recipes-qt/qt5/qtlocation_git.bbappend
+++ b/recipes-qt/qt5/qtlocation_git.bbappend
@@ -27,5 +27,5 @@
 ##
 ############################################################################
 
-EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator"
-DEPENDS_emulator += "qtsimulator"
+EXTRA_QMAKEVARS_PRE_append_emulator = " CONFIG+=simulator"
+DEPENDS_append_emulator = " qtsimulator"
diff --git a/recipes-qt/qt5/qtsensors_git.bbappend b/recipes-qt/qt5/qtsensors_git.bbappend
index 890656c..655364b 100644
--- a/recipes-qt/qt5/qtsensors_git.bbappend
+++ b/recipes-qt/qt5/qtsensors_git.bbappend
@@ -27,5 +27,5 @@
 ##
 ############################################################################
 
-EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator"
-DEPENDS_emulator += "qtsimulator"
+EXTRA_QMAKEVARS_PRE_append_emulator = " SENSORS_PLUGINS=simulator"
+DEPENDS_append_emulator = " qtsimulator"
diff --git a/recipes-qt/qt5/qtsystems_git.bbappend b/recipes-qt/qt5/qtsystems_git.bbappend
index f199937..2a949eb 100644
--- a/recipes-qt/qt5/qtsystems_git.bbappend
+++ b/recipes-qt/qt5/qtsystems_git.bbappend
@@ -27,5 +27,5 @@
 ##
 ############################################################################
 
-EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator"
-DEPENDS_emulator += "qtsimulator"
+EXTRA_QMAKEVARS_PRE_append_emulator = " CONFIG+=simulator"
+DEPENDS_append_emulator = " qtsimulator"