diff options
| author | Andrew Knight <andrew.knight@digia.com> | 2013-11-06 00:23:44 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-06 09:07:08 +0100 |
| commit | eeabbf554880f61979fa0a9ecf87ba380cd70863 (patch) | |
| tree | 2801ba1223fba1c46cd3bc26a7881cfe8196052f /src/qml/jsruntime | |
| parent | 3a61da32e485621c9afbd453d22cbe1f6c25479e (diff) | |
Fix build on WinRT
Disable JIT and avoid unsupported functions under WinRT.
Also add MSVC's ARM flag to the double conversion white list.
Change-Id: I22ec340a20b113fdeefb802ac61812f78a527895
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime')
| -rw-r--r-- | src/qml/jsruntime/qv4global_p.h | 2 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4mm.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h index 53b306a1fe..7d7338f19c 100644 --- a/src/qml/jsruntime/qv4global_p.h +++ b/src/qml/jsruntime/qv4global_p.h @@ -84,7 +84,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_WIN64) +#if defined(Q_OS_IOS) || defined(Q_OS_WIN64) || defined(Q_OS_WINRT) # undef V4_ENABLE_JIT #endif #endif diff --git a/src/qml/jsruntime/qv4mm.cpp b/src/qml/jsruntime/qv4mm.cpp index c2d0c3a5ed..3a53588809 100644 --- a/src/qml/jsruntime/qv4mm.cpp +++ b/src/qml/jsruntime/qv4mm.cpp @@ -340,7 +340,7 @@ void MemoryManager::mark() if (!m_d->exactGC) { // push all caller saved registers to the stack, so we can find the objects living in these registers -#if COMPILER(MSVC) +#if COMPILER(MSVC) && !OS(WINRT) // WinRT must use exact GC # if CPU(X86_64) HANDLE thread = GetCurrentThread(); WOW64_CONTEXT ctxt; |