summaryrefslogtreecommitdiffstats
path: root/tests/auto/qscriptvaluegenerated
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2011-03-24 09:27:07 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2011-03-24 09:27:07 (GMT)
commitce80b75964ba5b1071112eb9bc04977da8079b23 (patch)
treee6fc4154aecc3581b9720d2f4482e97f3ecb3f49 /tests/auto/qscriptvaluegenerated
parentfdeeaa9d61efea9cca783a1d4098ae505df24390 (diff)
parent295fbcba490712fe6e6f61926836920366134b55 (diff)
downloadQt-ce80b75964ba5b1071112eb9bc04977da8079b23.zip
Qt-ce80b75964ba5b1071112eb9bc04977da8079b23.tar.gz
Qt-ce80b75964ba5b1071112eb9bc04977da8079b23.tar.bz2
Merge branch 'master-upstream'
Diffstat (limited to 'tests/auto/qscriptvaluegenerated')
-rw-r--r--tests/auto/qscriptvaluegenerated/testgen/testgenerator.h2
-rw-r--r--tests/auto/qscriptvaluegenerated/tst_qscriptvalue.cpp2
-rw-r--r--tests/auto/qscriptvaluegenerated/tst_qscriptvalue.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qscriptvaluegenerated/testgen/testgenerator.h b/tests/auto/qscriptvaluegenerated/testgen/testgenerator.h
index 1c61fc5..be4f79f 100644
--- a/tests/auto/qscriptvaluegenerated/testgen/testgenerator.h
+++ b/tests/auto/qscriptvaluegenerated/testgen/testgenerator.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/qscriptvaluegenerated/tst_qscriptvalue.cpp b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue.cpp
index 962a2af..529558f 100644
--- a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue.cpp
+++ b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue.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/qscriptvaluegenerated/tst_qscriptvalue.h b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue.h
index 8248ef3..f625399 100644
--- a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue.h
+++ b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue.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)
**