summaryrefslogtreecommitdiffstats
path: root/conf/machine/emulator.conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine/emulator.conf')
-rw-r--r--conf/machine/emulator.conf23
1 files changed, 22 insertions, 1 deletions
diff --git a/conf/machine/emulator.conf b/conf/machine/emulator.conf
index e118a44..14cce96 100644
--- a/conf/machine/emulator.conf
+++ b/conf/machine/emulator.conf
@@ -1,3 +1,25 @@
1#############################################################################
2##
3## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
4##
5## This file is part of the Qt Enterprise Embedded Scripts of the Qt
6## framework.
7##
8## $QT_BEGIN_LICENSE$
9## Commercial License Usage Only
10## Licensees holding valid commercial Qt license agreements with Digia
11## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
12## may use this file in accordance with the terms contained in said license
13## agreement.
14##
15## For further information use the contact form at
16## http://qt.digia.com/contact-us.
17##
18##
19## $QT_END_LICENSE$
20##
21#############################################################################
22
1#@TYPE: Machine 23#@TYPE: Machine
2#@NAME: virtual box emulator 24#@NAME: virtual box emulator
3#@DESCRIPTION: Machine configuration for running a common x86 25#@DESCRIPTION: Machine configuration for running a common x86
@@ -7,7 +29,6 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
7PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" 29PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
8 30
9PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 31PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
10PREFERRED_VERSION_linux-yocto ?= "3.8%"
11 32
12require conf/machine/include/tune-i586.inc 33require conf/machine/include/tune-i586.inc
13 34