From 2cbeacd2cd1a32fda5ef7705e270c71b2ed3c369 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 16 Sep 2020 15:33:20 +0200 Subject: qmake: Support multiple /MERGE:from=to options in MSVC generator Any but the last /MERGE:from=to option passed to QMAKE_LFLAGS was ignored. Now, the first options gets a tag and all further options are added as AdditionalOptions, because vcxproj files / the VS property editor do not support multiple MergeSections entries. Pick-to: 5.15 Fixes: QTBUG-86062 Change-Id: I65bddf0b8c7ed6c162008d6ad1b58c2aba2d07d9 Reviewed-by: Kai Koehne --- qmake/generators/win32/msvc_objectmodel.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'qmake/generators') diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index eacf9a0e5e..cf4e2445b1 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -1625,7 +1625,13 @@ bool VCLinkerTool::parseOption(const char* option) MapLines = _True; break; case 0x341a6b5: // /MERGE:from=to - MergeSections = option+7; + if (MergeSections.isEmpty()) { + MergeSections = option+7; + } else { + // vcxproj files / the VS property editor do not support multiple MergeSections entries. + // Add them as additional options. + AdditionalOptions += option; + } break; case 0x0341d8c: // /MIDL:@file MidlCommandFile = option+7; -- cgit v1.2.3