4 files changed, 34 insertions, 20 deletions
diff --git a/src/qml/debugger/qqmlprofilerservice.cpp b/src/qml/debugger/qqmlprofilerservice.cpp
index 3c066bd380..af2aea21ae 100644
--- a/src/qml/debugger/qqmlprofilerservice.cpp
+++ b/src/qml/debugger/qqmlprofilerservice.cpp
@@ -178,7 +178,7 @@ void QQmlProfilerService::sendProfilingData()
 bool QQmlProfilerService::startProfilingImpl()
 {
     bool success = false;
-    if (!profilingEnabled()) {
+    if (QQmlDebugService::isDebuggingEnabled() && !profilingEnabled()) {
         setProfilingEnabled(true);
         sendStartedProfilingMessageImpl();
         success = true;
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 539bc5ddd6..ac18e56868 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -109,21 +109,28 @@ quintptr getStackLimit()
 #  else
     void* stackBottom = 0;
     pthread_attr_t attr;
-    pthread_getattr_np(pthread_self(), &attr);
-    size_t stackSize = 0;
-    pthread_attr_getstack(&attr, &stackBottom, &stackSize);
-    pthread_attr_destroy(&attr);
-
-#    if defined(Q_OS_ANDROID)
-    // Bionic pretends that the main thread has a tiny stack; work around it
-    if (gettid() == getpid()) {
-        rlimit limit;
-        getrlimit(RLIMIT_STACK, &limit);
-        stackBottom = reinterpret_cast<void*>(reinterpret_cast<quintptr>(stackBottom) + stackSize - limit.rlim_cur);
+    if (pthread_getattr_np(pthread_self(), &attr) == 0) {
+        size_t stackSize = 0;
+        pthread_attr_getstack(&attr, &stackBottom, &stackSize);
+        pthread_attr_destroy(&attr);
+
+#        if defined(Q_OS_ANDROID)
+        // Bionic pretends that the main thread has a tiny stack; work around it
+        if (gettid() == getpid()) {
+            rlimit limit;
+            getrlimit(RLIMIT_STACK, &limit);
+            stackBottom = reinterpret_cast<void*>(reinterpret_cast<quintptr>(stackBottom) + stackSize - limit.rlim_cur);
+        }
+#       endif
+
+        stackLimit = reinterpret_cast<quintptr>(stackBottom);
+    } else {
+        int dummy;
+        // this is inexact, as part of the stack is used when being called here,
+        // but let's simply default to 1MB from where the stack is right now
+        stackLimit = reinterpret_cast<qintptr>(&dummy) - 1024*1024;
     }
-#    endif
 
-    stackLimit = reinterpret_cast<quintptr>(stackBottom);
 #  endif
 // This is wrong. StackLimit is the currently committed stack size, not the real end.
 // only way to get that limit is apparently by using VirtualQuery (Yuck)
diff --git a/src/qml/jsruntime/qv4mm.cpp b/src/qml/jsruntime/qv4mm.cpp
index f67efaffb9..9923c8834c 100644
--- a/src/qml/jsruntime/qv4mm.cpp
+++ b/src/qml/jsruntime/qv4mm.cpp
@@ -234,12 +234,17 @@ MemoryManager::MemoryManager()
 #  else
     void* stackBottom = 0;
     pthread_attr_t attr;
-    pthread_getattr_np(pthread_self(), &attr);
-    size_t stackSize = 0;
-    pthread_attr_getstack(&attr, &stackBottom, &stackSize);
-    pthread_attr_destroy(&attr);
+    if (pthread_getattr_np(pthread_self(), &attr) == 0) {
+        size_t stackSize = 0;
+        pthread_attr_getstack(&attr, &stackBottom, &stackSize);
+        pthread_attr_destroy(&attr);
 
-    m_d->stackTop = static_cast<quintptr *>(stackBottom) + stackSize/sizeof(quintptr);
+        m_d->stackTop = static_cast<quintptr *>(stackBottom) + stackSize/sizeof(quintptr);
+    } else {
+        // can't scan the native stack so have to rely on exact gc
+        m_d->stackTop = 0;
+        m_d->exactGC = true;
+    }
 #  endif
 #elif OS(WINCE)
     if (false && g_stackBase) {
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
index 0409b92e89..67b7e789bd 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
@@ -1432,7 +1432,9 @@ QV4::ReturnedValue ConsoleObject::method_profile(CallContext *ctx)
     const QByteArray baSource = frame.source.toUtf8();
     const QByteArray baFunction = frame.function.toUtf8();
     QMessageLogger logger(baSource.constData(), frame.line, baFunction.constData());
-    if (QQmlProfilerService::startProfiling()) {
+    if (!QQmlDebugService::isDebuggingEnabled()) {
+        logger.warning("Cannot start profiling because debug service is disabled. Start with -qmljsdebugger=port:XXXXX.");
+    } else if (QQmlProfilerService::startProfiling()) {
         QV8ProfilerService::instance()->startProfiling(title);
 
         logger.debug("Profiling started.");