From ac76b2424d323ad7eed0238116366587b742d93f Mon Sep 17 00:00:00 2001 From: Sami Nurmenniemi Date: Thu, 6 Apr 2017 15:44:48 +0300 Subject: [PATCH] tst_qmessagehandler: fix qMessagePattern for arm Backtrace logging tests were not passing for arm. Added compile option -funwind-tables to support backtrace on arm. Task-number: QTBUG-59966 Change-Id: I5e2443b1e3a644a239dab68db990e75ae8fade24 Reviewed-by: Thiago Macieira --- tests/auto/corelib/global/qlogging/app/app.pro | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/auto/corelib/global/qlogging/app/app.pro b/tests/auto/corelib/global/qlogging/app/app.pro index 8ada04acdc..6fba1b6129 100644 --- a/tests/auto/corelib/global/qlogging/app/app.pro +++ b/tests/auto/corelib/global/qlogging/app/app.pro @@ -11,5 +11,7 @@ CONFIG += console SOURCES += main.cpp DEFINES += QT_MESSAGELOGCONTEXT -gcc:!mingw:!haiku: QMAKE_LFLAGS += -rdynamic - +gcc:!mingw:!haiku { + QMAKE_LFLAGS += -rdynamic + contains(QT_ARCH, arm): QMAKE_CXXFLAGS += -funwind-tables +}