diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-18 09:47:34 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-18 10:08:28 +0200 |
| commit | e53ddd7b7ec0ca766557d947031820986f11b1a2 (patch) | |
| tree | 19f7d4c09af27da94bda2dd0ff647b1913b70a67 /src/core/qtwebengine.gypi | |
| parent | 13d03ef21d3bd67595bd0b36be7401f6e6bcbbd6 (diff) | |
| parent | dd7b409388949bc628af75a6e65474d699c416d3 (diff) | |
Merge branch '5.5' into 5.6
Change-Id: I9977663123560a22f493b8c02d02de8897b38666
Diffstat (limited to 'src/core/qtwebengine.gypi')
| -rw-r--r-- | src/core/qtwebengine.gypi | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/core/qtwebengine.gypi b/src/core/qtwebengine.gypi index 2c433f614..cad6882eb 100644 --- a/src/core/qtwebengine.gypi +++ b/src/core/qtwebengine.gypi @@ -26,6 +26,7 @@ '<(chromium_src_dir)/media/media.gyp:media', '<(chromium_src_dir)/net/net.gyp:net', '<(chromium_src_dir)/net/net.gyp:net_resources', + '<(chromium_src_dir)/net/net.gyp:net_with_v8', '<(chromium_src_dir)/skia/skia.gyp:skia', '<(chromium_src_dir)/third_party/WebKit/Source/web/web.gyp:blink_web', '<(chromium_src_dir)/ui/base/ui_base.gyp:ui_base', @@ -47,6 +48,9 @@ 'CHROMIUM_VERSION=\"<!(python <(version_script_location) -f <(chromium_src_dir)/chrome/VERSION -t "@MAJOR@.@MINOR@.@BUILD@.@PATCH@")\"', ], 'msvs_settings': { + 'VCCLCompilerTool': { + 'RuntimeTypeInfo': 'true', + }, 'VCLinkerTool': { 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS }, @@ -81,6 +85,11 @@ }, }, }], + ['qt_os=="win32" and qt_gl=="opengl"', { + 'include_dirs': [ + '<(chromium_src_dir)/third_party/khronos', + ], + }], ['OS=="win"', { 'resource_include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/webkit', |