diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-13 11:39:21 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-13 11:39:21 +0100 |
| commit | 3aca005d4721b82446922310496271ebe206a0d7 (patch) | |
| tree | f71298b19bd98c6b3751bc9009b2fdb49c2ad526 /tools/qtestlib/chart | |
| parent | 6088336d9237eaa94def8c2a83901b547e682abb (diff) | |
| parent | 48e08ee5718b3de855ecea626179ad5323e38fa0 (diff) | |
| download | qt4-tools-3aca005d4721b82446922310496271ebe206a0d7.tar.gz | |
Merge remote branch 'mainline/4.6' into 4.6
Conflicts:
tests/auto/linguist/lupdate/testlupdate.cpp
Diffstat (limited to 'tools/qtestlib/chart')
| -rw-r--r-- | tools/qtestlib/chart/database.cpp | 2 | ||||
| -rw-r--r-- | tools/qtestlib/chart/database.h | 2 | ||||
| -rw-r--r-- | tools/qtestlib/chart/main.cpp | 2 | ||||
| -rw-r--r-- | tools/qtestlib/chart/reportgenerator.cpp | 2 | ||||
| -rw-r--r-- | tools/qtestlib/chart/reportgenerator.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/tools/qtestlib/chart/database.cpp b/tools/qtestlib/chart/database.cpp index 2e1544865d..dfc0fc5fd6 100644 --- a/tools/qtestlib/chart/database.cpp +++ b/tools/qtestlib/chart/database.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tools/qtestlib/chart/database.h b/tools/qtestlib/chart/database.h index ccfdfd85a0..d9861adeb1 100644 --- a/tools/qtestlib/chart/database.h +++ b/tools/qtestlib/chart/database.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tools/qtestlib/chart/main.cpp b/tools/qtestlib/chart/main.cpp index 45a0a5c63c..14734d983f 100644 --- a/tools/qtestlib/chart/main.cpp +++ b/tools/qtestlib/chart/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tools/qtestlib/chart/reportgenerator.cpp b/tools/qtestlib/chart/reportgenerator.cpp index 6c8e938dc2..1ce362c726 100644 --- a/tools/qtestlib/chart/reportgenerator.cpp +++ b/tools/qtestlib/chart/reportgenerator.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/tools/qtestlib/chart/reportgenerator.h b/tools/qtestlib/chart/reportgenerator.h index dbf5a0c2fa..d44aea9ef9 100644 --- a/tools/qtestlib/chart/reportgenerator.h +++ b/tools/qtestlib/chart/reportgenerator.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** |