diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-11-22 15:37:08 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-22 22:33:29 +0100 |
| commit | 2c7bf3992ba079a632f0f5fdef64e6ca10eaf13f (patch) | |
| tree | b6dccc25b0d923d7c5286aad43a269cde0fe6e96 /src/3rdparty/masm/masm-defs.pri | |
| parent | 475879b6fe994ba93423317204c05cb377df357c (diff) | |
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>
Diffstat (limited to 'src/3rdparty/masm/masm-defs.pri')
| -rw-r--r-- | src/3rdparty/masm/masm-defs.pri | 5 |
1 files changed, 5 insertions, 0 deletions
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 |