From b6d3bae80317d854d78b5880d8d46cacd0d1a64e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Mon, 15 Sep 2014 21:48:30 +0200 Subject: QtDeclarative fixes and workarounds for NaCl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/qml/jsruntime/qv4engine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qml/jsruntime/qv4engine.cpp') 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); -- cgit v1.2.3