diff options
| author | Johanna Aijala <johanna.aijala@digia.com> | 2013-02-21 09:17:06 +0200 |
|---|---|---|
| committer | Johanna Aijala <johanna.aijala@digia.com> | 2013-02-21 09:21:34 +0200 |
| commit | d9e4b5c1820e62700756ede2ef5290baccc3c1b2 (patch) | |
| tree | cc6975c1bd3ea86e4b7e5373560603e5165b7ff4 /tests/auto/shared | |
| parent | f4d4689d3c09cb4eae30be892be426d4fa185ed4 (diff) | |
| parent | fb7ab18fa799032f37fd6f78ab34b76aff91ed6c (diff) | |
Merge branch 'stable' into release
Change-Id: I13e80072db1e2c14a37b6a123276be81b085e87e
Diffstat (limited to 'tests/auto/shared')
| -rw-r--r-- | tests/auto/shared/platforminputcontext.h | 2 | ||||
| -rw-r--r-- | tests/auto/shared/platformquirks.h | 2 | ||||
| -rw-r--r-- | tests/auto/shared/testhttpserver.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/shared/testhttpserver.h | 2 | ||||
| -rw-r--r-- | tests/auto/shared/util.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/shared/util.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/shared/platforminputcontext.h b/tests/auto/shared/platforminputcontext.h index aaabf4d941..76f3b704de 100644 --- a/tests/auto/shared/platforminputcontext.h +++ b/tests/auto/shared/platforminputcontext.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. diff --git a/tests/auto/shared/platformquirks.h b/tests/auto/shared/platformquirks.h index 2f543f3784..b03e4d63f6 100644 --- a/tests/auto/shared/platformquirks.h +++ b/tests/auto/shared/platformquirks.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. diff --git a/tests/auto/shared/testhttpserver.cpp b/tests/auto/shared/testhttpserver.cpp index 3bded63c33..461e0e70d2 100644 --- a/tests/auto/shared/testhttpserver.cpp +++ b/tests/auto/shared/testhttpserver.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. diff --git a/tests/auto/shared/testhttpserver.h b/tests/auto/shared/testhttpserver.h index f7eb6a2961..1abf37e438 100644 --- a/tests/auto/shared/testhttpserver.h +++ b/tests/auto/shared/testhttpserver.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. diff --git a/tests/auto/shared/util.cpp b/tests/auto/shared/util.cpp index eaefb1f9d6..e0b14d60e1 100644 --- a/tests/auto/shared/util.cpp +++ b/tests/auto/shared/util.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** 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 eff54b30d9..dc93038251 100644 --- a/tests/auto/shared/util.h +++ b/tests/auto/shared/util.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. |