Add QtSimulator support

QtSimulator is added as dependency to Qt modules that support it,
and some helper components are installed to emulator target.

Change-Id: I878ffcfc6a8d9a579cb4a5a4e823fa7f0fa5a3cd
Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com>

8 files changed, 223 insertions, 0 deletions

diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf
index d7afc52..79ebd07 100644
--- a/conf/distro/include/emulator.conf
+++ b/conf/distro/include/emulator.conf
@@ -44,6 +44,8 @@ MACHINE_EXTRA_INSTALL_SDK = "\
         "
 MACHINE_EXTRA_INSTALL_QT = "\
         qtglesstream \
+        b2qt-emulator-proxy \
+        b2qt-emulator-vinput \
         "
 MACHINE_EXTRA_INSTALL_QT_SDK = "\
         qtglesstream-dev \
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb b/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb
new file mode 100644
index 0000000..da6d7bd
--- /dev/null
+++ b/recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb
@@ -0,0 +1,49 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+DESCRIPTION = "Proxy daemon for QtSimulator"
+LICENSE = "QtEnterprise"
+LIC_FILES_CHKSUM = "file://proxy.h;md5=ba04e32af7257890758a149b0c14d11a;beginline=1;endline=17"
+
+inherit qt5-module
+
+SRC_URI = " \
+    git://qt-gerrit.ci.local/QtRD-15810/b2qt-emulator.git;branch=${BRANCH};protocol=ssh \
+    file://emulatorproxyd.sh \
+    "
+
+SRCREV = "1d001910d45349ae2a44fa01516baaa7ff4c9eda"
+BRANCH = "master"
+
+S = "${WORKDIR}/git/src/helperlibs/proxy"
+
+DEPENDS = "qtbase qtsimulator"
+
+do_install_append() {
+        install -m 0755 -d ${D}${sysconfdir}/init.d
+        install -m 0755 ${WORKDIR}/emulatorproxyd.sh ${D}${sysconfdir}/init.d/
+}
+
+INITSCRIPT_NAME = "emulatorproxyd.sh"
+INITSCRIPT_PARAMS = "defaults 97 10"
+
+inherit update-rc.d
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-proxy/emulatorproxyd.sh b/recipes-qt/b2qt-addons/b2qt-emulator-proxy/emulatorproxyd.sh
new file mode 100755
index 0000000..48177fa
--- /dev/null
+++ b/recipes-qt/b2qt-addons/b2qt-emulator-proxy/emulatorproxyd.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+DAEMON=/usr/bin/emulatorproxyd
+
+case "$1" in
+start)
+    start-stop-daemon --start --quiet --exec $DAEMON &
+    ;;
+stop)
+    start-stop-daemon --stop --quiet --exec $DAEMON
+    ;;
+restart)
+    start-stop-daemon --stop --quiet --exec $DAEMON
+    sleep 1
+    start-stop-daemon --start --quiet --exec $DAEMON &
+    ;;
+*)
+    echo "Usage: $0 {start|stop|restart}"
+    exit 1
+esac
+exit 0
diff --git a/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb b/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb
new file mode 100644
index 0000000..b344395
--- /dev/null
+++ b/recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb
@@ -0,0 +1,40 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+DESCRIPTION = "Virtual input plugin for QtSimulator"
+LICENSE = "QtEnterprise"
+LIC_FILES_CHKSUM = "file://qvinput.h;md5=ba04e32af7257890758a149b0c14d11a;beginline=1;endline=17"
+
+inherit qt5-module
+
+SRC_URI = " \
+    git://qt-gerrit.ci.local/QtRD-15810/b2qt-emulator.git;branch=${BRANCH};protocol=ssh \
+    "
+
+SRCREV = "1d001910d45349ae2a44fa01516baaa7ff4c9eda"
+BRANCH = "master"
+
+EXTRA_QMAKEVARS_PRE += "CONFIG+=force_independent"
+
+S = "${WORKDIR}/git/src/helperlibs/vinput"
+
+DEPENDS = "qtbase qtsimulator"
diff --git a/recipes-qt/qt5-addons/qtsimulator_1.0.bb b/recipes-qt/qt5-addons/qtsimulator_1.0.bb
new file mode 100644
index 0000000..5f0c761
--- /dev/null
+++ b/recipes-qt/qt5-addons/qtsimulator_1.0.bb
@@ -0,0 +1,39 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+DESCRIPTION = "QtSimulator"
+LICENSE = "QtEnterprise"
+LIC_FILES_CHKSUM = "file://src/simulator/version.h;md5=ba04e32af7257890758a149b0c14d11a;beginline=1;endline=17"
+
+inherit qt5-module
+
+SRC_URI = " \
+    git://qt-gerrit.ci.local/QtRD-15810/b2qt-qtsimulator.git;branch=${BRANCH};protocol=ssh \
+    "
+
+# v1.0.8
+SRCREV = "faf8ea5cee8a4105b97c3f2ba4a4c828f03a70ab"
+BRANCH = "master"
+
+S = "${WORKDIR}/git"
+
+DEPENDS = "qtbase"
diff --git a/recipes-qt/qt5/qtlocation_%.bbappend b/recipes-qt/qt5/qtlocation_%.bbappend
index c068600..facd006 100644
--- a/recipes-qt/qt5/qtlocation_%.bbappend
+++ b/recipes-qt/qt5/qtlocation_%.bbappend
@@ -21,3 +21,6 @@
 #############################################################################
 
 PACKAGECONFIG += "gypsy"
+
+EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator"
+DEPENDS_emulator += "qtsimulator"
diff --git a/recipes-qt/qt5/qtsensors_%.bbappend b/recipes-qt/qt5/qtsensors_%.bbappend
new file mode 100644
index 0000000..a388c6f
--- /dev/null
+++ b/recipes-qt/qt5/qtsensors_%.bbappend
@@ -0,0 +1,24 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+EXTRA_QMAKEVARS_PRE_emulator += "SENSORS_PLUGINS=simulator"
+DEPENDS_emulator += "qtsimulator"
diff --git a/recipes-qt/qt5/qtsystems_%.bbappend b/recipes-qt/qt5/qtsystems_%.bbappend
new file mode 100644
index 0000000..af270e5
--- /dev/null
+++ b/recipes-qt/qt5/qtsystems_%.bbappend
@@ -0,0 +1,24 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://www.qt.io/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+EXTRA_QMAKEVARS_PRE_emulator += "CONFIG+=simulator"
+DEPENDS_emulator += "qtsimulator"