From 062bf190b88abd845c97b210b27de1ff5905a410 Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Thu, 24 Nov 2016 19:42:16 +0100 Subject: [PATCH] tst_dumpers: Restore compilation with MSVC We need to explicitly pass -MD when compiling source files. Unsetting QMAKE_CXXFLAGS_RELEASE under MSVC strips this flag. Error: watchdata.obj : error LNK2038: mismatch detected for 'RuntimeLibrary': value 'MT_StaticRelease' doesn't match value 'MD_DynamicRelease' in debuggerprotocol.obj watchutils.obj : error LNK2038: mismatch detected for 'RuntimeLibrary': value 'MT_StaticRelease' doesn't match value 'MD_DynamicRelease' in debuggerprotocol.obj tst_dumpers.obj : error LNK2038: mismatch detected for 'RuntimeLibrary': value 'MT_StaticRelease' doesn't match value 'MD_DynamicRelease' in debuggerprotocol.obj Follow-up on 0bf4bfcade0cc9f24b5b9a8a8a4a8811e8378b8e Change-Id: I4b63f23c6a0bb6330d30b5ffe894fa0ddcd74cab Reviewed-by: Christian Stenger Reviewed-by: hjk --- tests/auto/debugger/dumpers.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/debugger/dumpers.pro b/tests/auto/debugger/dumpers.pro index a22349dc04d..6385f42bbd8 100644 --- a/tests/auto/debugger/dumpers.pro +++ b/tests/auto/debugger/dumpers.pro @@ -42,4 +42,4 @@ INCLUDEPATH += $$DEBUGGERDIR # clang 3.5 does not like to optimize long functions. # likewise gcc 5.4 -QMAKE_CXXFLAGS_RELEASE = +clang|gcc: QMAKE_CXXFLAGS_RELEASE =