Merge branch 'release' of ssh://codereview.qt-project.org/qt/qtdeclarative into stable

Change-Id: I0bf06be69927d5961f1bdb4948c3572ef6111923

1 files changed, 8 insertions, 1 deletions

diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 90220f0a36..f5a515a0ae 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -95,7 +95,14 @@ quintptr getStackLimit()
     pthread_t thread_self = pthread_self();
     void *stackTop = pthread_get_stackaddr_np(thread_self);
     stackLimit = reinterpret_cast<quintptr>(stackTop);
-    stackLimit -= pthread_get_stacksize_np(thread_self);
+    quintptr size = 0;
+    if (pthread_main_np()) {
+        rlimit limit;
+        getrlimit(RLIMIT_STACK, &limit);
+        size = limit.rlim_cur;
+    } else
+        size = pthread_get_stacksize_np(thread_self);
+    stackLimit -= size;
 #  else
     void* stackBottom = 0;
     pthread_attr_t attr;