diff options
Diffstat (limited to 'mkspecs/features/winrt/default_pre.prf')
| -rw-r--r-- | mkspecs/features/winrt/default_pre.prf | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/mkspecs/features/winrt/default_pre.prf b/mkspecs/features/winrt/default_pre.prf index f79d04ce41..8b9c1d7663 100644 --- a/mkspecs/features/winrt/default_pre.prf +++ b/mkspecs/features/winrt/default_pre.prf @@ -1,15 +1,13 @@ -*msvc2015|*msvc2017 { - # 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 vcruntimed.lib $$QMAKE_LIBS - else: \ - QMAKE_LIBS = ucrt.lib vcruntime.lib $$QMAKE_LIBS -} +# 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 vcruntimed.lib $$QMAKE_LIBS +else: \ + QMAKE_LIBS = ucrt.lib vcruntime.lib $$QMAKE_LIBS equals(TEMPLATE, "vcapp"): CONFIG += windeployqt |