From 2c7bf3992ba079a632f0f5fdef64e6ca10eaf13f Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@digia.com>
Date: Fri, 22 Nov 2013 15:37:08 +0100
Subject: Avoid symbol clashes when linking QtDeclarative and QtScript
 statically

Re-define the three symbols we actually implement (as stubs).

Task-number: QTBUG-35041
Change-Id: Ie9511207440fa23645e52643881f5993177a4368
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
 src/3rdparty/masm/masm-defs.pri | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src')

diff --git a/src/3rdparty/masm/masm-defs.pri b/src/3rdparty/masm/masm-defs.pri
index 34c2e9f8de..95f1f60031 100644
--- a/src/3rdparty/masm/masm-defs.pri
+++ b/src/3rdparty/masm/masm-defs.pri
@@ -2,6 +2,11 @@
 
 DEFINES += WTF_EXPORT_PRIVATE="" JS_EXPORT_PRIVATE=""
 
+# Avoid symbol clashes with QtScript during static linking
+DEFINES += WTFReportAssertionFailure=qmlWTFReportAssertionFailure
+DEFINES += WTFReportBacktrace=qmlWTFReportBacktrace
+DEFINES += WTFInvokeCrashHook=qmlWTFInvokeCrashHook
+
 win*: DEFINES += NOMINMAX
 
 DEFINES += ENABLE_LLINT=0
-- 
cgit v1.2.3