diff options
| author | Mike Krus <mike.krus@kdab.com> | 2015-12-27 21:47:40 +0000 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2016-01-01 18:16:20 +0000 |
| commit | fa0e902b4b1c938f59c7fdf9bdfbd464f55e766f (patch) | |
| tree | e53902c9c7abe8ad12e4cfa806deb86bd9b43ec7 /src/qml | |
| parent | 893a4ffd6476a11597f9dd3c847fe3db4bf38eed (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')
| -rw-r--r-- | src/qml/jsruntime/jsruntime.pri | 2 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4global_p.h | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 1 | ||||
| -rw-r--r-- | src/qml/qml/qqmlplatform.cpp | 2 |
4 files changed, 5 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 diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index b3636d1fa6..e02bc1350c 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -398,6 +398,7 @@ The following functions are also on the Qt object. \li \c "android" - Android \li \c "blackberry" - BlackBerry OS \li \c "ios" - iOS + \li \c "tvos" - tvOS \li \c "linux" - Linux \li \c "osx" - OS X \li \c "unix" - Other Unix-based OS diff --git a/src/qml/qml/qqmlplatform.cpp b/src/qml/qml/qqmlplatform.cpp index a453746da3..92e9096077 100644 --- a/src/qml/qml/qqmlplatform.cpp +++ b/src/qml/qml/qqmlplatform.cpp @@ -57,6 +57,8 @@ QString QQmlPlatform::os() return QStringLiteral("blackberry"); #elif defined(Q_OS_IOS) return QStringLiteral("ios"); +#elif defined(Q_OS_TVOS) + return QStringLiteral("tvos"); #elif defined(Q_OS_MAC) return QStringLiteral("osx"); #elif defined(Q_OS_WINCE) |