diff options
| author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2014-09-15 21:48:30 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2016-05-13 13:32:08 +0000 |
| commit | b6d3bae80317d854d78b5880d8d46cacd0d1a64e (patch) | |
| tree | 4ecd01dac33105436efefd123247b02851918a60 /src/qml/jsruntime/qv4engine.cpp | |
| parent | 872a05475721ad771bd347d1526035e6e7479d30 (diff) | |
| download | qtdeclarative-wip/nacl.tar.gz | |
QtDeclarative fixes and workarounds for NaClwip/nacl
Make QtDeclarative run on Native Client.
Some of these should be looked at more closely at
a later point in time, but will do as workarounds
from now.
Change-Id: Ifddcb45b190c3a80c6137772a05ababb5466ea22
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4engine.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index 2560f065cf..284a9ea88a 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -113,7 +113,7 @@ QT_WARNING_DISABLE_MSVC(4172) // MSVC 2015: warning C4172: returning address of quintptr getStackLimit() { quintptr stackLimit; -#if USE(PTHREADS) && !OS(QNX) +#if USE(PTHREADS) && !OS(QNX) && !defined(Q_OS_NACL) # if OS(DARWIN) pthread_t thread_self = pthread_self(); void *stackTop = pthread_get_stackaddr_np(thread_self); |