summaryrefslogtreecommitdiffstats
path: root/tests/auto/qxmlsimplereader
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-01-13 18:55:05 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-01-13 18:55:05 (GMT)
commit7d1e48639d6d3897e66779f22fe02d17d6c38707 (patch)
tree7abc16568274e1f54c976f890e92d73f7a00160c /tests/auto/qxmlsimplereader
parent20e0e7a849d70139f9106f60c78fd0c736ec3c4b (diff)
parente1b03bac22f87edbbe78eba366966259be6eb0ed (diff)
downloadQt-7d1e48639d6d3897e66779f22fe02d17d6c38707.zip
Qt-7d1e48639d6d3897e66779f22fe02d17d6c38707.tar.gz
Qt-7d1e48639d6d3897e66779f22fe02d17d6c38707.tar.bz2
Merge branch '4.6'
Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
Diffstat (limited to 'tests/auto/qxmlsimplereader')
-rwxr-xr-xtests/auto/qxmlsimplereader/generate_ref_files.sh2
-rw-r--r--tests/auto/qxmlsimplereader/parser/main.cpp2
-rw-r--r--tests/auto/qxmlsimplereader/parser/parser.cpp2
-rw-r--r--tests/auto/qxmlsimplereader/parser/parser.h2
-rw-r--r--tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/qxmlsimplereader/generate_ref_files.sh b/tests/auto/qxmlsimplereader/generate_ref_files.sh
index 2fc2792..2f4fe2c 100755
--- a/tests/auto/qxmlsimplereader/generate_ref_files.sh
+++ b/tests/auto/qxmlsimplereader/generate_ref_files.sh
@@ -1,7 +1,7 @@
#!/bin/bash
#############################################################################
##
-## 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/tests/auto/qxmlsimplereader/parser/main.cpp b/tests/auto/qxmlsimplereader/parser/main.cpp
index 3eeae72..d4b1f0e 100644
--- a/tests/auto/qxmlsimplereader/parser/main.cpp
+++ b/tests/auto/qxmlsimplereader/parser/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/tests/auto/qxmlsimplereader/parser/parser.cpp b/tests/auto/qxmlsimplereader/parser/parser.cpp
index a166176..c9d4d00 100644
--- a/tests/auto/qxmlsimplereader/parser/parser.cpp
+++ b/tests/auto/qxmlsimplereader/parser/parser.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/tests/auto/qxmlsimplereader/parser/parser.h b/tests/auto/qxmlsimplereader/parser/parser.h
index d77bfe4..ebd91d4 100644
--- a/tests/auto/qxmlsimplereader/parser/parser.h
+++ b/tests/auto/qxmlsimplereader/parser/parser.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/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp b/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp
index 58f5cc1..0e57306 100644
--- a/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp
+++ b/tests/auto/qxmlsimplereader/tst_qxmlsimplereader.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)
**