diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-03-08 10:40:49 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-03-08 10:40:49 +0100 |
commit | ccf12049b662fe1b03b5b0ea199d29b32f072eda (patch) | |
tree | 43e3d0042eb1f8ba23349e10c9c7e547fab57fec /src/core/core_gyp_generator.pro | |
parent | 56714be7d05afb94c63b658a4fdb2bedd1bee645 (diff) | |
parent | 471d484bea6b8b84749b8d89c603cb8394f1b5ee (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ieab3c4a6d16b1d7b7c0243ff8898f81807e7b1fc
Diffstat (limited to 'src/core/core_gyp_generator.pro')
-rw-r--r-- | src/core/core_gyp_generator.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro index 327ad9625..e04e34c5a 100644 --- a/src/core/core_gyp_generator.pro +++ b/src/core/core_gyp_generator.pro @@ -81,6 +81,7 @@ SOURCES = \ resource_bundle_qt.cpp \ resource_context_qt.cpp \ resource_dispatcher_host_delegate_qt.cpp \ + ssl_host_state_delegate_qt.cpp \ stream_video_node.cpp \ surface_factory_qt.cpp \ type_conversion.cpp \ @@ -160,6 +161,7 @@ HEADERS = \ renderer/web_channel_ipc_transport.h \ resource_context_qt.h \ resource_dispatcher_host_delegate_qt.h \ + ssl_host_state_delegate_qt.h \ stream_video_node.h \ surface_factory_qt.h \ type_conversion.h \ |