summaryrefslogtreecommitdiffstats
path: root/tests/auto/moc
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-01-10 20:14:50 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-01-10 20:14:50 (GMT)
commit9ab069286660101e2a2a6b49587bc21a69339e77 (patch)
tree672da7b873d94069fd4c8de1fa300957d737809e /tests/auto/moc
parentf0b854bf5cfc6ec4715ff5f4aed3f0bd189d24ee (diff)
parent49257f86bdb090d97c387183e8f600bbb8a7eef3 (diff)
downloadQt-9ab069286660101e2a2a6b49587bc21a69339e77.zip
Qt-9ab069286660101e2a2a6b49587bc21a69339e77.tar.gz
Qt-9ab069286660101e2a2a6b49587bc21a69339e77.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QFont/Windows: restrict the pixel size accuracy Update copyright year to 2011. For non-developer builds, skip test that requires private API tst_qhttpnetworkconnection: Compile fix Change QHostInfoCache to use QElapsedTime instead of QTime. Fix for qtdemo bug
Diffstat (limited to 'tests/auto/moc')
-rw-r--r--tests/auto/moc/Test.framework/Headers/testinterface.h2
-rw-r--r--tests/auto/moc/assign-namespace.h2
-rw-r--r--tests/auto/moc/backslash-newlines.h2
-rw-r--r--tests/auto/moc/c-comments.h2
-rw-r--r--tests/auto/moc/cstyle-enums.h2
-rw-r--r--tests/auto/moc/dir-in-include-path.h2
-rw-r--r--tests/auto/moc/error-on-wrong-notify.h2
-rw-r--r--tests/auto/moc/escapes-in-string-literals.h2
-rw-r--r--tests/auto/moc/extraqualification.h2
-rw-r--r--tests/auto/moc/forgotten-qinterface.h2
-rw-r--r--tests/auto/moc/gadgetwithnoenums.h2
-rw-r--r--tests/auto/moc/interface-from-framework.h2
-rw-r--r--tests/auto/moc/macro-on-cmdline.h2
-rw-r--r--tests/auto/moc/namespaced-flags.h2
-rw-r--r--tests/auto/moc/no-keywords.h2
-rw-r--r--tests/auto/moc/oldstyle-casts.h2
-rw-r--r--tests/auto/moc/parse-boost.h2
-rw-r--r--tests/auto/moc/pure-virtual-signals.h2
-rw-r--r--tests/auto/moc/qinvokable.h2
-rw-r--r--tests/auto/moc/qprivateslots.h2
-rw-r--r--tests/auto/moc/single_function_keyword.h2
-rw-r--r--tests/auto/moc/slots-with-void-template.h2
-rw-r--r--tests/auto/moc/task189996.h2
-rw-r--r--tests/auto/moc/task192552.h2
-rw-r--r--tests/auto/moc/task234909.h2
-rw-r--r--tests/auto/moc/task240368.h2
-rw-r--r--tests/auto/moc/task87883.h2
-rw-r--r--tests/auto/moc/template-gtgt.h2
-rw-r--r--tests/auto/moc/testproject/Plugin/Plugin.h2
-rw-r--r--tests/auto/moc/trigraphs.h2
-rw-r--r--tests/auto/moc/tst_moc.cpp2
-rw-r--r--tests/auto/moc/using-namespaces.h2
-rw-r--r--tests/auto/moc/warn-on-multiple-qobject-subclasses.h2
-rw-r--r--tests/auto/moc/warn-on-property-without-read.h2
-rw-r--r--tests/auto/moc/win-newlines.h2
35 files changed, 35 insertions, 35 deletions
diff --git a/tests/auto/moc/Test.framework/Headers/testinterface.h b/tests/auto/moc/Test.framework/Headers/testinterface.h
index f0970c3..5b72ff0 100644
--- a/tests/auto/moc/Test.framework/Headers/testinterface.h
+++ b/tests/auto/moc/Test.framework/Headers/testinterface.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/moc/assign-namespace.h b/tests/auto/moc/assign-namespace.h
index a57f2ce..1b1e603 100644
--- a/tests/auto/moc/assign-namespace.h
+++ b/tests/auto/moc/assign-namespace.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/moc/backslash-newlines.h b/tests/auto/moc/backslash-newlines.h
index bb44d70..40c2018 100644
--- a/tests/auto/moc/backslash-newlines.h
+++ b/tests/auto/moc/backslash-newlines.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/moc/c-comments.h b/tests/auto/moc/c-comments.h
index b132776..c5be230 100644
--- a/tests/auto/moc/c-comments.h
+++ b/tests/auto/moc/c-comments.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/moc/cstyle-enums.h b/tests/auto/moc/cstyle-enums.h
index ec254a5..3e8b210 100644
--- a/tests/auto/moc/cstyle-enums.h
+++ b/tests/auto/moc/cstyle-enums.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/moc/dir-in-include-path.h b/tests/auto/moc/dir-in-include-path.h
index db545d7..37fc64b 100644
--- a/tests/auto/moc/dir-in-include-path.h
+++ b/tests/auto/moc/dir-in-include-path.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/moc/error-on-wrong-notify.h b/tests/auto/moc/error-on-wrong-notify.h
index 4b6284a..bc162a7 100644
--- a/tests/auto/moc/error-on-wrong-notify.h
+++ b/tests/auto/moc/error-on-wrong-notify.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/moc/escapes-in-string-literals.h b/tests/auto/moc/escapes-in-string-literals.h
index 6072cd3..ff15f18 100644
--- a/tests/auto/moc/escapes-in-string-literals.h
+++ b/tests/auto/moc/escapes-in-string-literals.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/moc/extraqualification.h b/tests/auto/moc/extraqualification.h
index 1c45041..2ae759f 100644
--- a/tests/auto/moc/extraqualification.h
+++ b/tests/auto/moc/extraqualification.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/moc/forgotten-qinterface.h b/tests/auto/moc/forgotten-qinterface.h
index e84f1a3..9bfc8ab 100644
--- a/tests/auto/moc/forgotten-qinterface.h
+++ b/tests/auto/moc/forgotten-qinterface.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/moc/gadgetwithnoenums.h b/tests/auto/moc/gadgetwithnoenums.h
index 4ab6225..c7b5113 100644
--- a/tests/auto/moc/gadgetwithnoenums.h
+++ b/tests/auto/moc/gadgetwithnoenums.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/moc/interface-from-framework.h b/tests/auto/moc/interface-from-framework.h
index 1599c44..b1536a9 100644
--- a/tests/auto/moc/interface-from-framework.h
+++ b/tests/auto/moc/interface-from-framework.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/moc/macro-on-cmdline.h b/tests/auto/moc/macro-on-cmdline.h
index 405e916..346c6ba 100644
--- a/tests/auto/moc/macro-on-cmdline.h
+++ b/tests/auto/moc/macro-on-cmdline.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/moc/namespaced-flags.h b/tests/auto/moc/namespaced-flags.h
index 0d74702..d2cdcaf 100644
--- a/tests/auto/moc/namespaced-flags.h
+++ b/tests/auto/moc/namespaced-flags.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/moc/no-keywords.h b/tests/auto/moc/no-keywords.h
index b125b3f..06e2006 100644
--- a/tests/auto/moc/no-keywords.h
+++ b/tests/auto/moc/no-keywords.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/moc/oldstyle-casts.h b/tests/auto/moc/oldstyle-casts.h
index 6db94c4..2616893 100644
--- a/tests/auto/moc/oldstyle-casts.h
+++ b/tests/auto/moc/oldstyle-casts.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/moc/parse-boost.h b/tests/auto/moc/parse-boost.h
index 2e4e0af..5866b9a 100644
--- a/tests/auto/moc/parse-boost.h
+++ b/tests/auto/moc/parse-boost.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/moc/pure-virtual-signals.h b/tests/auto/moc/pure-virtual-signals.h
index 2782646..1a992bf 100644
--- a/tests/auto/moc/pure-virtual-signals.h
+++ b/tests/auto/moc/pure-virtual-signals.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/moc/qinvokable.h b/tests/auto/moc/qinvokable.h
index 3d58398..5f7d9b6 100644
--- a/tests/auto/moc/qinvokable.h
+++ b/tests/auto/moc/qinvokable.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/moc/qprivateslots.h b/tests/auto/moc/qprivateslots.h
index be6d65a..4adc1a1 100644
--- a/tests/auto/moc/qprivateslots.h
+++ b/tests/auto/moc/qprivateslots.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/moc/single_function_keyword.h b/tests/auto/moc/single_function_keyword.h
index 822a60b..b3539c1 100644
--- a/tests/auto/moc/single_function_keyword.h
+++ b/tests/auto/moc/single_function_keyword.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/moc/slots-with-void-template.h b/tests/auto/moc/slots-with-void-template.h
index 9b3d637..f3169fa 100644
--- a/tests/auto/moc/slots-with-void-template.h
+++ b/tests/auto/moc/slots-with-void-template.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/moc/task189996.h b/tests/auto/moc/task189996.h
index 4c21fac..f4ab10c 100644
--- a/tests/auto/moc/task189996.h
+++ b/tests/auto/moc/task189996.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/moc/task192552.h b/tests/auto/moc/task192552.h
index c7db2bd..45b0c04 100644
--- a/tests/auto/moc/task192552.h
+++ b/tests/auto/moc/task192552.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/moc/task234909.h b/tests/auto/moc/task234909.h
index 210999d..9c5a380 100644
--- a/tests/auto/moc/task234909.h
+++ b/tests/auto/moc/task234909.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/moc/task240368.h b/tests/auto/moc/task240368.h
index 484cd35..3482b8c 100644
--- a/tests/auto/moc/task240368.h
+++ b/tests/auto/moc/task240368.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/moc/task87883.h b/tests/auto/moc/task87883.h
index a6491a7..55279c6 100644
--- a/tests/auto/moc/task87883.h
+++ b/tests/auto/moc/task87883.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/moc/template-gtgt.h b/tests/auto/moc/template-gtgt.h
index 35dea06..b8646b8 100644
--- a/tests/auto/moc/template-gtgt.h
+++ b/tests/auto/moc/template-gtgt.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/moc/testproject/Plugin/Plugin.h b/tests/auto/moc/testproject/Plugin/Plugin.h
index 350dcec..ee81fd8 100644
--- a/tests/auto/moc/testproject/Plugin/Plugin.h
+++ b/tests/auto/moc/testproject/Plugin/Plugin.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/moc/trigraphs.h b/tests/auto/moc/trigraphs.h
index 062b04d..fb5e167 100644
--- a/tests/auto/moc/trigraphs.h
+++ b/tests/auto/moc/trigraphs.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/moc/tst_moc.cpp b/tests/auto/moc/tst_moc.cpp
index bb23f49..3e15bde 100644
--- a/tests/auto/moc/tst_moc.cpp
+++ b/tests/auto/moc/tst_moc.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/moc/using-namespaces.h b/tests/auto/moc/using-namespaces.h
index 245d7a0..87f809d 100644
--- a/tests/auto/moc/using-namespaces.h
+++ b/tests/auto/moc/using-namespaces.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/moc/warn-on-multiple-qobject-subclasses.h b/tests/auto/moc/warn-on-multiple-qobject-subclasses.h
index 9f89f74..c535a20 100644
--- a/tests/auto/moc/warn-on-multiple-qobject-subclasses.h
+++ b/tests/auto/moc/warn-on-multiple-qobject-subclasses.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/moc/warn-on-property-without-read.h b/tests/auto/moc/warn-on-property-without-read.h
index 7675dae..c3ecbf0 100644
--- a/tests/auto/moc/warn-on-property-without-read.h
+++ b/tests/auto/moc/warn-on-property-without-read.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/moc/win-newlines.h b/tests/auto/moc/win-newlines.h
index 8ea810b..d6f23a1 100644
--- a/tests/auto/moc/win-newlines.h
+++ b/tests/auto/moc/win-newlines.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)
**