c8d3f939b4
We need to move adding ucrt(d).lib out of the various qmake.conf as qmake.conf is only parsed once by qmake and does not differentiate between debug and release. Hence use default_pre.prf which is the earliest prf to use. This one also is being parsed multiple times and does what it is supposed to do. This allows API certification tests for Win10 to suceed, another sideeffect is that it is much cleaner at a single location now. Change-Id: Id899f4bbd063a3191c8f139857abf90efa827ffc Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
13 lines
402 B
Plaintext
13 lines
402 B
Plaintext
*msvc2015 {
|
|
# Note that the order is important, ucrt(d) has to be first
|
|
# Otherwise the linker might use malloc from a different library
|
|
# but free_dbg() from the runtime, causing assert when deleting
|
|
# items from different heaps
|
|
CONFIG(debug, debug|release): \
|
|
QMAKE_LIBS = ucrtd.lib $$QMAKE_LIBS
|
|
else: \
|
|
QMAKE_LIBS = ucrt.lib $$QMAKE_LIBS
|
|
}
|
|
|
|
load(default_pre)
|