From 7dd6becaa24272fff11d124660adb2506bac34c6 Mon Sep 17 00:00:00 2001
From: Leo <thinkabit.ukim@gmail.com>
Date: Thu, 9 May 2019 01:47:24 -0300
Subject: testing/qt-creator: upgrade to 4.9.0

---
 testing/qt-creator/fix-execinfo.patch | 56 ++++++++++++++++++++++++-----------
 1 file changed, 39 insertions(+), 17 deletions(-)

(limited to 'testing/qt-creator/fix-execinfo.patch')

diff --git a/testing/qt-creator/fix-execinfo.patch b/testing/qt-creator/fix-execinfo.patch
index 418ff73d5b..c3828c34b6 100644
--- a/testing/qt-creator/fix-execinfo.patch
+++ b/testing/qt-creator/fix-execinfo.patch
@@ -1,29 +1,51 @@
---- qt-creator-opensource-src-3.0.1/src/plugins/debugger/shared/backtrace.cpp.orig
-+++ qt-creator-opensource-src-3.0.1/src/plugins/debugger/shared/backtrace.cpp
-@@ -31,7 +31,7 @@
- #include <QDebug>
- #include <QProcess>
+--- a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp	2015-04-21 17:56:56.000000000 +0200
++++ b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp	2015-06-26 13:17:08.600350791 +0200
+@@ -31,7 +31,9 @@
+ #include "exception.h"
  
--#if defined(Q_OS_LINUX)
+ #ifdef Q_OS_LINUX
 +#if defined(__GLIBC__)
+ #include <execinfo.h>
++#endif
+ #include <cxxabi.h>
+ #endif
+ 
+@@ -107,6 +109,7 @@
+     m_file(file)
+ {
+ #ifdef Q_OS_LINUX
++#ifdef __GLIBC__
+     void * array[50];
+     int nSize = backtrace(array, 50);
+     char ** symbols = backtrace_symbols(array, nSize);
+@@ -118,6 +121,7 @@
+ 
+     free(symbols);
+ #endif
++#endif
+ 
+ if (s_shouldAssert)
+     Q_ASSERT_X(false, function.toUtf8(), QString("%1:%2 - %3").arg(file).arg(line).arg(function).toUtf8());
+--- a/src/plugins/debugger/shared/backtrace.cpp	2015-04-21 17:56:56.000000000 +0200
++++ b/src/plugins/debugger/shared/backtrace.cpp	2015-06-26 13:14:54.295358053 +0200
+@@ -35,8 +35,10 @@
+ #if defined(Q_OS_LINUX)
  #include <stdio.h>
  #include <signal.h>
++#if defined(__GLIBC__)
  #include <execinfo.h>
-@@ -44,7 +44,7 @@
+ #endif
++#endif
+ 
+ namespace Debugger {
+ namespace Internal {
+@@ -45,7 +47,7 @@
  {
      if (maxdepth == -1)
          maxdepth = 200;
 -#if defined(Q_OS_LINUX)
-+#if defined(__GLIBC__)
++#if defined(Q_OS_LINUX) && defined(__GLIBC__)
      void *bt[200] = {0};
      qDebug() << "BACKTRACE:";
      int size = backtrace(bt, sizeof(bt) / sizeof(bt[0]));
-@@ -71,7 +71,7 @@
- /*
- void installSignalHandlers()
- {
--#if defined(Q_OS_LINUX)
-+#if defined(__GLIBC__)
-     struct sigaction SignalAction;
- 
-     SignalAction.sa_sigaction = handler;
+
-- 
cgit v1.2.3