diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 11:27:37 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-01-26 11:27:37 +0000 |
| commit | 0a1af55a9b69f7fd58dbce43a0d4c1faf0143838 (patch) | |
| tree | 26da168e740734d168be37803abec2f8739b213d /config.tests | |
| parent | b8fb0ee999d32401157be8d86e5a03185aadbb9e (diff) | |
| parent | 158a3a4159bdc5a49caecd63e021dacbc06cf23c (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/common/atomic64/atomic64.cpp | 2 | ||||
| -rw-r--r-- | config.tests/common/c++11/c++11.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config.tests/common/atomic64/atomic64.cpp b/config.tests/common/atomic64/atomic64.cpp index 077936074d..3181caf15e 100644 --- a/config.tests/common/atomic64/atomic64.cpp +++ b/config.tests/common/atomic64/atomic64.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2016 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the FOO module of the Qt Toolkit. +** This file is part of the configuration of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/config.tests/common/c++11/c++11.cpp b/config.tests/common/c++11/c++11.cpp index d707dcf09b..88b67b5bff 100644 --- a/config.tests/common/c++11/c++11.cpp +++ b/config.tests/common/c++11/c++11.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the FOO module of the Qt Toolkit. +** This file is part of the configuration of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage |