summaryrefslogtreecommitdiffstats
path: root/src/core/common
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-09-29 15:08:36 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2017-09-29 15:08:36 +0000
commita6ca622baf9e4f6afee783fd87a6d3f245efd278 (patch)
treea04c866cdeef6a7fa48583d5f4bcf664e5088382 /src/core/common
parent24b5f01726351c6e6e925bfaf4c7575f469ad0d0 (diff)
parentfa12e9c1c3634696cf3e0754ab9c374456945efc (diff)
Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10
Diffstat (limited to 'src/core/common')
-rw-r--r--src/core/common/qt_messages.cpp2
-rw-r--r--src/core/common/qt_messages.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/common/qt_messages.cpp b/src/core/common/qt_messages.cpp
index 43c29ad93..d64db69c9 100644
--- a/src/core/common/qt_messages.cpp
+++ b/src/core/common/qt_messages.cpp
@@ -1,6 +1,6 @@
// Copyright (c) 2010 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.
// Get basic type definitions.
#define IPC_MESSAGE_IMPL
diff --git a/src/core/common/qt_messages.h b/src/core/common/qt_messages.h
index 00efa485e..fae80186b 100644
--- a/src/core/common/qt_messages.h
+++ b/src/core/common/qt_messages.h
@@ -1,6 +1,6 @@
// 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.
// Multiply-included file, no traditional include guard.