diff options
| author | Maurice Kalinowski <maurice.kalinowski@theqtcompany.com> | 2015-08-06 15:08:39 +0200 |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@theqtcompany.com> | 2015-08-07 10:33:01 +0000 |
| commit | c8d3f939b4a2944dfee4a9e284cb3a3305229d42 (patch) | |
| tree | 6fd1eb05301fe0f4f6ae554965da26770cab974c /mkspecs/features | |
| parent | 7c8e95612e81e7beb0a665e5a617a6020c7d1953 (diff) | |
WinRT: Link against correct c-runtime
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>
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/winrt/default_pre.prf | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mkspecs/features/winrt/default_pre.prf b/mkspecs/features/winrt/default_pre.prf new file mode 100644 index 0000000000..44e3c94b8a --- /dev/null +++ b/mkspecs/features/winrt/default_pre.prf @@ -0,0 +1,12 @@ +*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) |