diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-07-06 11:40:44 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-07-06 11:45:46 +0200 |
| commit | b3f7d3a62e00e611e8d7f592ae048a9536b635c6 (patch) | |
| tree | e88ce4289a42dbfcc828fab1f96dbabbf1572725 /src/core/core_gyp_generator.pro | |
| parent | c0d5f7e6c10e56777b025b83a1fc53c610927714 (diff) | |
| parent | 80a2497207b3824852578df63b30d8af4ee800a3 (diff) | |
Merge Chromium 44 and fixes
Bumbs the Chromium version to 44 and merges the 'wip/44-based' branch,
which contains all the patches to build against Chromium 44.
Change-Id: If03dd301cb2a5cf7da3fe0a92ce1134f1239bf00
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 90d748c4b..b878fdc9f 100644 --- a/src/core/core_gyp_generator.pro +++ b/src/core/core_gyp_generator.pro @@ -58,6 +58,7 @@ SOURCES = \ native_web_keyboard_event_qt.cpp \ network_delegate_qt.cpp \ ozone_platform_eglfs.cpp \ + permission_manager_qt.cpp \ process_main.cpp \ proxy_config_service_qt.cpp \ proxy_resolver_qt.cpp \ @@ -129,6 +130,7 @@ HEADERS = \ media_capture_devices_dispatcher.h \ network_delegate_qt.h \ ozone_platform_eglfs.h \ + permission_manager_qt.h \ process_main.h \ proxy_config_service_qt.h \ proxy_resolver_qt.h \ |