diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-29 15:08:36 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-09-29 15:08:36 +0000 |
commit | a6ca622baf9e4f6afee783fd87a6d3f245efd278 (patch) | |
tree | a04c866cdeef6a7fa48583d5f4bcf664e5088382 /src/core/renderer_host | |
parent | 24b5f01726351c6e6e925bfaf4c7575f469ad0d0 (diff) | |
parent | fa12e9c1c3634696cf3e0754ab9c374456945efc (diff) |
Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10
Diffstat (limited to 'src/core/renderer_host')
4 files changed, 4 insertions, 4 deletions
diff --git a/src/core/renderer_host/pepper/pepper_flash_browser_host_qt.cpp b/src/core/renderer_host/pepper/pepper_flash_browser_host_qt.cpp index 4427a67f2..d54a9cdf2 100644 --- a/src/core/renderer_host/pepper/pepper_flash_browser_host_qt.cpp +++ b/src/core/renderer_host/pepper/pepper_flash_browser_host_qt.cpp @@ -40,7 +40,7 @@ // This is based on chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc: // Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// found in the LICENSE.Chromium file. #include "pepper_flash_browser_host_qt.h" diff --git a/src/core/renderer_host/pepper/pepper_host_factory_qt.cpp b/src/core/renderer_host/pepper/pepper_host_factory_qt.cpp index 4a25e7756..46cd16751 100644 --- a/src/core/renderer_host/pepper/pepper_host_factory_qt.cpp +++ b/src/core/renderer_host/pepper/pepper_host_factory_qt.cpp @@ -40,7 +40,7 @@ // This is based on chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc: // Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// found in the LICENSE.Chromium file. #include "pepper_host_factory_qt.h" diff --git a/src/core/renderer_host/pepper/pepper_isolated_file_system_message_filter.cpp b/src/core/renderer_host/pepper/pepper_isolated_file_system_message_filter.cpp index 8ebc74486..2c8b1246a 100644 --- a/src/core/renderer_host/pepper/pepper_isolated_file_system_message_filter.cpp +++ b/src/core/renderer_host/pepper/pepper_isolated_file_system_message_filter.cpp @@ -40,7 +40,7 @@ // This is based on chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc: // Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// found in the LICENSE.Chromium file. #include "pepper_isolated_file_system_message_filter.h" diff --git a/src/core/renderer_host/resource_dispatcher_host_delegate_qt.cpp b/src/core/renderer_host/resource_dispatcher_host_delegate_qt.cpp index afc2ea8fa..bf61f1851 100644 --- a/src/core/renderer_host/resource_dispatcher_host_delegate_qt.cpp +++ b/src/core/renderer_host/resource_dispatcher_host_delegate_qt.cpp @@ -39,7 +39,7 @@ // Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. +// found in the LICENSE.Chromium file. #include "resource_dispatcher_host_delegate_qt.h" |