AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

winrt: add vcruntime.lib to standard libs to link

Browse Source 
This is required for projects compiled with CONFIG-=qt, which is not
supported so far, but is required for the new configure system.

Change-Id: I85d7de9105ff68c73e8a433a3c757864a619cce8
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Maurice Kalinowski 2016-07-05 14:46:14 +02:00 committed by Lars Knoll
parent ae190c24a0
commit 6aa3ba0a0b
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mkspecs/features/winrt/default_pre.prf
View File

@ -1,12 +1,14 @@
*msvc2015 { *msvc2015 {
# Note that the order is important, ucrt(d) has to be first # Note that the order is important - ucrt(d) has to be first.
# Otherwise the linker might use malloc from a different library # Otherwise, the linker might use malloc from a different library,
# but free_dbg() from the runtime, causing assert when deleting # but free_dbg() from the runtime, causing an assertion failure
# items from different heaps # due to deleting an item from a different heap.
# vcruntime(d) is necessary when we don't link to any libraries
# which would pull it in transitively.
CONFIG(debug, debug|release): \ CONFIG(debug, debug|release): \
QMAKE_LIBS = ucrtd.lib $$QMAKE_LIBS QMAKE_LIBS = ucrtd.lib vcruntimed.lib $$QMAKE_LIBS
else: \ else: \
QMAKE_LIBS = ucrt.lib $$QMAKE_LIBS QMAKE_LIBS = ucrt.lib vcruntime.lib $$QMAKE_LIBS
} }
equals(TEMPLATE, "vcapp"): CONFIG += windeployqt equals(TEMPLATE, "vcapp"): CONFIG += windeployqt