aboutsummaryrefslogtreecommitdiffstats
path: root/testing/qt-creator/fix-execinfo.patch
diff options
context:
space:
mode:
Diffstat (limited to 'testing/qt-creator/fix-execinfo.patch')
-rw-r--r--testing/qt-creator/fix-execinfo.patch22
1 files changed, 11 insertions, 11 deletions
diff --git a/testing/qt-creator/fix-execinfo.patch b/testing/qt-creator/fix-execinfo.patch
index b409a30afd..f9bf566222 100644
--- a/testing/qt-creator/fix-execinfo.patch
+++ b/testing/qt-creator/fix-execinfo.patch
@@ -1,6 +1,6 @@
---- a/src/plugins/debugger/shared/backtrace.cpp
-+++ b/src/plugins/debugger/shared/backtrace.cpp
-@@ -30,8 +30,10 @@
+--- a/src/libs/utils/qtcassert.cpp
++++ b/src/libs/utils/qtcassert.cpp
+@@ -31,8 +31,10 @@
#if defined(Q_OS_LINUX)
#include <stdio.h>
#include <signal.h>
@@ -8,18 +8,18 @@
#include <execinfo.h>
#endif
+#endif
-
- namespace Debugger {
- namespace Internal {
+
+ namespace Utils {
+
@@ -40,7 +42,7 @@ void dumpBacktrace(int maxdepth)
{
if (maxdepth == -1)
- maxdepth = 200;
--#if defined(Q_OS_LINUX)
-+#if defined(Q_OS_LINUX) && defined(__GLIBC__)
- void *bt[200] = {nullptr};
- qDebug() << "BACKTRACE:";
+ maxdepth = 1000;
+-#if defined(Q_OS_UNIX)
++#if defined(Q_OS_UNIX) && defined(__GLIBC__)
+ void *bt[1000] = {nullptr};
int size = backtrace(bt, sizeof(bt) / sizeof(bt[0]));
+ char **lines = backtrace_symbols(bt, size);
diff --git a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp
index a3a9806f7e..c369e681ab 100644
--- a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp