aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2015-12-27 21:47:40 +0000
committerMike Krus <mike.krus@kdab.com>2016-01-01 18:16:20 +0000
commitfa0e902b4b1c938f59c7fdf9bdfbd464f55e766f (patch)
treee53902c9c7abe8ad12e4cfa806deb86bd9b43ec7 /src/qml/jsruntime
parent893a4ffd6476a11597f9dd3c847fe3db4bf38eed (diff)
tvOS support
Change-Id: If48e8bcf55781d1148e15ce19e07cfbe35d829d2 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
Diffstat (limited to 'src/qml/jsruntime')
-rw-r--r--src/qml/jsruntime/jsruntime.pri2
-rw-r--r--src/qml/jsruntime/qv4global_p.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/jsruntime.pri b/src/qml/jsruntime/jsruntime.pri
index 503b40e8ae..57ad85485a 100644
--- a/src/qml/jsruntime/jsruntime.pri
+++ b/src/qml/jsruntime/jsruntime.pri
@@ -111,4 +111,4 @@ valgrind {
DEFINES += V4_USE_VALGRIND
}
-ios: DEFINES += ENABLE_ASSEMBLER_WX_EXCLUSIVE=1
+ios|tvos: DEFINES += ENABLE_ASSEMBLER_WX_EXCLUSIVE=1
diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h
index 01a21ea06d..0fc5af8380 100644
--- a/src/qml/jsruntime/qv4global_p.h
+++ b/src/qml/jsruntime/qv4global_p.h
@@ -105,7 +105,7 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); }
// Black list some platforms
#if defined(V4_ENABLE_JIT)
-#if defined(Q_OS_IOS) || defined(Q_OS_WINRT)
+#if defined(Q_OS_IOS) || defined(Q_OS_WINRT) || defined(Q_OS_TVOS)
# undef V4_ENABLE_JIT
#endif
#endif