diff options
| author | Vladyslav Brovko <brovushkin+qt@gmail.com> | 2017-09-07 10:59:28 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-09-07 15:21:07 +0000 |
| commit | 685ad676a84bf48602a5da8f7171792686b94a73 (patch) | |
| tree | 54a2e5bc70fb47cbb602f826867a25ffa533813d /src/3rdparty | |
| parent | bb72fddebcf5ef6bed9d9c77d2317383a2a096ce (diff) | |
Fix symbol clash with QtScript when linking statically
Task-number: QTBUG-63050
Change-Id: I18c8cfae3cc4d8a6d2c82515541693b7b5194f76
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/masm-defs.pri | 1 | ||||
| -rw-r--r-- | src/3rdparty/masm/stubs/WTFStubs.cpp | 5 |
2 files changed, 6 insertions, 0 deletions
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 diff --git a/src/3rdparty/masm/stubs/WTFStubs.cpp b/src/3rdparty/masm/stubs/WTFStubs.cpp index 610b632baf..ea7e2d78e0 100644 --- a/src/3rdparty/masm/stubs/WTFStubs.cpp +++ b/src/3rdparty/masm/stubs/WTFStubs.cpp @@ -112,6 +112,11 @@ void dataLogFString(const char* str) } extern "C" { +// When adding a new stub here do not forget to add +// DEFINES += StubFunctionName=qmlStubFunctionName +// for example: +// DEFINES += WTFReportAssertionFailureWithMessage=qmlWTFReportAssertionFailureWithMessage +// to prevent "duplicate symbol" error during static library linking. See bugs QTBUG-35041 and QTBUG-63050 void WTFReportAssertionFailure(const char* file, int line, const char* function, const char*assertion) { |