Merge commit 'origin/4.6' into oslo1-master

Conflicts:
	doc/src/deployment/deployment.qdoc
	doc/src/getting-started/installation.qdoc
	examples/assistant/simpletextviewer/findfiledialog.cpp
	examples/assistant/simpletextviewer/findfiledialog.h
	examples/assistant/simpletextviewer/mainwindow.cpp
	examples/webkit/fancybrowser/main.cpp
	src/corelib/global/qglobal.h
	src/gui/dialogs/qfiledialog_win.cpp
	src/plugins/qpluginbase.pri
	src/qbase.pri
	tests/auto/selftests/expected_cmptest.txt
	tests/auto/selftests/expected_crashes_3.txt
	tests/auto/selftests/expected_longstring.txt
	tests/auto/selftests/expected_maxwarnings.txt
	tests/auto/selftests/expected_skip.txt
	tools/assistant/compat/config.cpp
	tools/assistant/compat/config.h
	tools/assistant/compat/docuparser.cpp
	tools/assistant/compat/docuparser.h
	tools/assistant/compat/fontsettingsdialog.cpp
	tools/assistant/compat/helpdialog.cpp
	tools/assistant/compat/helpdialog.h
	tools/assistant/compat/helpdialog.ui
	tools/assistant/compat/helpwindow.cpp
	tools/assistant/compat/helpwindow.h
	tools/assistant/compat/index.cpp
	tools/assistant/compat/index.h
	tools/assistant/compat/lib/qassistantclient.cpp
	tools/assistant/compat/lib/qassistantclient.h
	tools/assistant/compat/main.cpp
	tools/assistant/compat/mainwindow.cpp
	tools/assistant/compat/mainwindow.h
	tools/assistant/compat/mainwindow.ui
	tools/assistant/compat/profile.cpp
	tools/assistant/compat/profile.h
	tools/assistant/compat/tabbedbrowser.cpp
	tools/assistant/compat/tabbedbrowser.h
	tools/assistant/compat/tabbedbrowser.ui
	tools/assistant/compat/topicchooser.cpp
	tools/assistant/compat/topicchooser.ui
	tools/assistant/lib/qhelpsearchquerywidget.cpp
	tools/assistant/tools/assistant/centralwidget.cpp
	tools/assistant/tools/assistant/doc/assistant.qdocconf
	tools/assistant/tools/assistant/helpviewer.cpp
	tools/linguist/lupdate/main.cpp
	tools/qdoc3/test/assistant.qdocconf
	tools/qdoc3/test/designer.qdocconf
	tools/qdoc3/test/linguist.qdocconf
	tools/qdoc3/test/qmake.qdocconf
	tools/qdoc3/test/qt-build-docs.qdocconf
	tools/qdoc3/test/qt.qdocconf

34 files changed, 35 insertions, 35 deletions

diff --git a/src/xmlpatterns/environment/createReportContext.sh b/src/xmlpatterns/environment/createReportContext.sh
index f3c3d07..570b1ee 100755
--- a/src/xmlpatterns/environment/createReportContext.sh
+++ b/src/xmlpatterns/environment/createReportContext.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #############################################################################
 ##
