diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-04-15 14:23:27 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-15 17:03:28 +0200 |
| commit | 5929f6c47c19b16af1803f24cea960b57cc460eb (patch) | |
| tree | 24eb5438023762e2348bd7aa7f54512fc1f89968 | |
| parent | beb4ff332ca5b8406a75e8b2146464c5b0a81abd (diff) | |
Windows: Use the runtime library the same way as Qt
Using a custom allocator prevents us from allocating memory in Chromium
cc files and freeing it in our code. Always use the normal CRT heap
allocator to allow this.
This also makes sure that we use the same /M flags for Chromium
translation units as for Qt when dynamically linked. We won't support
statically linking QtWebEngine at first anyway.
Change-Id: Ifa044c7d3cf39929f7e4ca1c4c4cb3a9dea96266
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
| -rw-r--r-- | src/core/qtwebengine_extras.gypi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/qtwebengine_extras.gypi b/src/core/qtwebengine_extras.gypi index c27cd70d0..51f8c61f0 100644 --- a/src/core/qtwebengine_extras.gypi +++ b/src/core/qtwebengine_extras.gypi @@ -2,6 +2,9 @@ 'variables': { 'werror%': '', 'qt_os%': '', + 'win_use_allocator_shim': 0, + 'win_release_RuntimeLibrary': 2, + 'win_debug_RuntimeLibrary': 3, }, 'target_defaults': { # patterns used to exclude chromium files from the build when we have a drop-in replacement |