From 685ad676a84bf48602a5da8f7171792686b94a73 Mon Sep 17 00:00:00 2001 From: Vladyslav Brovko Date: Thu, 7 Sep 2017 10:59:28 +0200 Subject: Fix symbol clash with QtScript when linking statically Task-number: QTBUG-63050 Change-Id: I18c8cfae3cc4d8a6d2c82515541693b7b5194f76 Reviewed-by: Simon Hausmann --- src/3rdparty/masm/masm-defs.pri | 1 + 1 file changed, 1 insertion(+) (limited to 'src/3rdparty/masm/masm-defs.pri') diff --git a/src/3rdparty/masm/masm-defs.pri b/src/3rdparty/masm/masm-defs.pri index c0c5f3d114..34d6a67451 100644 --- a/src/3rdparty/masm/masm-defs.pri +++ b/src/3rdparty/masm/masm-defs.pri @@ -3,6 +3,7 @@ DEFINES += ENABLE_ASSEMBLER_WX_EXCLUSIVE=1 # Avoid symbol clashes with QtScript during static linking DEFINES += WTFReportAssertionFailure=qmlWTFReportAssertionFailure +DEFINES += WTFReportAssertionFailureWithMessage=qmlWTFReportAssertionFailureWithMessage DEFINES += WTFReportBacktrace=qmlWTFReportBacktrace DEFINES += WTFInvokeCrashHook=qmlWTFInvokeCrashHook -- cgit v1.2.3