diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-18 16:48:32 +0100 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-18 16:48:32 +0100 |
| commit | 4baa9dfb5273d7b501dcb3f456983262c53cc8d1 (patch) | |
| tree | af04bea96067fcb8c282067aea00703a25b52069 /src/testlib | |
| parent | 9eacc56619ce471a9777f88c89f64ca95cd6ae63 (diff) | |
| parent | c18beac8163634b48bbf1e7280923e96f5ef0a51 (diff) | |
| download | qt4-tools-4baa9dfb5273d7b501dcb3f456983262c53cc8d1.tar.gz | |
Merge remote branch 'origin/master' into qt-master-from-4.6
Conflicts:
src/corelib/codecs/qtextcodec.h
tests/auto/gestures/tst_gestures.cpp
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qbenchmarkmetric.h | 2 | ||||
| -rw-r--r-- | src/testlib/qbenchmarkmetric_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/testlib/qbenchmarkmetric.h b/src/testlib/qbenchmarkmetric.h index 302c1aadf0..18155277ac 100644 --- a/src/testlib/qbenchmarkmetric.h +++ b/src/testlib/qbenchmarkmetric.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/src/testlib/qbenchmarkmetric_p.h b/src/testlib/qbenchmarkmetric_p.h index c919d2e5ba..f0afc0412d 100644 --- a/src/testlib/qbenchmarkmetric_p.h +++ b/src/testlib/qbenchmarkmetric_p.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) ** |