diff options
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
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; |