diff options
-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) { |