-## 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/xmlpatterns/environment/createReportContext.xsl b/src/xmlpatterns/environment/createReportContext.xsl
index 3503410..1b0d84e 100644
--- a/src/xmlpatterns/environment/createReportContext.xsl
+++ b/src/xmlpatterns/environment/createReportContext.xsl
@@ -2,7 +2,7 @@
 <!--
 /****************************************************************************
 **
-** 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)
 **
@@ -91,7 +91,7 @@ NOTE: Be aware of binary compatibility when using this stylesheet.
 <xsl:template match="/"><xsl:text disable-output-escaping="yes"
 ><![CDATA[/****************************************************************************
 **
-** 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/xmlpatterns/environment/qcurrentitemcontext.cpp b/src/xmlpatterns/environment/qcurrentitemcontext.cpp
index 89eb871..e0fe8eb 100644
--- a/src/xmlpatterns/environment/qcurrentitemcontext.cpp
+++ b/src/xmlpatterns/environment/qcurrentitemcontext.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/src/xmlpatterns/environment/qcurrentitemcontext_p.h b/src/xmlpatterns/environment/qcurrentitemcontext_p.h
index 0936dfe..0c59edc 100644
--- a/src/xmlpatterns/environment/qcurrentitemcontext_p.h
+++ b/src/xmlpatterns/environment/qcurrentitemcontext_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)
 **
diff --git a/src/xmlpatterns/environment/qdelegatingdynamiccontext.cpp b/src/xmlpatterns/environment/qdelegatingdynamiccontext.cpp
index 99a4c19..a3eb260 100644
--- a/src/xmlpatterns/environment/qdelegatingdynamiccontext.cpp
+++ b/src/xmlpatterns/environment/qdelegatingdynamiccontext.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/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h b/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h
index 7d0347b..dd74f34 100644
--- a/src/xmlpatterns/environment/qdelegatingdynamiccontext_p.h
+++ b/src/xmlpatterns/environment/qdelegatingdynamiccontext_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)
 **
diff --git a/src/xmlpatterns/environment/qdelegatingstaticcontext.cpp b/src/xmlpatterns/environment/qdelegatingstaticcontext.cpp
index babdb3d..d34126b 100644
--- a/src/xmlpatterns/environment/qdelegatingstaticcontext.cpp
+++ b/src/xmlpatterns/environment/qdelegatingstaticcontext.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/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h b/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h
index 050c2ea..bd08cef 100644
--- a/src/xmlpatterns/environment/qdelegatingstaticcontext_p.h
+++ b/src/xmlpatterns/environment/qdelegatingstaticcontext_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)
 **
diff --git a/src/xmlpatterns/environment/qdynamiccontext.cpp b/src/xmlpatterns/environment/qdynamiccontext.cpp
index 488c52d..17901ee 100644
--- a/src/xmlpatterns/environment/qdynamiccontext.cpp
+++ b/src/xmlpatterns/environment/qdynamiccontext.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/src/xmlpatterns/environment/qdynamiccontext_p.h b/src/xmlpatterns/environment/qdynamiccontext_p.h
index df2c254..bd95295 100644
--- a/src/xmlpatterns/environment/qdynamiccontext_p.h
+++ b/src/xmlpatterns/environment/qdynamiccontext_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)
 **
diff --git a/src/xmlpatterns/environment/qfocus.cpp b/src/xmlpatterns/environment/qfocus.cpp
index 2feea2f..ceef1bc 100644
--- a/src/xmlpatterns/environment/qfocus.cpp
+++ b/src/xmlpatterns/environment/qfocus.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/src/xmlpatterns/environment/qfocus_p.h b/src/xmlpatterns/environment/qfocus_p.h
index 0c65d54..5711422 100644
--- a/src/xmlpatterns/environment/qfocus_p.h
+++ b/src/xmlpatterns/environment/qfocus_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)
 **
diff --git a/src/xmlpatterns/environment/qgenericdynamiccontext.cpp b/src/xmlpatterns/environment/qgenericdynamiccontext.cpp
index fe0da6fa..7c843bc 100644
--- a/src/xmlpatterns/environment/qgenericdynamiccontext.cpp
+++ b/src/xmlpatterns/environment/qgenericdynamiccontext.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/src/xmlpatterns/environment/qgenericdynamiccontext_p.h b/src/xmlpatterns/environment/qgenericdynamiccontext_p.h
index 72bfa50..cdbf0a4 100644
--- a/src/xmlpatterns/environment/qgenericdynamiccontext_p.h
+++ b/src/xmlpatterns/environment/qgenericdynamiccontext_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)
 **
diff --git a/src/xmlpatterns/environment/qgenericstaticcontext.cpp b/src/xmlpatterns/environment/qgenericstaticcontext.cpp
index 4ed0171..63d7dd3 100644
--- a/src/xmlpatterns/environment/qgenericstaticcontext.cpp
+++ b/src/xmlpatterns/environment/qgenericstaticcontext.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/src/xmlpatterns/environment/qgenericstaticcontext_p.h b/src/xmlpatterns/environment/qgenericstaticcontext_p.h
index f087549..3c773c7 100644
--- a/src/xmlpatterns/environment/qgenericstaticcontext_p.h
+++ b/src/xmlpatterns/environment/qgenericstaticcontext_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)
 **
diff --git a/src/xmlpatterns/environment/qreceiverdynamiccontext.cpp b/src/xmlpatterns/environment/qreceiverdynamiccontext.cpp
index 21f8379..903e8d5 100644
--- a/src/xmlpatterns/environment/qreceiverdynamiccontext.cpp
+++ b/src/xmlpatterns/environment/qreceiverdynamiccontext.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/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h b/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h
index 6c19941..8745193 100644
--- a/src/xmlpatterns/environment/qreceiverdynamiccontext_p.h
+++ b/src/xmlpatterns/environment/qreceiverdynamiccontext_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)
 **
diff --git a/src/xmlpatterns/environment/qreportcontext.cpp b/src/xmlpatterns/environment/qreportcontext.cpp
index b76f43f..220e0a3 100644
--- a/src/xmlpatterns/environment/qreportcontext.cpp
+++ b/src/xmlpatterns/environment/qreportcontext.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/src/xmlpatterns/environment/qreportcontext_p.h b/src/xmlpatterns/environment/qreportcontext_p.h
index 20e1525..0600805 100644
--- a/src/xmlpatterns/environment/qreportcontext_p.h
+++ b/src/xmlpatterns/environment/qreportcontext_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)
 **
diff --git a/src/xmlpatterns/environment/qstackcontextbase.cpp b/src/xmlpatterns/environment/qstackcontextbase.cpp
index 1cdba65..198ace1 100644
--- a/src/xmlpatterns/environment/qstackcontextbase.cpp
+++ b/src/xmlpatterns/environment/qstackcontextbase.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/src/xmlpatterns/environment/qstackcontextbase_p.h b/src/xmlpatterns/environment/qstackcontextbase_p.h
index 9d48287..dda8902 100644
--- a/src/xmlpatterns/environment/qstackcontextbase_p.h
+++ b/src/xmlpatterns/environment/qstackcontextbase_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)
 **
diff --git a/src/xmlpatterns/environment/qstaticbaseuricontext.cpp b/src/xmlpatterns/environment/qstaticbaseuricontext.cpp
index 69eae6e..ccf7dc6 100644
--- a/src/xmlpatterns/environment/qstaticbaseuricontext.cpp
+++ b/src/xmlpatterns/environment/qstaticbaseuricontext.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/src/xmlpatterns/environment/qstaticbaseuricontext_p.h b/src/xmlpatterns/environment/qstaticbaseuricontext_p.h
index c88b965..6aba56f 100644
--- a/src/xmlpatterns/environment/qstaticbaseuricontext_p.h
+++ b/src/xmlpatterns/environment/qstaticbaseuricontext_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)
 **
diff --git a/src/xmlpatterns/environment/qstaticcompatibilitycontext.cpp b/src/xmlpatterns/environment/qstaticcompatibilitycontext.cpp
index 0d21530..d0e2434 100644
--- a/src/xmlpatterns/environment/qstaticcompatibilitycontext.cpp
+++ b/src/xmlpatterns/environment/qstaticcompatibilitycontext.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/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h b/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h
index 8256a2c..32935b1 100644
--- a/src/xmlpatterns/environment/qstaticcompatibilitycontext_p.h
+++ b/src/xmlpatterns/environment/qstaticcompatibilitycontext_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)
 **
diff --git a/src/xmlpatterns/environment/qstaticcontext.cpp b/src/xmlpatterns/environment/qstaticcontext.cpp
index fb95505..fe3e749 100644
--- a/src/xmlpatterns/environment/qstaticcontext.cpp
+++ b/src/xmlpatterns/environment/qstaticcontext.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/src/xmlpatterns/environment/qstaticcontext_p.h b/src/xmlpatterns/environment/qstaticcontext_p.h
index 315a8fe..3b1b050 100644
--- a/src/xmlpatterns/environment/qstaticcontext_p.h
+++ b/src/xmlpatterns/environment/qstaticcontext_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)
 **
diff --git a/src/xmlpatterns/environment/qstaticcurrentcontext.cpp b/src/xmlpatterns/environment/qstaticcurrentcontext.cpp
index 1ba36de..6501141 100644
--- a/src/xmlpatterns/environment/qstaticcurrentcontext.cpp
+++ b/src/xmlpatterns/environment/qstaticcurrentcontext.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/src/xmlpatterns/environment/qstaticcurrentcontext_p.h b/src/xmlpatterns/environment/qstaticcurrentcontext_p.h
index c162b1a..3066e10 100644
--- a/src/xmlpatterns/environment/qstaticcurrentcontext_p.h
+++ b/src/xmlpatterns/environment/qstaticcurrentcontext_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)
 **
diff --git a/src/xmlpatterns/environment/qstaticfocuscontext.cpp b/src/xmlpatterns/environment/qstaticfocuscontext.cpp
index 1802662..26811ea 100644
--- a/src/xmlpatterns/environment/qstaticfocuscontext.cpp
+++ b/src/xmlpatterns/environment/qstaticfocuscontext.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/src/xmlpatterns/environment/qstaticfocuscontext_p.h b/src/xmlpatterns/environment/qstaticfocuscontext_p.h
index e087c97..cfe0403 100644
--- a/src/xmlpatterns/environment/qstaticfocuscontext_p.h
+++ b/src/xmlpatterns/environment/qstaticfocuscontext_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)
 **
diff --git a/src/xmlpatterns/environment/qstaticnamespacecontext.cpp b/src/xmlpatterns/environment/qstaticnamespacecontext.cpp
index 12d29ce..efe18ba 100644
--- a/src/xmlpatterns/environment/qstaticnamespacecontext.cpp
+++ b/src/xmlpatterns/environment/qstaticnamespacecontext.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/src/xmlpatterns/environment/qstaticnamespacecontext_p.h b/src/xmlpatterns/environment/qstaticnamespacecontext_p.h
index 61bbcc3..b765de6 100644
--- a/src/xmlpatterns/environment/qstaticnamespacecontext_p.h
+++ b/src/xmlpatterns/environment/qstaticnamespacecontext_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)
 **