diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-08-27 20:20:34 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-08-27 22:29:28 +0000 |
| commit | 6d51697f1d4a5b1d0d57efca29a8d81a591567bd (patch) | |
| tree | b4cc5ab53bf3e8ce4c1ce02106f17df0bd8699e6 /mkspecs/features/winrt/default_pre.prf | |
| parent | 3fe645ecc9aaf4522183c39f5c9a78ebc1c90674 (diff) | |
| parent | afab1546a7665bac2a8d7a6452e6aea46bfd2127 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
Diffstat (limited to 'mkspecs/features/winrt/default_pre.prf')
| -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) |