diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2011-01-20 11:38:03 +0100 |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2011-01-20 11:38:03 +0100 |
| commit | ef998bca70a799806c5754edfa49ea625881bc3e (patch) | |
| tree | 2f1ec89d331283cfe53c0cdf5e287683960953e0 /tests/auto/qwidget | |
| parent | 43f8762367fa6ffc228ae6e97192766475b02ac0 (diff) | |
| parent | 78a927cd7b93ae3fadd272cab9ee594a1369cea4 (diff) | |
Merge branch 'master-upstream' into master-water
Diffstat (limited to 'tests/auto/qwidget')
| -rw-r--r-- | tests/auto/qwidget/tst_qwidget.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qwidget/tst_qwidget_mac_helpers.h | 2 | ||||
| -rw-r--r-- | tests/auto/qwidget/tst_qwidget_mac_helpers.mm | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp index 826eac2e97..95c4ea6317 100644 --- a/tests/auto/qwidget/tst_qwidget.cpp +++ b/tests/auto/qwidget/tst_qwidget.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qwidget/tst_qwidget_mac_helpers.h b/tests/auto/qwidget/tst_qwidget_mac_helpers.h index f310aeffcf..029d8cd362 100644 --- a/tests/auto/qwidget/tst_qwidget_mac_helpers.h +++ b/tests/auto/qwidget/tst_qwidget_mac_helpers.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tests/auto/qwidget/tst_qwidget_mac_helpers.mm b/tests/auto/qwidget/tst_qwidget_mac_helpers.mm index 0572a4c5d0..ca34b1765a 100644 --- a/tests/auto/qwidget/tst_qwidget_mac_helpers.mm +++ b/tests/auto/qwidget/tst_qwidget_mac_helpers.mm @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** |