summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2017-10-23 12:09:02 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2017-10-30 09:15:57 +0000
commit211695b46a2e1b86f01f3d150e1502c3e473aaab (patch)
tree1c81f44020e056fc6a85993855b409b765f7b902 /conf
parent1dc3bc0bbbc76297803ab4407a6d7183e085668e (diff)
downloadmeta-boot2qt-211695b46a2e1b86f01f3d150e1502c3e473aaab.tar.gz
emulator: update recipes & configs for emulator3
* Remove emulator helperlib recipes as those are now included in qtsimulator * Move emulator proxy daemon launcher scripts under qtsimulator recipe * Update qtsimulator, qtsystems & qtglesstream to match with emulator3 * Remove qtsimulator dependencies from qtsensors and qtlocation as the the modules do not build against more recent refactored qtsimulator. Task-number: QTBUG-64006 Change-Id: Ib2374e702f2862b168ac2f1f2d6190f84823137c Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/emulator.conf4
1 files changed, 1 insertions, 3 deletions
diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf
index a749086..b6125ae 100644
--- a/conf/distro/include/emulator.conf
+++ b/conf/distro/include/emulator.conf
@@ -1,6 +1,6 @@
1############################################################################ 1############################################################################
2## 2##
3## Copyright (C) 2016 The Qt Company Ltd. 3## Copyright (C) 2017 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/ 4## Contact: https://www.qt.io/licensing/
5## 5##
6## This file is part of the Boot to Qt meta layer. 6## This file is part of the Boot to Qt meta layer.
@@ -49,6 +49,4 @@ MACHINE_EXTRA_INSTALL += "\
49 mount-vboxsf \ 49 mount-vboxsf \
50 qtsystems \ 50 qtsystems \
51 qtglesstream \ 51 qtglesstream \
52 b2qt-emulator-proxy \
53 b2qt-emulator-vinput \
54 " 52 "