diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-22 18:40:13 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-22 18:40:13 +0100 |
| commit | c608ec825410a9287f544a2ae3ce8154424e767d (patch) | |
| tree | 39ee3d73d1e970bf808ecb9f1af8affc124199e1 /config.tests/common | |
| parent | f5c6a5d06ba7b303f2999dd7a103c29282abfaa6 (diff) | |
| parent | 15a32435561a668e69764d12edfa2b5c564c6505 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/io/qsavefile_p.h
src/corelib/tools/qregularexpression.cpp
src/gui/util/qvalidator.cpp
src/gui/util/qvalidator.h
Change-Id: I58fdf0358bd86e2fad5d9ad0556f3d3f1f535825
Diffstat (limited to 'config.tests/common')
| -rw-r--r-- | config.tests/common/avx/avx.cpp | 2 | ||||
| -rw-r--r-- | config.tests/common/c++11/c++11.cpp | 2 | ||||
| -rw-r--r-- | config.tests/common/sse2/sse2.cpp | 2 | ||||
| -rw-r--r-- | config.tests/common/sse3/sse3.cpp | 2 | ||||
| -rw-r--r-- | config.tests/common/sse4_1/sse4_1.cpp | 2 | ||||
| -rw-r--r-- | config.tests/common/sse4_2/sse4_2.cpp | 2 | ||||
| -rw-r--r-- | config.tests/common/ssse3/ssse3.cpp | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/config.tests/common/avx/avx.cpp b/config.tests/common/avx/avx.cpp index 12761da083..77a7a37ec0 100644 --- a/config.tests/common/avx/avx.cpp +++ b/config.tests/common/avx/avx.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 config.tests of the Qt Toolkit. diff --git a/config.tests/common/c++11/c++11.cpp b/config.tests/common/c++11/c++11.cpp index 09c7c4cc9f..a14a26f81e 100644 --- a/config.tests/common/c++11/c++11.cpp +++ b/config.tests/common/c++11/c++11.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 FOO module of the Qt Toolkit. diff --git a/config.tests/common/sse2/sse2.cpp b/config.tests/common/sse2/sse2.cpp index 91369433ac..6a93916e4f 100644 --- a/config.tests/common/sse2/sse2.cpp +++ b/config.tests/common/sse2/sse2.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 config.tests of the Qt Toolkit. diff --git a/config.tests/common/sse3/sse3.cpp b/config.tests/common/sse3/sse3.cpp index be257230a7..dbae1bee81 100644 --- a/config.tests/common/sse3/sse3.cpp +++ b/config.tests/common/sse3/sse3.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 config.tests of the Qt Toolkit. diff --git a/config.tests/common/sse4_1/sse4_1.cpp b/config.tests/common/sse4_1/sse4_1.cpp index 89e9f72ea8..7746bb147b 100644 --- a/config.tests/common/sse4_1/sse4_1.cpp +++ b/config.tests/common/sse4_1/sse4_1.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 config.tests of the Qt Toolkit. diff --git a/config.tests/common/sse4_2/sse4_2.cpp b/config.tests/common/sse4_2/sse4_2.cpp index 2fe811b689..30a2cb8583 100644 --- a/config.tests/common/sse4_2/sse4_2.cpp +++ b/config.tests/common/sse4_2/sse4_2.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 config.tests of the Qt Toolkit. diff --git a/config.tests/common/ssse3/ssse3.cpp b/config.tests/common/ssse3/ssse3.cpp index 30e7885832..a9c13fe50a 100644 --- a/config.tests/common/ssse3/ssse3.cpp +++ b/config.tests/common/ssse3/ssse3.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 config.tests of the Qt Toolkit. |