diff options
| author | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2016-07-05 14:46:14 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-08-08 09:48:33 +0000 |
| commit | 6aa3ba0a0b91bc38eb7ff282ef2511964dd99080 (patch) | |
| tree | f4b9cf8009f7bde6fe72552e75f86023f433f19c /mkspecs/features | |
| parent | ae190c24a0395e9d784b5b9c6c194d1fb89fbc82 (diff) | |
winrt: add vcruntime.lib to standard libs to link
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>
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/winrt/default_pre.prf | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/mkspecs/features/winrt/default_pre.prf b/mkspecs/features/winrt/default_pre.prf index 8299950d8b..f397ef3d61 100644 --- a/mkspecs/features/winrt/default_pre.prf +++ b/mkspecs/features/winrt/default_pre.prf @@ -1,12 +1,14 @@ *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 + # 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 an assertion failure + # 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): \ - QMAKE_LIBS = ucrtd.lib $$QMAKE_LIBS + QMAKE_LIBS = ucrtd.lib vcruntimed.lib $$QMAKE_LIBS else: \ - QMAKE_LIBS = ucrt.lib $$QMAKE_LIBS + QMAKE_LIBS = ucrt.lib vcruntime.lib $$QMAKE_LIBS } equals(TEMPLATE, "vcapp"): CONFIG += windeployqt |