From 623fe39f70996687f07888d6cea1f706c300986a Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 1 Jun 2015 17:58:41 +0300 Subject: 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 --- recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb | 49 ++++++++++++++++++++++ .../b2qt-emulator-proxy/emulatorproxyd.sh | 42 +++++++++++++++++++ recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb | 40 ++++++++++++++++++ 3 files changed, 131 insertions(+) create mode 100644 recipes-qt/b2qt-addons/b2qt-emulator-proxy.bb create mode 100755 recipes-qt/b2qt-addons/b2qt-emulator-proxy/emulatorproxyd.sh create mode 100644 recipes-qt/b2qt-addons/b2qt-emulator-vinput.bb (limited to 'recipes-qt/b2qt-addons') 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" -- cgit v1.2.3-54-g00ecf