Joerg Bornemann 2cbeacd2cd 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 <MergeSections> 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 <kai.koehne@qt.io>		2020-09-18 18:48:58 +00:00
..
mac	iOS: Add a variable to customize where the launch image is taken from	2020-07-22 00:42:36 +02:00
unix	Use QList instead of QVector in qmake	2020-09-05 07:07:44 +02:00
win32	qmake: Support multiple /MERGE:from=to options in MSVC generator	2020-09-18 18:48:58 +00:00
makefile.cpp	Use QList instead of QVector in qmake	2020-09-05 07:07:44 +02:00
makefile.h	MinGW: Use a response file for long include paths	2020-07-06 13:41:37 +00:00
makefiledeps.cpp	Use QList instead of QVector in qmake	2020-09-05 07:07:44 +02:00
makefiledeps.h	Use QList instead of QVector in qmake	2020-09-05 07:07:44 +02:00
metamakefile.cpp	Use QList instead of QVector in qmake	2020-09-05 07:07:44 +02:00
metamakefile.h	qmake: Apply modernize-use-nullptr	2018-08-08 17:30:32 +00:00
projectgenerator.cpp	Use QList instead of QVector in qmake	2020-09-05 07:07:44 +02:00
projectgenerator.h	Merge remote-tracking branch 'origin/5.13' into dev	2019-06-14 13:45:18 +02:00
xmloutput.cpp	Use qsizetype in QList	2020-07-06 21:31:14 +02:00
xmloutput.h