diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-01-11 10:48:42 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-01-11 10:48:42 +0100 |
| commit | 4264061a20c6e1d42c043ada95b4e231df907d27 (patch) | |
| tree | 75b708195af7dd19949b0b047fefb7b56269ba17 /tests/auto/shared | |
| parent | 0a86cab635e66ba44dcf3866c698aa1d037acff9 (diff) | |
| parent | 00a062649b8aec20c3ac3f61aa72b1cdde43b055 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: If797ac58344b20e8de4379343131c097247ba2f2
Diffstat (limited to 'tests/auto/shared')
| -rw-r--r-- | tests/auto/shared/util.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/shared/util.h | 2 | ||||
| -rw-r--r-- | tests/auto/shared/visualtestutil.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/shared/visualtestutil.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/shared/util.cpp b/tests/auto/shared/util.cpp index cd3e604c..e9e58993 100644 --- a/tests/auto/shared/util.cpp +++ b/tests/auto/shared/util.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. diff --git a/tests/auto/shared/util.h b/tests/auto/shared/util.h index fa934b34..4295d798 100644 --- a/tests/auto/shared/util.h +++ b/tests/auto/shared/util.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. diff --git a/tests/auto/shared/visualtestutil.cpp b/tests/auto/shared/visualtestutil.cpp index 071abca1..60b8790d 100644 --- a/tests/auto/shared/visualtestutil.cpp +++ b/tests/auto/shared/visualtestutil.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. diff --git a/tests/auto/shared/visualtestutil.h b/tests/auto/shared/visualtestutil.h index c67e5bdc..12f955ea 100644 --- a/tests/auto/shared/visualtestutil.h +++ b/tests/auto/shared/visualtestutil.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. |