summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-02-24 11:02:28 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-02-24 11:02:28 +0100
commit704ee03ee308086a33c29197af50f06c719ab6eb (patch)
treeb40c110829f53f3f2d071e1f52be297936b70fb2 /tests
parented570c4835034bbdf36b74731da3d937d3063285 (diff)
parent054ac91744794142a7ec246836827bc5cbfa650f (diff)
downloadqtsvg-704ee03ee308086a33c29197af50f06c719ab6eb.tar.gz
Merge dev into 5.5
Change-Id: I5c60ab8323095915cf62e7309c98acd3fd3f8fcc
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/compilerwarnings/data/test_cpp.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/compilerwarnings/data/test_cpp.txt b/tests/auto/compilerwarnings/data/test_cpp.txt
index d120cf6..ed9a8f1 100644
--- a/tests/auto/compilerwarnings/data/test_cpp.txt
+++ b/tests/auto/compilerwarnings/data/test_cpp.txt
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
+** Copyright (C) 2015 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
**
** This file is part of the test suite of the Qt Toolkit.