Index: trunk/tools/activeqt/dumpcpp/main.cpp
===================================================================
--- trunk/tools/activeqt/dumpcpp/main.cpp	(revision 647)
+++ trunk/tools/activeqt/dumpcpp/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/activeqt/dumpdoc/main.cpp
===================================================================
--- trunk/tools/activeqt/dumpdoc/main.cpp	(revision 647)
+++ trunk/tools/activeqt/dumpdoc/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/activeqt/testcon/ambientproperties.cpp
===================================================================
--- trunk/tools/activeqt/testcon/ambientproperties.cpp	(revision 647)
+++ trunk/tools/activeqt/testcon/ambientproperties.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/activeqt/testcon/ambientproperties.h
===================================================================
--- trunk/tools/activeqt/testcon/ambientproperties.h	(revision 647)
+++ trunk/tools/activeqt/testcon/ambientproperties.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/activeqt/testcon/ambientproperties.ui
===================================================================
--- trunk/tools/activeqt/testcon/ambientproperties.ui	(revision 647)
+++ trunk/tools/activeqt/testcon/ambientproperties.ui	(revision 651)
@@ -3,5 +3,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/activeqt/testcon/changeproperties.cpp
===================================================================
--- trunk/tools/activeqt/testcon/changeproperties.cpp	(revision 647)
+++ trunk/tools/activeqt/testcon/changeproperties.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/activeqt/testcon/changeproperties.h
===================================================================
--- trunk/tools/activeqt/testcon/changeproperties.h	(revision 647)
+++ trunk/tools/activeqt/testcon/changeproperties.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/activeqt/testcon/changeproperties.ui
===================================================================
--- trunk/tools/activeqt/testcon/changeproperties.ui	(revision 647)
+++ trunk/tools/activeqt/testcon/changeproperties.ui	(revision 651)
@@ -3,5 +3,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/activeqt/testcon/controlinfo.cpp
===================================================================
--- trunk/tools/activeqt/testcon/controlinfo.cpp	(revision 647)
+++ trunk/tools/activeqt/testcon/controlinfo.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/activeqt/testcon/controlinfo.h
===================================================================
--- trunk/tools/activeqt/testcon/controlinfo.h	(revision 647)
+++ trunk/tools/activeqt/testcon/controlinfo.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/activeqt/testcon/controlinfo.ui
===================================================================
--- trunk/tools/activeqt/testcon/controlinfo.ui	(revision 647)
+++ trunk/tools/activeqt/testcon/controlinfo.ui	(revision 651)
@@ -3,5 +3,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/activeqt/testcon/docuwindow.cpp
===================================================================
--- trunk/tools/activeqt/testcon/docuwindow.cpp	(revision 647)
+++ trunk/tools/activeqt/testcon/docuwindow.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/activeqt/testcon/docuwindow.h
===================================================================
--- trunk/tools/activeqt/testcon/docuwindow.h	(revision 647)
+++ trunk/tools/activeqt/testcon/docuwindow.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/activeqt/testcon/invokemethod.cpp
===================================================================
--- trunk/tools/activeqt/testcon/invokemethod.cpp	(revision 647)
+++ trunk/tools/activeqt/testcon/invokemethod.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/activeqt/testcon/invokemethod.h
===================================================================
--- trunk/tools/activeqt/testcon/invokemethod.h	(revision 647)
+++ trunk/tools/activeqt/testcon/invokemethod.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/activeqt/testcon/invokemethod.ui
===================================================================
--- trunk/tools/activeqt/testcon/invokemethod.ui	(revision 647)
+++ trunk/tools/activeqt/testcon/invokemethod.ui	(revision 651)
@@ -3,5 +3,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/activeqt/testcon/main.cpp
===================================================================
--- trunk/tools/activeqt/testcon/main.cpp	(revision 647)
+++ trunk/tools/activeqt/testcon/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/activeqt/testcon/mainwindow.cpp
===================================================================
--- trunk/tools/activeqt/testcon/mainwindow.cpp	(revision 647)
+++ trunk/tools/activeqt/testcon/mainwindow.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/activeqt/testcon/mainwindow.h
===================================================================
--- trunk/tools/activeqt/testcon/mainwindow.h	(revision 647)
+++ trunk/tools/activeqt/testcon/mainwindow.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/activeqt/testcon/mainwindow.ui
===================================================================
--- trunk/tools/activeqt/testcon/mainwindow.ui	(revision 647)
+++ trunk/tools/activeqt/testcon/mainwindow.ui	(revision 651)
@@ -3,5 +3,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/activeqt/testcon/scripts/perlscript.pl
===================================================================
--- trunk/tools/activeqt/testcon/scripts/perlscript.pl	(revision 647)
+++ trunk/tools/activeqt/testcon/scripts/perlscript.pl	(revision 651)
@@ -1,5 +1,5 @@
 #############################################################################
 ##
-## 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)
Index: trunk/tools/activeqt/testcon/scripts/pythonscript.py
===================================================================
--- trunk/tools/activeqt/testcon/scripts/pythonscript.py	(revision 647)
+++ trunk/tools/activeqt/testcon/scripts/pythonscript.py	(revision 651)
@@ -2,5 +2,5 @@
 #############################################################################
 ##
-## 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)
Index: trunk/tools/activeqt/testcon/testcon.rc
===================================================================
--- trunk/tools/activeqt/testcon/testcon.rc	(revision 647)
+++ trunk/tools/activeqt/testcon/testcon.rc	(revision 651)
@@ -24,5 +24,5 @@
 				VALUE "FileVersion", "1,0,0,1\0"
 				VALUE "InternalName", "testcon\0"
-				VALUE "LegalCopyright", "Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)\0"
+				VALUE "LegalCopyright", "Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).0"
 				VALUE "LegalTrademarks", "\0"
 				VALUE "OriginalFilename", "testcon.exe\0"
Index: trunk/tools/assistant/compat/config.cpp
===================================================================
--- trunk/tools/assistant/compat/config.cpp	(revision 647)
+++ trunk/tools/assistant/compat/config.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/compat/config.h
===================================================================
--- trunk/tools/assistant/compat/config.h	(revision 647)
+++ trunk/tools/assistant/compat/config.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/compat/docuparser.cpp
===================================================================
--- trunk/tools/assistant/compat/docuparser.cpp	(revision 647)
+++ trunk/tools/assistant/compat/docuparser.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/compat/docuparser.h
===================================================================
--- trunk/tools/assistant/compat/docuparser.h	(revision 647)
+++ trunk/tools/assistant/compat/docuparser.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/compat/fontsettingsdialog.cpp
===================================================================
--- trunk/tools/assistant/compat/fontsettingsdialog.cpp	(revision 647)
+++ trunk/tools/assistant/compat/fontsettingsdialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/compat/fontsettingsdialog.h
===================================================================
--- trunk/tools/assistant/compat/fontsettingsdialog.h	(revision 647)
+++ trunk/tools/assistant/compat/fontsettingsdialog.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/compat/helpdialog.cpp
===================================================================
--- trunk/tools/assistant/compat/helpdialog.cpp	(revision 647)
+++ trunk/tools/assistant/compat/helpdialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/compat/helpdialog.h
===================================================================
--- trunk/tools/assistant/compat/helpdialog.h	(revision 647)
+++ trunk/tools/assistant/compat/helpdialog.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/compat/helpdialog.ui
===================================================================
--- trunk/tools/assistant/compat/helpdialog.ui	(revision 647)
+++ trunk/tools/assistant/compat/helpdialog.ui	(revision 651)
@@ -3,5 +3,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/assistant/compat/helpwindow.cpp
===================================================================
--- trunk/tools/assistant/compat/helpwindow.cpp	(revision 647)
+++ trunk/tools/assistant/compat/helpwindow.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/compat/helpwindow.h
===================================================================
--- trunk/tools/assistant/compat/helpwindow.h	(revision 647)
+++ trunk/tools/assistant/compat/helpwindow.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/compat/index.cpp
===================================================================
--- trunk/tools/assistant/compat/index.cpp	(revision 647)
+++ trunk/tools/assistant/compat/index.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/compat/index.h
===================================================================
--- trunk/tools/assistant/compat/index.h	(revision 647)
+++ trunk/tools/assistant/compat/index.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/compat/lib/qassistantclient.cpp
===================================================================
--- trunk/tools/assistant/compat/lib/qassistantclient.cpp	(revision 647)
+++ trunk/tools/assistant/compat/lib/qassistantclient.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/compat/lib/qassistantclient.h
===================================================================
--- trunk/tools/assistant/compat/lib/qassistantclient.h	(revision 647)
+++ trunk/tools/assistant/compat/lib/qassistantclient.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/compat/lib/qassistantclient_global.h
===================================================================
--- trunk/tools/assistant/compat/lib/qassistantclient_global.h	(revision 647)
+++ trunk/tools/assistant/compat/lib/qassistantclient_global.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/compat/main.cpp
===================================================================
--- trunk/tools/assistant/compat/main.cpp	(revision 647)
+++ trunk/tools/assistant/compat/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/compat/mainwindow.cpp
===================================================================
--- trunk/tools/assistant/compat/mainwindow.cpp	(revision 647)
+++ trunk/tools/assistant/compat/mainwindow.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -326,5 +326,5 @@
                                     "<h3>%1</h3>"
                                     "<p>Version %2</p></center>"
-                                    "<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p>")
+                                    "<p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p>")
                    .arg(tr("Qt Assistant")).arg(QLatin1String(QT_VERSION_STR)));
     box.setWindowTitle(tr("Qt Assistant"));
Index: trunk/tools/assistant/compat/mainwindow.h
===================================================================
--- trunk/tools/assistant/compat/mainwindow.h	(revision 647)
+++ trunk/tools/assistant/compat/mainwindow.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/compat/mainwindow.ui
===================================================================
--- trunk/tools/assistant/compat/mainwindow.ui	(revision 647)
+++ trunk/tools/assistant/compat/mainwindow.ui	(revision 651)
@@ -2,5 +2,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/assistant/compat/profile.cpp
===================================================================
--- trunk/tools/assistant/compat/profile.cpp	(revision 647)
+++ trunk/tools/assistant/compat/profile.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/compat/profile.h
===================================================================
--- trunk/tools/assistant/compat/profile.h	(revision 647)
+++ trunk/tools/assistant/compat/profile.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/compat/tabbedbrowser.cpp
===================================================================
--- trunk/tools/assistant/compat/tabbedbrowser.cpp	(revision 647)
+++ trunk/tools/assistant/compat/tabbedbrowser.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/compat/tabbedbrowser.h
===================================================================
--- trunk/tools/assistant/compat/tabbedbrowser.h	(revision 647)
+++ trunk/tools/assistant/compat/tabbedbrowser.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/compat/tabbedbrowser.ui
===================================================================
--- trunk/tools/assistant/compat/tabbedbrowser.ui	(revision 647)
+++ trunk/tools/assistant/compat/tabbedbrowser.ui	(revision 651)
@@ -3,5 +3,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/assistant/compat/topicchooser.cpp
===================================================================
--- trunk/tools/assistant/compat/topicchooser.cpp	(revision 647)
+++ trunk/tools/assistant/compat/topicchooser.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/compat/topicchooser.h
===================================================================
--- trunk/tools/assistant/compat/topicchooser.h	(revision 647)
+++ trunk/tools/assistant/compat/topicchooser.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/compat/topicchooser.ui
===================================================================
--- trunk/tools/assistant/compat/topicchooser.ui	(revision 647)
+++ trunk/tools/assistant/compat/topicchooser.ui	(revision 651)
@@ -2,5 +2,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/fulltextsearch/qanalyzer.cpp
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qanalyzer.cpp	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qanalyzer.cpp	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qanalyzer_p.h
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qanalyzer_p.h	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qanalyzer_p.h	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qclucene-config_p.h
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qclucene-config_p.h	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qclucene-config_p.h	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qclucene_global_p.h
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qclucene_global_p.h	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qclucene_global_p.h	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qdocument.cpp
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qdocument.cpp	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qdocument.cpp	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qdocument_p.h
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qdocument_p.h	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qdocument_p.h	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qfield.cpp
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qfield.cpp	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qfield.cpp	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qfield_p.h
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qfield_p.h	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qfield_p.h	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qfilter.cpp
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qfilter.cpp	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qfilter.cpp	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qfilter_p.h
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qfilter_p.h	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qfilter_p.h	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qhits.cpp
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qhits.cpp	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qhits.cpp	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qhits_p.h
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qhits_p.h	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qhits_p.h	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qindexreader.cpp
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qindexreader.cpp	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qindexreader.cpp	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qindexreader_p.h
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qindexreader_p.h	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qindexreader_p.h	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qindexwriter.cpp
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qindexwriter.cpp	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qindexwriter.cpp	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qindexwriter_p.h
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qindexwriter_p.h	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qindexwriter_p.h	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qquery.cpp
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qquery.cpp	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qquery.cpp	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qquery_p.h
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qquery_p.h	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qquery_p.h	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qqueryparser.cpp
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qqueryparser.cpp	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qqueryparser.cpp	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qqueryparser_p.h
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qqueryparser_p.h	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qqueryparser_p.h	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qreader.cpp
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qreader.cpp	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qreader.cpp	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qreader_p.h
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qreader_p.h	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qreader_p.h	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qsearchable.cpp
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qsearchable.cpp	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qsearchable.cpp	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qsearchable_p.h
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qsearchable_p.h	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qsearchable_p.h	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qsort.cpp
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qsort.cpp	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qsort.cpp	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qsort_p.h
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qsort_p.h	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qsort_p.h	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qterm.cpp
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qterm.cpp	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qterm.cpp	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qterm_p.h
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qterm_p.h	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qterm_p.h	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qtoken.cpp
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qtoken.cpp	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qtoken.cpp	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qtoken_p.h
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qtoken_p.h	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qtoken_p.h	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qtokenizer.cpp
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qtokenizer.cpp	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qtokenizer.cpp	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qtokenizer_p.h
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qtokenizer_p.h	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qtokenizer_p.h	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qtokenstream.cpp
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qtokenstream.cpp	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qtokenstream.cpp	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/fulltextsearch/qtokenstream_p.h
===================================================================
--- trunk/tools/assistant/lib/fulltextsearch/qtokenstream_p.h	(revision 647)
+++ trunk/tools/assistant/lib/fulltextsearch/qtokenstream_p.h	(revision 651)
@@ -4,5 +4,5 @@
 ** All rights reserved.
 **
-** Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 **
Index: trunk/tools/assistant/lib/qhelp_global.cpp
===================================================================
--- trunk/tools/assistant/lib/qhelp_global.cpp	(revision 647)
+++ trunk/tools/assistant/lib/qhelp_global.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelp_global.h
===================================================================
--- trunk/tools/assistant/lib/qhelp_global.h	(revision 647)
+++ trunk/tools/assistant/lib/qhelp_global.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpcollectionhandler.cpp
===================================================================
--- trunk/tools/assistant/lib/qhelpcollectionhandler.cpp	(revision 647)
+++ trunk/tools/assistant/lib/qhelpcollectionhandler.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpcollectionhandler_p.h
===================================================================
--- trunk/tools/assistant/lib/qhelpcollectionhandler_p.h	(revision 647)
+++ trunk/tools/assistant/lib/qhelpcollectionhandler_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpcontentwidget.cpp
===================================================================
--- trunk/tools/assistant/lib/qhelpcontentwidget.cpp	(revision 647)
+++ trunk/tools/assistant/lib/qhelpcontentwidget.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpcontentwidget.h
===================================================================
--- trunk/tools/assistant/lib/qhelpcontentwidget.h	(revision 647)
+++ trunk/tools/assistant/lib/qhelpcontentwidget.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpdatainterface.cpp
===================================================================
--- trunk/tools/assistant/lib/qhelpdatainterface.cpp	(revision 647)
+++ trunk/tools/assistant/lib/qhelpdatainterface.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpdatainterface_p.h
===================================================================
--- trunk/tools/assistant/lib/qhelpdatainterface_p.h	(revision 647)
+++ trunk/tools/assistant/lib/qhelpdatainterface_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpdbreader.cpp
===================================================================
--- trunk/tools/assistant/lib/qhelpdbreader.cpp	(revision 647)
+++ trunk/tools/assistant/lib/qhelpdbreader.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpdbreader_p.h
===================================================================
--- trunk/tools/assistant/lib/qhelpdbreader_p.h	(revision 647)
+++ trunk/tools/assistant/lib/qhelpdbreader_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpengine.cpp
===================================================================
--- trunk/tools/assistant/lib/qhelpengine.cpp	(revision 647)
+++ trunk/tools/assistant/lib/qhelpengine.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpengine.h
===================================================================
--- trunk/tools/assistant/lib/qhelpengine.h	(revision 647)
+++ trunk/tools/assistant/lib/qhelpengine.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpengine_p.h
===================================================================
--- trunk/tools/assistant/lib/qhelpengine_p.h	(revision 647)
+++ trunk/tools/assistant/lib/qhelpengine_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpenginecore.cpp
===================================================================
--- trunk/tools/assistant/lib/qhelpenginecore.cpp	(revision 647)
+++ trunk/tools/assistant/lib/qhelpenginecore.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpenginecore.h
===================================================================
--- trunk/tools/assistant/lib/qhelpenginecore.h	(revision 647)
+++ trunk/tools/assistant/lib/qhelpenginecore.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpgenerator.cpp
===================================================================
--- trunk/tools/assistant/lib/qhelpgenerator.cpp	(revision 647)
+++ trunk/tools/assistant/lib/qhelpgenerator.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpgenerator_p.h
===================================================================
--- trunk/tools/assistant/lib/qhelpgenerator_p.h	(revision 647)
+++ trunk/tools/assistant/lib/qhelpgenerator_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpindexwidget.cpp
===================================================================
--- trunk/tools/assistant/lib/qhelpindexwidget.cpp	(revision 647)
+++ trunk/tools/assistant/lib/qhelpindexwidget.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpindexwidget.h
===================================================================
--- trunk/tools/assistant/lib/qhelpindexwidget.h	(revision 647)
+++ trunk/tools/assistant/lib/qhelpindexwidget.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpprojectdata.cpp
===================================================================
--- trunk/tools/assistant/lib/qhelpprojectdata.cpp	(revision 647)
+++ trunk/tools/assistant/lib/qhelpprojectdata.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpprojectdata_p.h
===================================================================
--- trunk/tools/assistant/lib/qhelpprojectdata_p.h	(revision 647)
+++ trunk/tools/assistant/lib/qhelpprojectdata_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpsearchengine.cpp
===================================================================
--- trunk/tools/assistant/lib/qhelpsearchengine.cpp	(revision 647)
+++ trunk/tools/assistant/lib/qhelpsearchengine.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpsearchengine.h
===================================================================
--- trunk/tools/assistant/lib/qhelpsearchengine.h	(revision 647)
+++ trunk/tools/assistant/lib/qhelpsearchengine.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpsearchindex_default.cpp
===================================================================
--- trunk/tools/assistant/lib/qhelpsearchindex_default.cpp	(revision 647)
+++ trunk/tools/assistant/lib/qhelpsearchindex_default.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpsearchindex_default_p.h
===================================================================
--- trunk/tools/assistant/lib/qhelpsearchindex_default_p.h	(revision 647)
+++ trunk/tools/assistant/lib/qhelpsearchindex_default_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpsearchindexreader.cpp
===================================================================
--- trunk/tools/assistant/lib/qhelpsearchindexreader.cpp	(revision 647)
+++ trunk/tools/assistant/lib/qhelpsearchindexreader.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpsearchindexreader_clucene.cpp
===================================================================
--- trunk/tools/assistant/lib/qhelpsearchindexreader_clucene.cpp	(revision 647)
+++ trunk/tools/assistant/lib/qhelpsearchindexreader_clucene.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpsearchindexreader_clucene_p.h
===================================================================
--- trunk/tools/assistant/lib/qhelpsearchindexreader_clucene_p.h	(revision 647)
+++ trunk/tools/assistant/lib/qhelpsearchindexreader_clucene_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpsearchindexreader_default.cpp
===================================================================
--- trunk/tools/assistant/lib/qhelpsearchindexreader_default.cpp	(revision 647)
+++ trunk/tools/assistant/lib/qhelpsearchindexreader_default.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpsearchindexreader_default_p.h
===================================================================
--- trunk/tools/assistant/lib/qhelpsearchindexreader_default_p.h	(revision 647)
+++ trunk/tools/assistant/lib/qhelpsearchindexreader_default_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpsearchindexreader_p.h
===================================================================
--- trunk/tools/assistant/lib/qhelpsearchindexreader_p.h	(revision 647)
+++ trunk/tools/assistant/lib/qhelpsearchindexreader_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp
===================================================================
--- trunk/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp	(revision 647)
+++ trunk/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpsearchindexwriter_clucene_p.h
===================================================================
--- trunk/tools/assistant/lib/qhelpsearchindexwriter_clucene_p.h	(revision 647)
+++ trunk/tools/assistant/lib/qhelpsearchindexwriter_clucene_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpsearchindexwriter_default.cpp
===================================================================
--- trunk/tools/assistant/lib/qhelpsearchindexwriter_default.cpp	(revision 647)
+++ trunk/tools/assistant/lib/qhelpsearchindexwriter_default.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpsearchindexwriter_default_p.h
===================================================================
--- trunk/tools/assistant/lib/qhelpsearchindexwriter_default_p.h	(revision 647)
+++ trunk/tools/assistant/lib/qhelpsearchindexwriter_default_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/lib/qhelpsearchquerywidget.cpp
===================================================================
--- trunk/tools/assistant/lib/qhelpsearchquerywidget.cpp	(revision 647)
+++ trunk/tools/assistant/lib/qhelpsearchquerywidget.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -119,4 +119,20 @@
     {
         // nothing todo
+    }
+
+    void retranslate()
+    {
+        simpleSearchLabel->setText(QHelpSearchQueryWidget::tr("Search for:"));
+        prevQueryButton->setToolTip(QHelpSearchQueryWidget::tr("Previous search"));
+        nextQueryButton->setToolTip(QHelpSearchQueryWidget::tr("Next search"));
+        searchButton->setText(QHelpSearchQueryWidget::tr("Search"));
+#ifdef QT_CLUCENE_SUPPORT
+        advancedSearchLabel->setText(QHelpSearchQueryWidget::tr("Advanced search"));
+        similarLabel->setText(QHelpSearchQueryWidget::tr("words <B>similar</B> to:"));
+        withoutLabel->setText(QHelpSearchQueryWidget::tr("<B>without</B> the words:"));
+        exactLabel->setText(QHelpSearchQueryWidget::tr("with <B>exact phrase</B>:"));
+        allLabel->setText(QHelpSearchQueryWidget::tr("with <B>all</B> of the words:"));
+        atLeastLabel->setText(QHelpSearchQueryWidget::tr("with <B>at least one</B> of the words:"));
+#endif
     }
 
@@ -361,4 +377,11 @@
 
     bool simpleSearch;
+    QLabel *simpleSearchLabel;
+    QLabel *advancedSearchLabel;
+    QLabel *similarLabel;
+    QLabel *withoutLabel;
+    QLabel *exactLabel;
+    QLabel *allLabel;
+    QLabel *atLeastLabel;
     QPushButton *searchButton;
     QWidget* advancedSearchWidget;
@@ -409,17 +432,15 @@
 
     QHBoxLayout* hBoxLayout = new QHBoxLayout();
-    QLabel *label = new QLabel(tr("Search for:"), this);
+    d->simpleSearchLabel = new QLabel(this);
     d->defaultQuery = new QLineEdit(this);
     d->defaultQuery->setCompleter(&d->searchCompleter);
     d->prevQueryButton = new QToolButton(this);
     d->prevQueryButton->setArrowType(Qt::LeftArrow);
-    d->prevQueryButton->setToolTip(tr("Previous search"));
     d->prevQueryButton->setEnabled(false);
     d->nextQueryButton = new QToolButton(this);
     d->nextQueryButton->setArrowType(Qt::RightArrow);
-    d->nextQueryButton->setToolTip(tr("Next search"));
     d->nextQueryButton->setEnabled(false);
-    d->searchButton = new QPushButton(tr("Search"), this);
-    hBoxLayout->addWidget(label);
+    d->searchButton = new QPushButton(this);
+    hBoxLayout->addWidget(d->simpleSearchLabel);
     hBoxLayout->addWidget(d->defaultQuery);
     hBoxLayout->addWidget(d->prevQueryButton);
@@ -440,13 +461,13 @@
     d->showHideAdvancedSearchButton->setMinimumSize(25, 20);
 
-    label = new QLabel(tr("Advanced search"), this);
+    d->advancedSearchLabel = new QLabel(this);
     QSizePolicy sizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
-    sizePolicy.setHeightForWidth(label->sizePolicy().hasHeightForWidth());
-    label->setSizePolicy(sizePolicy);
+    sizePolicy.setHeightForWidth(d->advancedSearchLabel->sizePolicy().hasHeightForWidth());
+    d->advancedSearchLabel->setSizePolicy(sizePolicy);
 
     QFrame* hLine = new QFrame(this);
     hLine->setFrameStyle(QFrame::HLine);
     hBoxLayout->addWidget(d->showHideAdvancedSearchButton);
-    hBoxLayout->addWidget(label);
+    hBoxLayout->addWidget(d->advancedSearchLabel);
     hBoxLayout->addWidget(hLine);
 
@@ -458,30 +479,30 @@
     gLayout->setMargin(0);
 
-    label = new QLabel(tr("words <B>similar</B> to:"), this);
-    gLayout->addWidget(label, 0, 0);
+    d->similarLabel = new QLabel(this);
+    gLayout->addWidget(d->similarLabel, 0, 0);
     d->similarQuery = new QLineEdit(this);
     d->similarQuery->setCompleter(&d->searchCompleter);
     gLayout->addWidget(d->similarQuery, 0, 1);
 
-    label = new QLabel(tr("<B>without</B> the words:"), this);
-    gLayout->addWidget(label, 1, 0);
+    d->withoutLabel = new QLabel(this);
+    gLayout->addWidget(d->withoutLabel, 1, 0);
     d->withoutQuery = new QLineEdit(this);
     d->withoutQuery->setCompleter(&d->searchCompleter);
     gLayout->addWidget(d->withoutQuery, 1, 1);
 
-    label = new QLabel(tr("with <B>exact phrase</B>:"), this);
-    gLayout->addWidget(label, 2, 0);
+    d->exactLabel = new QLabel(this);
+    gLayout->addWidget(d->exactLabel, 2, 0);
     d->exactQuery = new QLineEdit(this);
     d->exactQuery->setCompleter(&d->searchCompleter);
     gLayout->addWidget(d->exactQuery, 2, 1);
 
-    label = new QLabel(tr("with <B>all</B> of the words:"), this);
-    gLayout->addWidget(label, 3, 0);
+    d->allLabel = new QLabel(this);
+    gLayout->addWidget(d->allLabel, 3, 0);
     d->allQuery = new QLineEdit(this);
     d->allQuery->setCompleter(&d->searchCompleter);
     gLayout->addWidget(d->allQuery, 3, 1);
 
-    label = new QLabel(tr("with <B>at least one</B> of the words:"), this);
-    gLayout->addWidget(label, 4, 0);
+    d->atLeastLabel = new QLabel(this);
+    gLayout->addWidget(d->atLeastLabel, 4, 0);
     d->atLeastQuery = new QLineEdit(this);
     d->atLeastQuery->setCompleter(&d->searchCompleter);
@@ -490,4 +511,6 @@
     vLayout->addWidget(d->advancedSearchWidget);
     d->advancedSearchWidget->hide();
+
+    d->retranslate();
 
     connect(d->exactQuery, SIGNAL(returnPressed()), this, SIGNAL(search()));
@@ -532,3 +555,13 @@
 }
 
+/*! \reimp
+*/
+void QHelpSearchQueryWidget::changeEvent(QEvent *event)
+{
+    if (event->type() == QEvent::LanguageChange)
+        d->retranslate();
+    else
+        QWidget::changeEvent(event);
+}
+
 QT_END_NAMESPACE
Index: trunk/tools/assistant/lib/qhelpsearchquerywidget.h
===================================================================
--- trunk/tools/assistant/lib/qhelpsearchquerywidget.h	(revision 647)
+++ trunk/tools/assistant/lib/qhelpsearchquerywidget.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -75,5 +75,6 @@
 
 private:
-    void focusInEvent(QFocusEvent *focusEvent);
+    virtual void focusInEvent(QFocusEvent *focusEvent);
+    virtual void changeEvent(QEvent *event);
 
 private:
Index: trunk/tools/assistant/lib/qhelpsearchresultwidget.cpp
===================================================================
--- trunk/tools/assistant/lib/qhelpsearchresultwidget.cpp	(revision 647)
+++ trunk/tools/assistant/lib/qhelpsearchresultwidget.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -409,4 +409,12 @@
 }
 
+/*! \reimp
+*/
+void QHelpSearchResultWidget::changeEvent(QEvent *event)
+{
+    if (event->type() == QEvent::LanguageChange)
+        d->setResults(d->searchEngine->hitCount());
+}
+
 /*!
     Destroys the search result widget.
Index: trunk/tools/assistant/lib/qhelpsearchresultwidget.h
===================================================================
--- trunk/tools/assistant/lib/qhelpsearchresultwidget.h	(revision 647)
+++ trunk/tools/assistant/lib/qhelpsearchresultwidget.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -76,4 +76,5 @@
     QHelpSearchResultWidgetPrivate *d;
     QHelpSearchResultWidget(QHelpSearchEngine *engine);
+    virtual void changeEvent(QEvent *event);
 };
 
Index: trunk/tools/assistant/tools/assistant/aboutdialog.cpp
===================================================================
--- trunk/tools/assistant/tools/assistant/aboutdialog.cpp	(revision 647)
+++ trunk/tools/assistant/tools/assistant/aboutdialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/assistant/aboutdialog.h
===================================================================
--- trunk/tools/assistant/tools/assistant/aboutdialog.h	(revision 647)
+++ trunk/tools/assistant/tools/assistant/aboutdialog.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/assistant/assistant.rc
===================================================================
--- trunk/tools/assistant/tools/assistant/assistant.rc	(revision 647)
+++ trunk/tools/assistant/tools/assistant/assistant.rc	(revision 651)
@@ -19,5 +19,5 @@
             VALUE "FileDescription", "Qt Assistant"
             VALUE "FileVersion", "1.0.0.0"
-            VALUE "LegalCopyright", "Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)."
+            VALUE "LegalCopyright", "Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)."
             VALUE "InternalName", "assistant.exe"
             VALUE "OriginalFilename", "assistant.exe"
Index: trunk/tools/assistant/tools/assistant/bookmarkmanager.cpp
===================================================================
--- trunk/tools/assistant/tools/assistant/bookmarkmanager.cpp	(revision 647)
+++ trunk/tools/assistant/tools/assistant/bookmarkmanager.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/assistant/bookmarkmanager.h
===================================================================
--- trunk/tools/assistant/tools/assistant/bookmarkmanager.h	(revision 647)
+++ trunk/tools/assistant/tools/assistant/bookmarkmanager.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/assistant/centralwidget.cpp
===================================================================
--- trunk/tools/assistant/tools/assistant/centralwidget.cpp	(revision 647)
+++ trunk/tools/assistant/tools/assistant/centralwidget.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -359,5 +359,5 @@
 void CentralWidget::findNext()
 {
-    find(findWidget->editFind->text(), true, false);
+    find(findWidget->editFind->text(), true);
 }
 
@@ -390,5 +390,5 @@
 void CentralWidget::findPrevious()
 {
-    find(findWidget->editFind->text(), false, true);
+    find(findWidget->editFind->text(), false);
 }
 
@@ -698,5 +698,5 @@
 void CentralWidget::findCurrentText(const QString &text)
 {
-    find(text, false, false);
+    find(text, true);
 }
 
@@ -897,17 +897,33 @@
 }
 
-void CentralWidget::find(const QString &ttf, bool forward, bool backward)
+void CentralWidget::find(const QString &ttf, bool forward)
 {
     QPalette p = findWidget->editFind->palette();
     p.setColor(QPalette::Active, QPalette::Base, Qt::white);
 
-    if (!ttf.isEmpty()) {
-        HelpViewer *viewer = currentHelpViewer();
-
+    bool found = false;
+
+#if defined(QT_NO_WEBKIT)
+    found = findInTextBrowser(ttf, forward);
+#else
+    found = findInWebPage(ttf, forward);
+#endif
+
+    if (!found && !ttf.isEmpty())
+        p.setColor(QPalette::Active, QPalette::Base, QColor(255, 102, 102));
+
+    if (!findWidget->isVisible())
+        findWidget->show();
+    findWidget->editFind->setPalette(p);
+}
+
+bool CentralWidget::findInWebPage(const QString &ttf, bool forward)
+{
+#if !defined(QT_NO_WEBKIT)
+    if (HelpViewer *viewer = currentHelpViewer()) {
         bool found = false;
-#if !defined(QT_NO_WEBKIT)
-        if (viewer) {
-            QWebPage::FindFlags options;
-            if (backward)
+        QWebPage::FindFlags options;
+        if (!ttf.isEmpty()) {
+            if (!forward)
                 options |= QWebPage::FindBackward;
 
@@ -924,28 +940,25 @@
                     findWidget->labelWrapped->show();
             }
-        } else if (tabWidget->currentWidget() == m_searchWidget) {
-            QTextBrowser *browser = qFindChild<QTextBrowser*>(m_searchWidget);
-            found = findInTextBrowser(browser, ttf, forward, backward);
         }
-#else
-        QTextBrowser *browser = qobject_cast<QTextBrowser*>(viewer);
-        if (tabWidget->currentWidget() == m_searchWidget)
-            browser = qFindChild<QTextBrowser*>(m_searchWidget);
-        found = findInTextBrowser(browser, ttf, forward, backward);
-#endif
-
-        if (!found)
-            p.setColor(QPalette::Active, QPalette::Base, QColor(255, 102, 102));
-    }
-
-    if (!findWidget->isVisible())
-        findWidget->show();
-    findWidget->editFind->setPalette(p);
-}
-
-bool CentralWidget::findInTextBrowser(QTextBrowser* browser, const QString &ttf,
-    bool forward, bool backward)
-{
-    if (!browser)
+        // force highlighting of all other matches, also when empty (clear)
+        options = QWebPage::HighlightAllOccurrences;
+        viewer->findText(QLatin1String(""), options);
+        viewer->findText(ttf, options);
+        return found;
+    }
+
+    // this needs to stay, case for active search results page
+    return findInTextBrowser(ttf, forward);
+#endif
+    return false;
+}
+
+bool CentralWidget::findInTextBrowser(const QString &ttf, bool forward)
+{
+    QTextBrowser *browser = qobject_cast<QTextBrowser*>(currentHelpViewer());
+    if (tabWidget->currentWidget() == m_searchWidget)
+        browser = qFindChild<QTextBrowser*>(m_searchWidget);
+
+    if (!browser || ttf.isEmpty())
         return false;
 
@@ -963,5 +976,5 @@
     }
 
-    if (backward)
+    if (!forward)
         options |= QTextDocument::FindBackward;
 
@@ -1003,5 +1016,5 @@
     int i = searchAttached ? 1 : 0;
     getBrowserFontFor(tabWidget->widget(i), &font);
-    for (i; i < tabWidget->count(); ++i)
+    for ( ; i < tabWidget->count(); ++i)
         setBrowserFontFor(tabWidget->widget(i), font);
 }
@@ -1075,5 +1088,10 @@
 {
     setSource(url);
+#if defined(QT_NO_WEBKIT)
     highlightSearchTerms();
+#else
+    connect(currentHelpViewer(), SIGNAL(loadFinished(bool)), this,
+        SLOT(highlightSearchTerms()));
+#endif
 }
 
@@ -1082,5 +1100,10 @@
 {
     setSourceInNewTab(url);
+#if defined(QT_NO_WEBKIT)
     highlightSearchTerms();
+#else
+    connect(currentHelpViewer(), SIGNAL(loadFinished(bool)), this,
+        SLOT(highlightSearchTerms()));
+#endif
 }
 
@@ -1088,5 +1111,4 @@
 CentralWidget::highlightSearchTerms()
 {
-#if defined(QT_NO_WEBKIT)
     HelpViewer *viewer = currentHelpViewer();
     if (!viewer)
@@ -1110,4 +1132,5 @@
     }
 
+#if defined(QT_NO_WEBKIT)
     viewer->viewport()->setUpdatesEnabled(false);
 
@@ -1141,4 +1164,12 @@
 
     viewer->viewport()->setUpdatesEnabled(true);
+#else
+    viewer->findText("", QWebPage::HighlightAllOccurrences);
+         // clears existing selections
+    foreach (const QString& term, terms)
+        viewer->findText(term, QWebPage::HighlightAllOccurrences);
+
+    disconnect(viewer, SIGNAL(loadFinished(bool)), this,
+        SLOT(highlightSearchTerms()));
 #endif
 }
Index: trunk/tools/assistant/tools/assistant/centralwidget.h
===================================================================
--- trunk/tools/assistant/tools/assistant/centralwidget.h	(revision 647)
+++ trunk/tools/assistant/tools/assistant/centralwidget.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -183,14 +183,14 @@
     void setSourceFromSearch(const QUrl &url);
     void setSourceFromSearchInNewTab(const QUrl &url);
+    void highlightSearchTerms();
 
 private:
     void connectSignals();
     bool eventFilter(QObject *object, QEvent *e);
-    void find(const QString &ttf, bool forward, bool backward);
-    bool findInTextBrowser(QTextBrowser* browser, const QString &ttf,
-        bool forward, bool backward);
+    void find(const QString &ttf, bool forward);
+    bool findInWebPage(const QString &ttf, bool forward);
+    bool findInTextBrowser(const QString &ttf, bool forward);
     void initPrinter();
     QString quoteTabTitle(const QString &title) const;
-    void highlightSearchTerms();
     void setLastShownPages();
 
Index: trunk/tools/assistant/tools/assistant/cmdlineparser.cpp
===================================================================
--- trunk/tools/assistant/tools/assistant/cmdlineparser.cpp	(revision 647)
+++ trunk/tools/assistant/tools/assistant/cmdlineparser.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/assistant/cmdlineparser.h
===================================================================
--- trunk/tools/assistant/tools/assistant/cmdlineparser.h	(revision 647)
+++ trunk/tools/assistant/tools/assistant/cmdlineparser.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/assistant/contentwindow.cpp
===================================================================
--- trunk/tools/assistant/tools/assistant/contentwindow.cpp	(revision 647)
+++ trunk/tools/assistant/tools/assistant/contentwindow.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/assistant/contentwindow.h
===================================================================
--- trunk/tools/assistant/tools/assistant/contentwindow.h	(revision 647)
+++ trunk/tools/assistant/tools/assistant/contentwindow.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/assistant/doc/assistant.qdoc
===================================================================
--- trunk/tools/assistant/tools/assistant/doc/assistant.qdoc	(revision 647)
+++ trunk/tools/assistant/tools/assistant/doc/assistant.qdoc	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/assistant/doc/assistant.qdocconf
===================================================================
--- trunk/tools/assistant/tools/assistant/doc/assistant.qdocconf	(revision 647)
+++ trunk/tools/assistant/tools/assistant/doc/assistant.qdocconf	(revision 651)
@@ -11,6 +11,6 @@
 HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
               "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
-              "<td width=\"30%\" align=\"left\">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
+              "<td width=\"30%\" align=\"left\">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
               "<td width=\"40%\" align=\"center\">Trademarks</td>\n" \
-              "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.6.1</div></td>\n" \
+              "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt 4.6.2</div></td>\n" \
               "</tr></table></div></address>"
Index: trunk/tools/assistant/tools/assistant/filternamedialog.cpp
===================================================================
--- trunk/tools/assistant/tools/assistant/filternamedialog.cpp	(revision 647)
+++ trunk/tools/assistant/tools/assistant/filternamedialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/assistant/filternamedialog.h
===================================================================
--- trunk/tools/assistant/tools/assistant/filternamedialog.h	(revision 647)
+++ trunk/tools/assistant/tools/assistant/filternamedialog.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/assistant/helpviewer.cpp
===================================================================
--- trunk/tools/assistant/tools/assistant/helpviewer.cpp	(revision 647)
+++ trunk/tools/assistant/tools/assistant/helpviewer.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -142,15 +142,16 @@
         || mimeType.endsWith(QLatin1String(".svgz"))) {
             mimeType = QLatin1String("image/svg+xml");
-    }
-    else if (mimeType.endsWith(QLatin1String(".css"))) {
+    } else if (mimeType.endsWith(QLatin1String(".css"))) {
         mimeType = QLatin1String("text/css");
-    }
-    else if (mimeType.endsWith(QLatin1String(".js"))) {
+    } else if (mimeType.endsWith(QLatin1String(".js"))) {
         mimeType = QLatin1String("text/javascript");
+    } else if (mimeType.endsWith(QLatin1String(".txt"))) {
+        mimeType = QLatin1String("text/plain");
     } else {
         mimeType = QLatin1String("text/html");
     }
 
-    return new HelpNetworkReply(request, helpEngine->fileData(url), mimeType);
+    const QByteArray &ba = helpEngine->fileData(url);
+    return new HelpNetworkReply(request, ba.isEmpty() ? " " : ba, mimeType);
 }
 
Index: trunk/tools/assistant/tools/assistant/helpviewer.h
===================================================================
--- trunk/tools/assistant/tools/assistant/helpviewer.h	(revision 647)
+++ trunk/tools/assistant/tools/assistant/helpviewer.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/assistant/indexwindow.cpp
===================================================================
--- trunk/tools/assistant/tools/assistant/indexwindow.cpp	(revision 647)
+++ trunk/tools/assistant/tools/assistant/indexwindow.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/assistant/indexwindow.h
===================================================================
--- trunk/tools/assistant/tools/assistant/indexwindow.h	(revision 647)
+++ trunk/tools/assistant/tools/assistant/indexwindow.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/assistant/installdialog.cpp
===================================================================
--- trunk/tools/assistant/tools/assistant/installdialog.cpp	(revision 647)
+++ trunk/tools/assistant/tools/assistant/installdialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/assistant/installdialog.h
===================================================================
--- trunk/tools/assistant/tools/assistant/installdialog.h	(revision 647)
+++ trunk/tools/assistant/tools/assistant/installdialog.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/assistant/main.cpp
===================================================================
--- trunk/tools/assistant/tools/assistant/main.cpp	(revision 647)
+++ trunk/tools/assistant/tools/assistant/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/assistant/mainwindow.cpp
===================================================================
--- trunk/tools/assistant/tools/assistant/mainwindow.cpp	(revision 647)
+++ trunk/tools/assistant/tools/assistant/mainwindow.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -851,5 +851,5 @@
             "<h3>%1</h3>"
             "<p>Version %2</p></center>"
-            "<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p>")
+            "<p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p>")
             .arg(tr("Qt Assistant")).arg(QLatin1String(QT_VERSION_STR)),
             resources);
Index: trunk/tools/assistant/tools/assistant/mainwindow.h
===================================================================
--- trunk/tools/assistant/tools/assistant/mainwindow.h	(revision 647)
+++ trunk/tools/assistant/tools/assistant/mainwindow.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/assistant/preferencesdialog.cpp
===================================================================
--- trunk/tools/assistant/tools/assistant/preferencesdialog.cpp	(revision 647)
+++ trunk/tools/assistant/tools/assistant/preferencesdialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/assistant/preferencesdialog.h
===================================================================
--- trunk/tools/assistant/tools/assistant/preferencesdialog.h	(revision 647)
+++ trunk/tools/assistant/tools/assistant/preferencesdialog.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/assistant/qtdocinstaller.cpp
===================================================================
--- trunk/tools/assistant/tools/assistant/qtdocinstaller.cpp	(revision 647)
+++ trunk/tools/assistant/tools/assistant/qtdocinstaller.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/assistant/qtdocinstaller.h
===================================================================
--- trunk/tools/assistant/tools/assistant/qtdocinstaller.h	(revision 647)
+++ trunk/tools/assistant/tools/assistant/qtdocinstaller.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/assistant/remotecontrol.cpp
===================================================================
--- trunk/tools/assistant/tools/assistant/remotecontrol.cpp	(revision 647)
+++ trunk/tools/assistant/tools/assistant/remotecontrol.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/assistant/remotecontrol.h
===================================================================
--- trunk/tools/assistant/tools/assistant/remotecontrol.h	(revision 647)
+++ trunk/tools/assistant/tools/assistant/remotecontrol.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/assistant/remotecontrol_win.h
===================================================================
--- trunk/tools/assistant/tools/assistant/remotecontrol_win.h	(revision 647)
+++ trunk/tools/assistant/tools/assistant/remotecontrol_win.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/assistant/searchwidget.cpp
===================================================================
--- trunk/tools/assistant/tools/assistant/searchwidget.cpp	(revision 647)
+++ trunk/tools/assistant/tools/assistant/searchwidget.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/assistant/searchwidget.h
===================================================================
--- trunk/tools/assistant/tools/assistant/searchwidget.h	(revision 647)
+++ trunk/tools/assistant/tools/assistant/searchwidget.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/assistant/topicchooser.cpp
===================================================================
--- trunk/tools/assistant/tools/assistant/topicchooser.cpp	(revision 647)
+++ trunk/tools/assistant/tools/assistant/topicchooser.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/assistant/topicchooser.h
===================================================================
--- trunk/tools/assistant/tools/assistant/topicchooser.h	(revision 647)
+++ trunk/tools/assistant/tools/assistant/topicchooser.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qcollectiongenerator/main.cpp
===================================================================
--- trunk/tools/assistant/tools/qcollectiongenerator/main.cpp	(revision 647)
+++ trunk/tools/assistant/tools/qcollectiongenerator/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qhelpconverter/adpreader.cpp
===================================================================
--- trunk/tools/assistant/tools/qhelpconverter/adpreader.cpp	(revision 647)
+++ trunk/tools/assistant/tools/qhelpconverter/adpreader.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qhelpconverter/adpreader.h
===================================================================
--- trunk/tools/assistant/tools/qhelpconverter/adpreader.h	(revision 647)
+++ trunk/tools/assistant/tools/qhelpconverter/adpreader.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qhelpconverter/conversionwizard.cpp
===================================================================
--- trunk/tools/assistant/tools/qhelpconverter/conversionwizard.cpp	(revision 647)
+++ trunk/tools/assistant/tools/qhelpconverter/conversionwizard.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qhelpconverter/conversionwizard.h
===================================================================
--- trunk/tools/assistant/tools/qhelpconverter/conversionwizard.h	(revision 647)
+++ trunk/tools/assistant/tools/qhelpconverter/conversionwizard.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qhelpconverter/filespage.cpp
===================================================================
--- trunk/tools/assistant/tools/qhelpconverter/filespage.cpp	(revision 647)
+++ trunk/tools/assistant/tools/qhelpconverter/filespage.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qhelpconverter/filespage.h
===================================================================
--- trunk/tools/assistant/tools/qhelpconverter/filespage.h	(revision 647)
+++ trunk/tools/assistant/tools/qhelpconverter/filespage.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qhelpconverter/filterpage.cpp
===================================================================
--- trunk/tools/assistant/tools/qhelpconverter/filterpage.cpp	(revision 647)
+++ trunk/tools/assistant/tools/qhelpconverter/filterpage.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qhelpconverter/filterpage.h
===================================================================
--- trunk/tools/assistant/tools/qhelpconverter/filterpage.h	(revision 647)
+++ trunk/tools/assistant/tools/qhelpconverter/filterpage.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qhelpconverter/finishpage.cpp
===================================================================
--- trunk/tools/assistant/tools/qhelpconverter/finishpage.cpp	(revision 647)
+++ trunk/tools/assistant/tools/qhelpconverter/finishpage.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qhelpconverter/finishpage.h
===================================================================
--- trunk/tools/assistant/tools/qhelpconverter/finishpage.h	(revision 647)
+++ trunk/tools/assistant/tools/qhelpconverter/finishpage.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qhelpconverter/generalpage.cpp
===================================================================
--- trunk/tools/assistant/tools/qhelpconverter/generalpage.cpp	(revision 647)
+++ trunk/tools/assistant/tools/qhelpconverter/generalpage.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qhelpconverter/generalpage.h
===================================================================
--- trunk/tools/assistant/tools/qhelpconverter/generalpage.h	(revision 647)
+++ trunk/tools/assistant/tools/qhelpconverter/generalpage.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qhelpconverter/helpwindow.cpp
===================================================================
--- trunk/tools/assistant/tools/qhelpconverter/helpwindow.cpp	(revision 647)
+++ trunk/tools/assistant/tools/qhelpconverter/helpwindow.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qhelpconverter/helpwindow.h
===================================================================
--- trunk/tools/assistant/tools/qhelpconverter/helpwindow.h	(revision 647)
+++ trunk/tools/assistant/tools/qhelpconverter/helpwindow.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qhelpconverter/identifierpage.cpp
===================================================================
--- trunk/tools/assistant/tools/qhelpconverter/identifierpage.cpp	(revision 647)
+++ trunk/tools/assistant/tools/qhelpconverter/identifierpage.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qhelpconverter/identifierpage.h
===================================================================
--- trunk/tools/assistant/tools/qhelpconverter/identifierpage.h	(revision 647)
+++ trunk/tools/assistant/tools/qhelpconverter/identifierpage.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qhelpconverter/inputpage.cpp
===================================================================
--- trunk/tools/assistant/tools/qhelpconverter/inputpage.cpp	(revision 647)
+++ trunk/tools/assistant/tools/qhelpconverter/inputpage.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qhelpconverter/inputpage.h
===================================================================
--- trunk/tools/assistant/tools/qhelpconverter/inputpage.h	(revision 647)
+++ trunk/tools/assistant/tools/qhelpconverter/inputpage.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qhelpconverter/main.cpp
===================================================================
--- trunk/tools/assistant/tools/qhelpconverter/main.cpp	(revision 647)
+++ trunk/tools/assistant/tools/qhelpconverter/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qhelpconverter/outputpage.cpp
===================================================================
--- trunk/tools/assistant/tools/qhelpconverter/outputpage.cpp	(revision 647)
+++ trunk/tools/assistant/tools/qhelpconverter/outputpage.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qhelpconverter/outputpage.h
===================================================================
--- trunk/tools/assistant/tools/qhelpconverter/outputpage.h	(revision 647)
+++ trunk/tools/assistant/tools/qhelpconverter/outputpage.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qhelpconverter/pathpage.cpp
===================================================================
--- trunk/tools/assistant/tools/qhelpconverter/pathpage.cpp	(revision 647)
+++ trunk/tools/assistant/tools/qhelpconverter/pathpage.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qhelpconverter/pathpage.h
===================================================================
--- trunk/tools/assistant/tools/qhelpconverter/pathpage.h	(revision 647)
+++ trunk/tools/assistant/tools/qhelpconverter/pathpage.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qhelpconverter/qhcpwriter.cpp
===================================================================
--- trunk/tools/assistant/tools/qhelpconverter/qhcpwriter.cpp	(revision 647)
+++ trunk/tools/assistant/tools/qhelpconverter/qhcpwriter.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qhelpconverter/qhcpwriter.h
===================================================================
--- trunk/tools/assistant/tools/qhelpconverter/qhcpwriter.h	(revision 647)
+++ trunk/tools/assistant/tools/qhelpconverter/qhcpwriter.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qhelpconverter/qhpwriter.cpp
===================================================================
--- trunk/tools/assistant/tools/qhelpconverter/qhpwriter.cpp	(revision 647)
+++ trunk/tools/assistant/tools/qhelpconverter/qhpwriter.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qhelpconverter/qhpwriter.h
===================================================================
--- trunk/tools/assistant/tools/qhelpconverter/qhpwriter.h	(revision 647)
+++ trunk/tools/assistant/tools/qhelpconverter/qhpwriter.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/qhelpgenerator/main.cpp
===================================================================
--- trunk/tools/assistant/tools/qhelpgenerator/main.cpp	(revision 647)
+++ trunk/tools/assistant/tools/qhelpgenerator/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/shared/helpgenerator.cpp
===================================================================
--- trunk/tools/assistant/tools/shared/helpgenerator.cpp	(revision 647)
+++ trunk/tools/assistant/tools/shared/helpgenerator.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/assistant/tools/shared/helpgenerator.h
===================================================================
--- trunk/tools/assistant/tools/shared/helpgenerator.h	(revision 647)
+++ trunk/tools/assistant/tools/shared/helpgenerator.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/checksdk/cesdkhandler.cpp
===================================================================
--- trunk/tools/checksdk/cesdkhandler.cpp	(revision 647)
+++ trunk/tools/checksdk/cesdkhandler.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/checksdk/cesdkhandler.h
===================================================================
--- trunk/tools/checksdk/cesdkhandler.h	(revision 647)
+++ trunk/tools/checksdk/cesdkhandler.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/checksdk/main.cpp
===================================================================
--- trunk/tools/checksdk/main.cpp	(revision 647)
+++ trunk/tools/checksdk/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/configure/configure_pch.h
===================================================================
--- trunk/tools/configure/configure_pch.h	(revision 647)
+++ trunk/tools/configure/configure_pch.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/configure/configureapp.cpp
===================================================================
--- trunk/tools/configure/configureapp.cpp	(revision 647)
+++ trunk/tools/configure/configureapp.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -318,4 +318,5 @@
     dictionary[ "DBUS" ]            = "auto";
     dictionary[ "S60" ]             = "yes";
+    dictionary[ "SYMBIAN_DEFFILES" ] = "yes";
 
     dictionary[ "STYLE_WINDOWS" ]   = "yes";
@@ -483,4 +484,7 @@
             dictionary[ "BUILDDEV" ] = "yes";
             dictionary["LICENSE_CONFIRMED"] = "yes";
+            if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith("symbian")) {
+                dictionary[ "SYMBIAN_DEFFILES" ] = "no";
+            }
         }
         else if( configCmdLine.at(i) == "-opensource" ) {
@@ -804,5 +808,5 @@
             dictionary[ "NATIVE_GESTURES" ] = "no";
 #if !defined(EVAL)
-        // Others ---------------------------------------------------
+        // Symbian Support -------------------------------------------
         else if (configCmdLine.at(i) == "-fpu" )
         {
@@ -813,5 +817,4 @@
         }
 
-        // S60 Support -------------------------------------------
         else if( configCmdLine.at(i) == "-s60" )
             dictionary[ "S60" ]    = "yes";
@@ -819,4 +822,10 @@
             dictionary[ "S60" ]    = "no";
 
+        else if( configCmdLine.at(i) == "-usedeffiles" )
+            dictionary[ "SYMBIAN_DEFFILES" ] = "yes";
+        else if( configCmdLine.at(i) == "-no-usedeffiles" )
+            dictionary[ "SYMBIAN_DEFFILES" ] = "no";
+
+        // Others ---------------------------------------------------
         else if (configCmdLine.at(i) == "-fast" )
             dictionary[ "FAST" ] = "yes";
@@ -1823,5 +1832,7 @@
         desc(                      "-fpu <flags>",         "VFP type on ARM, supported options: softvfp(default) | vfpv2 | softvfp+vfpv2");
         desc("S60", "no",          "-no-s60",              "Do not compile in S60 support.");
-        desc("S60", "yes",         "-s60",                 "Compile with support for the S60 UI Framework\n");
+        desc("S60", "yes",         "-s60",                 "Compile with support for the S60 UI Framework");
+        desc("SYMBIAN_DEFFILES", "no",  "-no-usedeffiles",  "Disable the usage of DEF files.");
+        desc("SYMBIAN_DEFFILES", "yes", "-usedeffiles",     "Enable the usage of DEF files.\n");
         return true;
     }
@@ -2527,6 +2538,9 @@
     }
 
-    if (dictionary["MULTIMEDIA"] == "yes")
+    if (dictionary["MULTIMEDIA"] == "yes") {
         qtConfig += "multimedia";
+        if (dictionary["AUDIO_BACKEND"] == "yes")
+            qtConfig += "audio-backend";
+    }
 
     if (dictionary["WEBKIT"] == "yes")
@@ -2745,4 +2759,11 @@
             configStream << " no_plugin_manifest";
 
+        if ( dictionary.contains("SYMBIAN_DEFFILES") ) {
+            if(dictionary["SYMBIAN_DEFFILES"] == "yes" ) {
+                configStream << " def_files";
+            } else if ( dictionary["SYMBIAN_DEFFILES"] == "no" ) {
+                configStream << " def_files_disabled";
+            }
+        }
         configStream << endl;
         configStream << "QT_ARCH = " << dictionary[ "ARCHITECTURE" ] << endl;
@@ -2771,6 +2792,7 @@
             configStream << "QT_LIBINFIX = " << dictionary["QT_LIBINFIX"] << endl;
 
+        configStream << "#Qt for Symbian FPU settings" << endl;
         if(!dictionary["ARM_FPU_TYPE"].isEmpty()) {
-            configStream<<"QMAKE_CXXFLAGS.ARMCC += --fpu "<< dictionary["ARM_FPU_TYPE"];
+            configStream<<"MMP_RULES += \"ARMFPU "<< dictionary["ARM_FPU_TYPE"]<< "\"";
         }
 
@@ -3268,4 +3290,12 @@
     }
 
+    if (dictionary.contains("SYMBIAN_DEFFILES")) {
+        cout << "Symbian DEF files enabled..." << dictionary[ "SYMBIAN_DEFFILES" ] << endl;
+        if(dictionary["SYMBIAN_DEFFILES"] == "no") {
+            cout << "WARNING: Disabling DEF files will mean that Qt is NOT binary compatible with previous versions." << endl;
+            cout << "         This feature is only intended for use during development, NEVER for release builds." << endl;
+        }
+    }
+
     if(dictionary["ASSISTANT_WEBKIT"] == "yes")
         cout << "Using WebKit as html rendering engine in Qt Assistant." << endl;
Index: trunk/tools/configure/configureapp.h
===================================================================
--- trunk/tools/configure/configureapp.h	(revision 647)
+++ trunk/tools/configure/configureapp.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/configure/environment.cpp
===================================================================
--- trunk/tools/configure/environment.cpp	(revision 647)
+++ trunk/tools/configure/environment.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/configure/environment.h
===================================================================
--- trunk/tools/configure/environment.h	(revision 647)
+++ trunk/tools/configure/environment.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/configure/main.cpp
===================================================================
--- trunk/tools/configure/main.cpp	(revision 647)
+++ trunk/tools/configure/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/configure/tools.cpp
===================================================================
--- trunk/tools/configure/tools.cpp	(revision 647)
+++ trunk/tools/configure/tools.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/configure/tools.h
===================================================================
--- trunk/tools/configure/tools.h	(revision 647)
+++ trunk/tools/configure/tools.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/data/generate_header.xsl
===================================================================
--- trunk/tools/designer/data/generate_header.xsl	(revision 647)
+++ trunk/tools/designer/data/generate_header.xsl	(revision 651)
@@ -337,5 +337,5 @@
 <xsl:text>/****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/data/generate_impl.xsl
===================================================================
--- trunk/tools/designer/data/generate_impl.xsl	(revision 647)
+++ trunk/tools/designer/data/generate_impl.xsl	(revision 651)
@@ -1093,5 +1093,5 @@
 <xsl:text>/****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/buddyeditor/buddyeditor.cpp
===================================================================
--- trunk/tools/designer/src/components/buddyeditor/buddyeditor.cpp	(revision 647)
+++ trunk/tools/designer/src/components/buddyeditor/buddyeditor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/buddyeditor/buddyeditor.h
===================================================================
--- trunk/tools/designer/src/components/buddyeditor/buddyeditor.h	(revision 647)
+++ trunk/tools/designer/src/components/buddyeditor/buddyeditor.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/buddyeditor/buddyeditor_global.h
===================================================================
--- trunk/tools/designer/src/components/buddyeditor/buddyeditor_global.h	(revision 647)
+++ trunk/tools/designer/src/components/buddyeditor/buddyeditor_global.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/buddyeditor/buddyeditor_instance.cpp
===================================================================
--- trunk/tools/designer/src/components/buddyeditor/buddyeditor_instance.cpp	(revision 647)
+++ trunk/tools/designer/src/components/buddyeditor/buddyeditor_instance.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/buddyeditor/buddyeditor_plugin.cpp
===================================================================
--- trunk/tools/designer/src/components/buddyeditor/buddyeditor_plugin.cpp	(revision 647)
+++ trunk/tools/designer/src/components/buddyeditor/buddyeditor_plugin.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/buddyeditor/buddyeditor_plugin.h
===================================================================
--- trunk/tools/designer/src/components/buddyeditor/buddyeditor_plugin.h	(revision 647)
+++ trunk/tools/designer/src/components/buddyeditor/buddyeditor_plugin.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/buddyeditor/buddyeditor_tool.cpp
===================================================================
--- trunk/tools/designer/src/components/buddyeditor/buddyeditor_tool.cpp	(revision 647)
+++ trunk/tools/designer/src/components/buddyeditor/buddyeditor_tool.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/buddyeditor/buddyeditor_tool.h
===================================================================
--- trunk/tools/designer/src/components/buddyeditor/buddyeditor_tool.h	(revision 647)
+++ trunk/tools/designer/src/components/buddyeditor/buddyeditor_tool.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/brushmanagerproxy.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/brushmanagerproxy.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/brushmanagerproxy.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/brushmanagerproxy.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/brushmanagerproxy.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/brushmanagerproxy.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/default_actionprovider.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/default_actionprovider.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/default_actionprovider.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/default_actionprovider.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/default_actionprovider.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/default_actionprovider.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/default_container.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/default_container.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/default_container.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/default_container.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/default_container.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/default_container.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/default_layoutdecoration.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/default_layoutdecoration.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/default_layoutdecoration.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/default_layoutdecoration.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/default_layoutdecoration.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/default_layoutdecoration.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/deviceprofiledialog.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/deviceprofiledialog.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/deviceprofiledialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/deviceprofiledialog.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/deviceprofiledialog.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/deviceprofiledialog.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/dpi_chooser.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/dpi_chooser.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/dpi_chooser.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/dpi_chooser.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/dpi_chooser.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/dpi_chooser.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/embeddedoptionspage.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/embeddedoptionspage.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/embeddedoptionspage.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/embeddedoptionspage.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/embeddedoptionspage.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/embeddedoptionspage.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/formeditor.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/formeditor.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/formeditor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/formeditor.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/formeditor.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/formeditor.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/formeditor_global.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/formeditor_global.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/formeditor_global.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/formeditor_optionspage.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/formeditor_optionspage.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/formeditor_optionspage.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/formeditor_optionspage.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/formeditor_optionspage.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/formeditor_optionspage.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/formwindow.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/formwindow.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/formwindow.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/formwindow.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/formwindow.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/formwindow.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/formwindow_dnditem.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/formwindow_dnditem.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/formwindow_dnditem.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/formwindow_dnditem.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/formwindow_dnditem.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/formwindow_dnditem.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/formwindow_widgetstack.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/formwindow_widgetstack.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/formwindow_widgetstack.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/formwindow_widgetstack.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/formwindow_widgetstack.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/formwindow_widgetstack.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/formwindowcursor.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/formwindowcursor.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/formwindowcursor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/formwindowcursor.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/formwindowcursor.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/formwindowcursor.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/formwindowmanager.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/formwindowmanager.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/formwindowmanager.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/formwindowmanager.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/formwindowmanager.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/formwindowmanager.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/formwindowsettings.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/formwindowsettings.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/formwindowsettings.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/formwindowsettings.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/formwindowsettings.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/formwindowsettings.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/formwindowsettings.ui
===================================================================
--- trunk/tools/designer/src/components/formeditor/formwindowsettings.ui	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/formwindowsettings.ui	(revision 651)
@@ -3,5 +3,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/iconcache.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/iconcache.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/iconcache.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/iconcache.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/iconcache.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/iconcache.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/itemview_propertysheet.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/itemview_propertysheet.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/itemview_propertysheet.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/itemview_propertysheet.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/itemview_propertysheet.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/itemview_propertysheet.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/layout_propertysheet.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/layout_propertysheet.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/layout_propertysheet.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/layout_propertysheet.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/layout_propertysheet.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/layout_propertysheet.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/line_propertysheet.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/line_propertysheet.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/line_propertysheet.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/line_propertysheet.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/line_propertysheet.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/line_propertysheet.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/previewactiongroup.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/previewactiongroup.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/previewactiongroup.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/previewactiongroup.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/previewactiongroup.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/previewactiongroup.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/qdesigner_resource.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/qdesigner_resource.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/qdesigner_resource.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/qdesigner_resource.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/qdesigner_resource.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/qdesigner_resource.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/qlayoutwidget_propertysheet.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/qlayoutwidget_propertysheet.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/qlayoutwidget_propertysheet.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/qlayoutwidget_propertysheet.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/qlayoutwidget_propertysheet.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/qlayoutwidget_propertysheet.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/qmainwindow_container.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/qmainwindow_container.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/qmainwindow_container.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/qmainwindow_container.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/qmainwindow_container.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/qmainwindow_container.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/qmdiarea_container.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/qmdiarea_container.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/qmdiarea_container.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/qmdiarea_container.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/qmdiarea_container.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/qmdiarea_container.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/qtbrushmanager.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/qtbrushmanager.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/qtbrushmanager.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/qtbrushmanager.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/qtbrushmanager.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/qtbrushmanager.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/qwizard_container.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/qwizard_container.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/qwizard_container.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/qwizard_container.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/qwizard_container.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/qwizard_container.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/qworkspace_container.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/qworkspace_container.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/qworkspace_container.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/qworkspace_container.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/qworkspace_container.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/qworkspace_container.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/spacer_propertysheet.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/spacer_propertysheet.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/spacer_propertysheet.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/spacer_propertysheet.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/spacer_propertysheet.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/spacer_propertysheet.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/templateoptionspage.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/templateoptionspage.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/templateoptionspage.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/templateoptionspage.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/templateoptionspage.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/templateoptionspage.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/tool_widgeteditor.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/tool_widgeteditor.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/tool_widgeteditor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/tool_widgeteditor.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/tool_widgeteditor.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/tool_widgeteditor.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/formeditor/widgetselection.cpp
===================================================================
--- trunk/tools/designer/src/components/formeditor/widgetselection.cpp	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/widgetselection.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -87,5 +87,5 @@
 // ----------- WidgetHandle
 WidgetHandle::WidgetHandle(FormWindow *parent, WidgetHandle::Type t, WidgetSelection *s) :
-    InvisibleWidget(parent->mainContainer()),
+    InvisibleWidget(parent->formContainer()),
     m_widget(0),
     m_type(t),
@@ -639,5 +639,5 @@
 
     QPoint p = m_widget->parentWidget()->mapToGlobal(m_widget->pos());
-    p = m_formWindow->mapFromGlobal(p);
+    p = m_formWindow->formContainer()->mapFromGlobal(p);
     const QRect r(p, m_widget->size());
 
Index: trunk/tools/designer/src/components/formeditor/widgetselection.h
===================================================================
--- trunk/tools/designer/src/components/formeditor/widgetselection.h	(revision 647)
+++ trunk/tools/designer/src/components/formeditor/widgetselection.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/lib/lib_pch.h
===================================================================
--- trunk/tools/designer/src/components/lib/lib_pch.h	(revision 647)
+++ trunk/tools/designer/src/components/lib/lib_pch.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/lib/qdesigner_components.cpp
===================================================================
--- trunk/tools/designer/src/components/lib/qdesigner_components.cpp	(revision 647)
+++ trunk/tools/designer/src/components/lib/qdesigner_components.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/objectinspector/objectinspector.cpp
===================================================================
--- trunk/tools/designer/src/components/objectinspector/objectinspector.cpp	(revision 647)
+++ trunk/tools/designer/src/components/objectinspector/objectinspector.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/objectinspector/objectinspector.h
===================================================================
--- trunk/tools/designer/src/components/objectinspector/objectinspector.h	(revision 647)
+++ trunk/tools/designer/src/components/objectinspector/objectinspector.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/objectinspector/objectinspector_global.h
===================================================================
--- trunk/tools/designer/src/components/objectinspector/objectinspector_global.h	(revision 647)
+++ trunk/tools/designer/src/components/objectinspector/objectinspector_global.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/objectinspector/objectinspectormodel.cpp
===================================================================
--- trunk/tools/designer/src/components/objectinspector/objectinspectormodel.cpp	(revision 647)
+++ trunk/tools/designer/src/components/objectinspector/objectinspectormodel.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/objectinspector/objectinspectormodel_p.h
===================================================================
--- trunk/tools/designer/src/components/objectinspector/objectinspectormodel_p.h	(revision 647)
+++ trunk/tools/designer/src/components/objectinspector/objectinspectormodel_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/brushpropertymanager.cpp
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/brushpropertymanager.cpp	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/brushpropertymanager.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/brushpropertymanager.h
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/brushpropertymanager.h	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/brushpropertymanager.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/defs.cpp
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/defs.cpp	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/defs.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/defs.h
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/defs.h	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/defs.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/designerpropertymanager.cpp
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/designerpropertymanager.cpp	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/designerpropertymanager.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/designerpropertymanager.h
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/designerpropertymanager.h	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/designerpropertymanager.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/fontmapping.xml
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/fontmapping.xml	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/fontmapping.xml	(revision 651)
@@ -3,5 +3,5 @@
 <!--************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/fontpropertymanager.cpp
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/fontpropertymanager.cpp	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/fontpropertymanager.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/fontpropertymanager.h
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/fontpropertymanager.h	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/fontpropertymanager.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/newdynamicpropertydialog.h
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/newdynamicpropertydialog.h	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/newdynamicpropertydialog.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/paletteeditor.cpp
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/paletteeditor.cpp	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/paletteeditor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/paletteeditor.h
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/paletteeditor.h	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/paletteeditor.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/paletteeditor.ui
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/paletteeditor.ui	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/paletteeditor.ui	(revision 651)
@@ -2,5 +2,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/paletteeditorbutton.cpp
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/paletteeditorbutton.cpp	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/paletteeditorbutton.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/paletteeditorbutton.h
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/paletteeditorbutton.h	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/paletteeditorbutton.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/previewframe.cpp
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/previewframe.cpp	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/previewframe.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/previewframe.h
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/previewframe.h	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/previewframe.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/previewwidget.cpp
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/previewwidget.cpp	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/previewwidget.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/previewwidget.h
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/previewwidget.h	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/previewwidget.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/previewwidget.ui
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/previewwidget.ui	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/previewwidget.ui	(revision 651)
@@ -2,5 +2,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/propertyeditor.cpp
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/propertyeditor.cpp	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/propertyeditor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/propertyeditor.h
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/propertyeditor.h	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/propertyeditor.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/propertyeditor_global.h
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/propertyeditor_global.h	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/propertyeditor_global.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/qlonglongvalidator.cpp
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/qlonglongvalidator.cpp	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/qlonglongvalidator.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/qlonglongvalidator.h
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/qlonglongvalidator.h	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/qlonglongvalidator.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/stringlisteditor.cpp
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/stringlisteditor.cpp	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/stringlisteditor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/stringlisteditor.h
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/stringlisteditor.h	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/stringlisteditor.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/stringlisteditor.ui
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/stringlisteditor.ui	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/stringlisteditor.ui	(revision 651)
@@ -2,5 +2,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/stringlisteditorbutton.cpp
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/stringlisteditorbutton.cpp	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/stringlisteditorbutton.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/propertyeditor/stringlisteditorbutton.h
===================================================================
--- trunk/tools/designer/src/components/propertyeditor/stringlisteditorbutton.h	(revision 647)
+++ trunk/tools/designer/src/components/propertyeditor/stringlisteditorbutton.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/signalsloteditor/connectdialog.cpp
===================================================================
--- trunk/tools/designer/src/components/signalsloteditor/connectdialog.cpp	(revision 647)
+++ trunk/tools/designer/src/components/signalsloteditor/connectdialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/signalsloteditor/connectdialog_p.h
===================================================================
--- trunk/tools/designer/src/components/signalsloteditor/connectdialog_p.h	(revision 647)
+++ trunk/tools/designer/src/components/signalsloteditor/connectdialog_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/signalsloteditor/signalslot_utils.cpp
===================================================================
--- trunk/tools/designer/src/components/signalsloteditor/signalslot_utils.cpp	(revision 647)
+++ trunk/tools/designer/src/components/signalsloteditor/signalslot_utils.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/signalsloteditor/signalslot_utils_p.h
===================================================================
--- trunk/tools/designer/src/components/signalsloteditor/signalslot_utils_p.h	(revision 647)
+++ trunk/tools/designer/src/components/signalsloteditor/signalslot_utils_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/signalsloteditor/signalsloteditor.cpp
===================================================================
--- trunk/tools/designer/src/components/signalsloteditor/signalsloteditor.cpp	(revision 647)
+++ trunk/tools/designer/src/components/signalsloteditor/signalsloteditor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/signalsloteditor/signalsloteditor.h
===================================================================
--- trunk/tools/designer/src/components/signalsloteditor/signalsloteditor.h	(revision 647)
+++ trunk/tools/designer/src/components/signalsloteditor/signalsloteditor.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/signalsloteditor/signalsloteditor_global.h
===================================================================
--- trunk/tools/designer/src/components/signalsloteditor/signalsloteditor_global.h	(revision 647)
+++ trunk/tools/designer/src/components/signalsloteditor/signalsloteditor_global.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/signalsloteditor/signalsloteditor_instance.cpp
===================================================================
--- trunk/tools/designer/src/components/signalsloteditor/signalsloteditor_instance.cpp	(revision 647)
+++ trunk/tools/designer/src/components/signalsloteditor/signalsloteditor_instance.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/signalsloteditor/signalsloteditor_p.h
===================================================================
--- trunk/tools/designer/src/components/signalsloteditor/signalsloteditor_p.h	(revision 647)
+++ trunk/tools/designer/src/components/signalsloteditor/signalsloteditor_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp
===================================================================
--- trunk/tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp	(revision 647)
+++ trunk/tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.h
===================================================================
--- trunk/tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.h	(revision 647)
+++ trunk/tools/designer/src/components/signalsloteditor/signalsloteditor_plugin.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp
===================================================================
--- trunk/tools/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp	(revision 647)
+++ trunk/tools/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/signalsloteditor/signalsloteditor_tool.h
===================================================================
--- trunk/tools/designer/src/components/signalsloteditor/signalsloteditor_tool.h	(revision 647)
+++ trunk/tools/designer/src/components/signalsloteditor/signalsloteditor_tool.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
===================================================================
--- trunk/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp	(revision 647)
+++ trunk/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.h
===================================================================
--- trunk/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.h	(revision 647)
+++ trunk/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/tabordereditor/tabordereditor.cpp
===================================================================
--- trunk/tools/designer/src/components/tabordereditor/tabordereditor.cpp	(revision 647)
+++ trunk/tools/designer/src/components/tabordereditor/tabordereditor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/tabordereditor/tabordereditor.h
===================================================================
--- trunk/tools/designer/src/components/tabordereditor/tabordereditor.h	(revision 647)
+++ trunk/tools/designer/src/components/tabordereditor/tabordereditor.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/tabordereditor/tabordereditor_global.h
===================================================================
--- trunk/tools/designer/src/components/tabordereditor/tabordereditor_global.h	(revision 647)
+++ trunk/tools/designer/src/components/tabordereditor/tabordereditor_global.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/tabordereditor/tabordereditor_instance.cpp
===================================================================
--- trunk/tools/designer/src/components/tabordereditor/tabordereditor_instance.cpp	(revision 647)
+++ trunk/tools/designer/src/components/tabordereditor/tabordereditor_instance.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/tabordereditor/tabordereditor_plugin.cpp
===================================================================
--- trunk/tools/designer/src/components/tabordereditor/tabordereditor_plugin.cpp	(revision 647)
+++ trunk/tools/designer/src/components/tabordereditor/tabordereditor_plugin.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/tabordereditor/tabordereditor_plugin.h
===================================================================
--- trunk/tools/designer/src/components/tabordereditor/tabordereditor_plugin.h	(revision 647)
+++ trunk/tools/designer/src/components/tabordereditor/tabordereditor_plugin.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/tabordereditor/tabordereditor_tool.cpp
===================================================================
--- trunk/tools/designer/src/components/tabordereditor/tabordereditor_tool.cpp	(revision 647)
+++ trunk/tools/designer/src/components/tabordereditor/tabordereditor_tool.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/tabordereditor/tabordereditor_tool.h
===================================================================
--- trunk/tools/designer/src/components/tabordereditor/tabordereditor_tool.h	(revision 647)
+++ trunk/tools/designer/src/components/tabordereditor/tabordereditor_tool.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/button_taskmenu.cpp
===================================================================
--- trunk/tools/designer/src/components/taskmenu/button_taskmenu.cpp	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/button_taskmenu.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/button_taskmenu.h
===================================================================
--- trunk/tools/designer/src/components/taskmenu/button_taskmenu.h	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/button_taskmenu.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/combobox_taskmenu.cpp
===================================================================
--- trunk/tools/designer/src/components/taskmenu/combobox_taskmenu.cpp	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/combobox_taskmenu.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/combobox_taskmenu.h
===================================================================
--- trunk/tools/designer/src/components/taskmenu/combobox_taskmenu.h	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/combobox_taskmenu.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp
===================================================================
--- trunk/tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/containerwidget_taskmenu.h
===================================================================
--- trunk/tools/designer/src/components/taskmenu/containerwidget_taskmenu.h	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/containerwidget_taskmenu.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/groupbox_taskmenu.cpp
===================================================================
--- trunk/tools/designer/src/components/taskmenu/groupbox_taskmenu.cpp	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/groupbox_taskmenu.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/groupbox_taskmenu.h
===================================================================
--- trunk/tools/designer/src/components/taskmenu/groupbox_taskmenu.h	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/groupbox_taskmenu.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/inplace_editor.cpp
===================================================================
--- trunk/tools/designer/src/components/taskmenu/inplace_editor.cpp	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/inplace_editor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/inplace_editor.h
===================================================================
--- trunk/tools/designer/src/components/taskmenu/inplace_editor.h	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/inplace_editor.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/inplace_widget_helper.cpp
===================================================================
--- trunk/tools/designer/src/components/taskmenu/inplace_widget_helper.cpp	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/inplace_widget_helper.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/inplace_widget_helper.h
===================================================================
--- trunk/tools/designer/src/components/taskmenu/inplace_widget_helper.h	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/inplace_widget_helper.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/itemlisteditor.cpp
===================================================================
--- trunk/tools/designer/src/components/taskmenu/itemlisteditor.cpp	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/itemlisteditor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/itemlisteditor.h
===================================================================
--- trunk/tools/designer/src/components/taskmenu/itemlisteditor.h	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/itemlisteditor.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/itemlisteditor.ui
===================================================================
--- trunk/tools/designer/src/components/taskmenu/itemlisteditor.ui	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/itemlisteditor.ui	(revision 651)
@@ -2,5 +2,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/label_taskmenu.cpp
===================================================================
--- trunk/tools/designer/src/components/taskmenu/label_taskmenu.cpp	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/label_taskmenu.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/label_taskmenu.h
===================================================================
--- trunk/tools/designer/src/components/taskmenu/label_taskmenu.h	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/label_taskmenu.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/layouttaskmenu.cpp
===================================================================
--- trunk/tools/designer/src/components/taskmenu/layouttaskmenu.cpp	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/layouttaskmenu.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/layouttaskmenu.h
===================================================================
--- trunk/tools/designer/src/components/taskmenu/layouttaskmenu.h	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/layouttaskmenu.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/lineedit_taskmenu.cpp
===================================================================
--- trunk/tools/designer/src/components/taskmenu/lineedit_taskmenu.cpp	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/lineedit_taskmenu.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/lineedit_taskmenu.h
===================================================================
--- trunk/tools/designer/src/components/taskmenu/lineedit_taskmenu.h	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/lineedit_taskmenu.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/listwidget_taskmenu.cpp
===================================================================
--- trunk/tools/designer/src/components/taskmenu/listwidget_taskmenu.cpp	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/listwidget_taskmenu.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/listwidget_taskmenu.h
===================================================================
--- trunk/tools/designer/src/components/taskmenu/listwidget_taskmenu.h	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/listwidget_taskmenu.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/listwidgeteditor.cpp
===================================================================
--- trunk/tools/designer/src/components/taskmenu/listwidgeteditor.cpp	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/listwidgeteditor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/listwidgeteditor.h
===================================================================
--- trunk/tools/designer/src/components/taskmenu/listwidgeteditor.h	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/listwidgeteditor.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/menutaskmenu.cpp
===================================================================
--- trunk/tools/designer/src/components/taskmenu/menutaskmenu.cpp	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/menutaskmenu.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/menutaskmenu.h
===================================================================
--- trunk/tools/designer/src/components/taskmenu/menutaskmenu.h	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/menutaskmenu.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp
===================================================================
--- trunk/tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/tablewidget_taskmenu.h
===================================================================
--- trunk/tools/designer/src/components/taskmenu/tablewidget_taskmenu.h	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/tablewidget_taskmenu.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/tablewidgeteditor.cpp
===================================================================
--- trunk/tools/designer/src/components/taskmenu/tablewidgeteditor.cpp	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/tablewidgeteditor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/tablewidgeteditor.h
===================================================================
--- trunk/tools/designer/src/components/taskmenu/tablewidgeteditor.h	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/tablewidgeteditor.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/tablewidgeteditor.ui
===================================================================
--- trunk/tools/designer/src/components/taskmenu/tablewidgeteditor.ui	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/tablewidgeteditor.ui	(revision 651)
@@ -2,5 +2,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/taskmenu_component.cpp
===================================================================
--- trunk/tools/designer/src/components/taskmenu/taskmenu_component.cpp	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/taskmenu_component.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/taskmenu_component.h
===================================================================
--- trunk/tools/designer/src/components/taskmenu/taskmenu_component.h	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/taskmenu_component.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/taskmenu_global.h
===================================================================
--- trunk/tools/designer/src/components/taskmenu/taskmenu_global.h	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/taskmenu_global.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/textedit_taskmenu.cpp
===================================================================
--- trunk/tools/designer/src/components/taskmenu/textedit_taskmenu.cpp	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/textedit_taskmenu.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/textedit_taskmenu.h
===================================================================
--- trunk/tools/designer/src/components/taskmenu/textedit_taskmenu.h	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/textedit_taskmenu.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/toolbar_taskmenu.cpp
===================================================================
--- trunk/tools/designer/src/components/taskmenu/toolbar_taskmenu.cpp	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/toolbar_taskmenu.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/toolbar_taskmenu.h
===================================================================
--- trunk/tools/designer/src/components/taskmenu/toolbar_taskmenu.h	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/toolbar_taskmenu.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/treewidget_taskmenu.cpp
===================================================================
--- trunk/tools/designer/src/components/taskmenu/treewidget_taskmenu.cpp	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/treewidget_taskmenu.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/treewidget_taskmenu.h
===================================================================
--- trunk/tools/designer/src/components/taskmenu/treewidget_taskmenu.h	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/treewidget_taskmenu.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/treewidgeteditor.cpp
===================================================================
--- trunk/tools/designer/src/components/taskmenu/treewidgeteditor.cpp	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/treewidgeteditor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/treewidgeteditor.h
===================================================================
--- trunk/tools/designer/src/components/taskmenu/treewidgeteditor.h	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/treewidgeteditor.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/taskmenu/treewidgeteditor.ui
===================================================================
--- trunk/tools/designer/src/components/taskmenu/treewidgeteditor.ui	(revision 647)
+++ trunk/tools/designer/src/components/taskmenu/treewidgeteditor.ui	(revision 651)
@@ -2,5 +2,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/widgetbox/widgetbox.cpp
===================================================================
--- trunk/tools/designer/src/components/widgetbox/widgetbox.cpp	(revision 647)
+++ trunk/tools/designer/src/components/widgetbox/widgetbox.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/widgetbox/widgetbox.h
===================================================================
--- trunk/tools/designer/src/components/widgetbox/widgetbox.h	(revision 647)
+++ trunk/tools/designer/src/components/widgetbox/widgetbox.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/widgetbox/widgetbox.xml
===================================================================
--- trunk/tools/designer/src/components/widgetbox/widgetbox.xml	(revision 647)
+++ trunk/tools/designer/src/components/widgetbox/widgetbox.xml	(revision 651)
@@ -2,5 +2,5 @@
 <!--************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/widgetbox/widgetbox_dnditem.cpp
===================================================================
--- trunk/tools/designer/src/components/widgetbox/widgetbox_dnditem.cpp	(revision 647)
+++ trunk/tools/designer/src/components/widgetbox/widgetbox_dnditem.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/widgetbox/widgetbox_dnditem.h
===================================================================
--- trunk/tools/designer/src/components/widgetbox/widgetbox_dnditem.h	(revision 647)
+++ trunk/tools/designer/src/components/widgetbox/widgetbox_dnditem.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/widgetbox/widgetbox_global.h
===================================================================
--- trunk/tools/designer/src/components/widgetbox/widgetbox_global.h	(revision 647)
+++ trunk/tools/designer/src/components/widgetbox/widgetbox_global.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/widgetbox/widgetboxcategorylistview.cpp
===================================================================
--- trunk/tools/designer/src/components/widgetbox/widgetboxcategorylistview.cpp	(revision 647)
+++ trunk/tools/designer/src/components/widgetbox/widgetboxcategorylistview.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/widgetbox/widgetboxcategorylistview.h
===================================================================
--- trunk/tools/designer/src/components/widgetbox/widgetboxcategorylistview.h	(revision 647)
+++ trunk/tools/designer/src/components/widgetbox/widgetboxcategorylistview.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp
===================================================================
--- trunk/tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp	(revision 647)
+++ trunk/tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/components/widgetbox/widgetboxtreewidget.h
===================================================================
--- trunk/tools/designer/src/components/widgetbox/widgetboxtreewidget.h	(revision 647)
+++ trunk/tools/designer/src/components/widgetbox/widgetboxtreewidget.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/appfontdialog.cpp
===================================================================
--- trunk/tools/designer/src/designer/appfontdialog.cpp	(revision 647)
+++ trunk/tools/designer/src/designer/appfontdialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/appfontdialog.h
===================================================================
--- trunk/tools/designer/src/designer/appfontdialog.h	(revision 647)
+++ trunk/tools/designer/src/designer/appfontdialog.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/assistantclient.cpp
===================================================================
--- trunk/tools/designer/src/designer/assistantclient.cpp	(revision 647)
+++ trunk/tools/designer/src/designer/assistantclient.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/assistantclient.h
===================================================================
--- trunk/tools/designer/src/designer/assistantclient.h	(revision 647)
+++ trunk/tools/designer/src/designer/assistantclient.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/designer.rc
===================================================================
--- trunk/tools/designer/src/designer/designer.rc	(revision 647)
+++ trunk/tools/designer/src/designer/designer.rc	(revision 651)
@@ -19,5 +19,5 @@
             VALUE "FileDescription", "Qt Designer"
             VALUE "FileVersion", "1.0.0.0"
-            VALUE "LegalCopyright", "Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)."
+            VALUE "LegalCopyright", "Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)."
             VALUE "InternalName", "designer"
             VALUE "OriginalFilename", "designer.exe"
Index: trunk/tools/designer/src/designer/designer_enums.h
===================================================================
--- trunk/tools/designer/src/designer/designer_enums.h	(revision 647)
+++ trunk/tools/designer/src/designer/designer_enums.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/main.cpp
===================================================================
--- trunk/tools/designer/src/designer/main.cpp	(revision 647)
+++ trunk/tools/designer/src/designer/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/mainwindow.cpp
===================================================================
--- trunk/tools/designer/src/designer/mainwindow.cpp	(revision 647)
+++ trunk/tools/designer/src/designer/mainwindow.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/mainwindow.h
===================================================================
--- trunk/tools/designer/src/designer/mainwindow.h	(revision 647)
+++ trunk/tools/designer/src/designer/mainwindow.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/newform.cpp
===================================================================
--- trunk/tools/designer/src/designer/newform.cpp	(revision 647)
+++ trunk/tools/designer/src/designer/newform.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/newform.h
===================================================================
--- trunk/tools/designer/src/designer/newform.h	(revision 647)
+++ trunk/tools/designer/src/designer/newform.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/preferencesdialog.cpp
===================================================================
--- trunk/tools/designer/src/designer/preferencesdialog.cpp	(revision 647)
+++ trunk/tools/designer/src/designer/preferencesdialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/preferencesdialog.h
===================================================================
--- trunk/tools/designer/src/designer/preferencesdialog.h	(revision 647)
+++ trunk/tools/designer/src/designer/preferencesdialog.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/qdesigner.cpp
===================================================================
--- trunk/tools/designer/src/designer/qdesigner.cpp	(revision 647)
+++ trunk/tools/designer/src/designer/qdesigner.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/qdesigner.h
===================================================================
--- trunk/tools/designer/src/designer/qdesigner.h	(revision 647)
+++ trunk/tools/designer/src/designer/qdesigner.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/qdesigner_actions.cpp
===================================================================
--- trunk/tools/designer/src/designer/qdesigner_actions.cpp	(revision 647)
+++ trunk/tools/designer/src/designer/qdesigner_actions.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/qdesigner_actions.h
===================================================================
--- trunk/tools/designer/src/designer/qdesigner_actions.h	(revision 647)
+++ trunk/tools/designer/src/designer/qdesigner_actions.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/qdesigner_appearanceoptions.cpp
===================================================================
--- trunk/tools/designer/src/designer/qdesigner_appearanceoptions.cpp	(revision 647)
+++ trunk/tools/designer/src/designer/qdesigner_appearanceoptions.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/qdesigner_appearanceoptions.h
===================================================================
--- trunk/tools/designer/src/designer/qdesigner_appearanceoptions.h	(revision 647)
+++ trunk/tools/designer/src/designer/qdesigner_appearanceoptions.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/qdesigner_formwindow.cpp
===================================================================
--- trunk/tools/designer/src/designer/qdesigner_formwindow.cpp	(revision 647)
+++ trunk/tools/designer/src/designer/qdesigner_formwindow.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/qdesigner_formwindow.h
===================================================================
--- trunk/tools/designer/src/designer/qdesigner_formwindow.h	(revision 647)
+++ trunk/tools/designer/src/designer/qdesigner_formwindow.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/qdesigner_pch.h
===================================================================
--- trunk/tools/designer/src/designer/qdesigner_pch.h	(revision 647)
+++ trunk/tools/designer/src/designer/qdesigner_pch.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/qdesigner_server.cpp
===================================================================
--- trunk/tools/designer/src/designer/qdesigner_server.cpp	(revision 647)
+++ trunk/tools/designer/src/designer/qdesigner_server.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/qdesigner_server.h
===================================================================
--- trunk/tools/designer/src/designer/qdesigner_server.h	(revision 647)
+++ trunk/tools/designer/src/designer/qdesigner_server.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/qdesigner_settings.cpp
===================================================================
--- trunk/tools/designer/src/designer/qdesigner_settings.cpp	(revision 647)
+++ trunk/tools/designer/src/designer/qdesigner_settings.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/qdesigner_settings.h
===================================================================
--- trunk/tools/designer/src/designer/qdesigner_settings.h	(revision 647)
+++ trunk/tools/designer/src/designer/qdesigner_settings.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/qdesigner_toolwindow.cpp
===================================================================
--- trunk/tools/designer/src/designer/qdesigner_toolwindow.cpp	(revision 647)
+++ trunk/tools/designer/src/designer/qdesigner_toolwindow.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/qdesigner_toolwindow.h
===================================================================
--- trunk/tools/designer/src/designer/qdesigner_toolwindow.h	(revision 647)
+++ trunk/tools/designer/src/designer/qdesigner_toolwindow.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/qdesigner_workbench.cpp
===================================================================
--- trunk/tools/designer/src/designer/qdesigner_workbench.cpp	(revision 647)
+++ trunk/tools/designer/src/designer/qdesigner_workbench.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/qdesigner_workbench.h
===================================================================
--- trunk/tools/designer/src/designer/qdesigner_workbench.h	(revision 647)
+++ trunk/tools/designer/src/designer/qdesigner_workbench.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/saveformastemplate.cpp
===================================================================
--- trunk/tools/designer/src/designer/saveformastemplate.cpp	(revision 647)
+++ trunk/tools/designer/src/designer/saveformastemplate.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/saveformastemplate.h
===================================================================
--- trunk/tools/designer/src/designer/saveformastemplate.h	(revision 647)
+++ trunk/tools/designer/src/designer/saveformastemplate.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/saveformastemplate.ui
===================================================================
--- trunk/tools/designer/src/designer/saveformastemplate.ui	(revision 647)
+++ trunk/tools/designer/src/designer/saveformastemplate.ui	(revision 651)
@@ -2,5 +2,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/designer/versiondialog.cpp
===================================================================
--- trunk/tools/designer/src/designer/versiondialog.cpp	(revision 647)
+++ trunk/tools/designer/src/designer/versiondialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -174,5 +174,5 @@
 
     lbl->setText(tr("%1"
-                    "<br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)."
+                    "<br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)."
                     ).arg(version));
 
Index: trunk/tools/designer/src/designer/versiondialog.h
===================================================================
--- trunk/tools/designer/src/designer/versiondialog.h	(revision 647)
+++ trunk/tools/designer/src/designer/versiondialog.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/components/qdesigner_components.h
===================================================================
--- trunk/tools/designer/src/lib/components/qdesigner_components.h	(revision 647)
+++ trunk/tools/designer/src/lib/components/qdesigner_components.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/components/qdesigner_components_global.h
===================================================================
--- trunk/tools/designer/src/lib/components/qdesigner_components_global.h	(revision 647)
+++ trunk/tools/designer/src/lib/components/qdesigner_components_global.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/extension/default_extensionfactory.cpp
===================================================================
--- trunk/tools/designer/src/lib/extension/default_extensionfactory.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/extension/default_extensionfactory.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/extension/default_extensionfactory.h
===================================================================
--- trunk/tools/designer/src/lib/extension/default_extensionfactory.h	(revision 647)
+++ trunk/tools/designer/src/lib/extension/default_extensionfactory.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/extension/extension.cpp
===================================================================
--- trunk/tools/designer/src/lib/extension/extension.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/extension/extension.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/extension/extension.h
===================================================================
--- trunk/tools/designer/src/lib/extension/extension.h	(revision 647)
+++ trunk/tools/designer/src/lib/extension/extension.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/extension/extension_global.h
===================================================================
--- trunk/tools/designer/src/lib/extension/extension_global.h	(revision 647)
+++ trunk/tools/designer/src/lib/extension/extension_global.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/extension/qextensionmanager.cpp
===================================================================
--- trunk/tools/designer/src/lib/extension/qextensionmanager.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/extension/qextensionmanager.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/extension/qextensionmanager.h
===================================================================
--- trunk/tools/designer/src/lib/extension/qextensionmanager.h	(revision 647)
+++ trunk/tools/designer/src/lib/extension/qextensionmanager.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/lib_pch.h
===================================================================
--- trunk/tools/designer/src/lib/lib_pch.h	(revision 647)
+++ trunk/tools/designer/src/lib/lib_pch.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractactioneditor.cpp
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractactioneditor.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractactioneditor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractactioneditor.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractactioneditor.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractactioneditor.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractbrushmanager.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractbrushmanager.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractbrushmanager.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractdialoggui.cpp
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractdialoggui.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractdialoggui.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractdialoggui_p.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractdialoggui_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractdialoggui_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractdnditem.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractdnditem.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractdnditem.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractdnditem.qdoc
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractdnditem.qdoc	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractdnditem.qdoc	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractformeditor.cpp
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractformeditor.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractformeditor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractformeditor.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractformeditor.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractformeditor.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractformeditorplugin.cpp
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractformeditorplugin.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractformeditorplugin.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractformeditorplugin.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractformeditorplugin.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractformeditorplugin.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractformwindow.cpp
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractformwindow.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractformwindow.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractformwindow.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractformwindow.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractformwindow.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractformwindowcursor.cpp
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractformwindowcursor.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractformwindowcursor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractformwindowcursor.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractformwindowcursor.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractformwindowcursor.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractformwindowmanager.cpp
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractformwindowmanager.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractformwindowmanager.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractformwindowmanager.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractformwindowmanager.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractformwindowmanager.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractformwindowtool.cpp
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractformwindowtool.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractformwindowtool.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractformwindowtool.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractformwindowtool.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractformwindowtool.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstracticoncache.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstracticoncache.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstracticoncache.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstracticoncache.qdoc
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstracticoncache.qdoc	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstracticoncache.qdoc	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractintegration.cpp
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractintegration.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractintegration.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractintegration.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractintegration.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractintegration.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractintrospection.cpp
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractintrospection.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractintrospection.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractintrospection_p.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractintrospection_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractintrospection_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractlanguage.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractlanguage.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractlanguage.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractmetadatabase.cpp
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractmetadatabase.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractmetadatabase.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractmetadatabase.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractmetadatabase.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractmetadatabase.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractnewformwidget.cpp
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractnewformwidget.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractnewformwidget.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractnewformwidget_p.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractnewformwidget_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractnewformwidget_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractobjectinspector.cpp
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractobjectinspector.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractobjectinspector.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractobjectinspector.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractobjectinspector.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractobjectinspector.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractoptionspage_p.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractoptionspage_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractoptionspage_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractpromotioninterface.cpp
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractpromotioninterface.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractpromotioninterface.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractpromotioninterface.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractpromotioninterface.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractpromotioninterface.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractpropertyeditor.cpp
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractpropertyeditor.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractpropertyeditor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractpropertyeditor.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractpropertyeditor.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractpropertyeditor.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractresourcebrowser.cpp
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractresourcebrowser.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractresourcebrowser.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractresourcebrowser.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractresourcebrowser.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractresourcebrowser.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractsettings_p.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractsettings_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractsettings_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractwidgetbox.cpp
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractwidgetbox.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractwidgetbox.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractwidgetbox.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractwidgetbox.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractwidgetbox.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractwidgetdatabase.cpp
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractwidgetdatabase.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractwidgetdatabase.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractwidgetdatabase.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractwidgetdatabase.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractwidgetdatabase.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractwidgetfactory.cpp
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractwidgetfactory.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractwidgetfactory.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/abstractwidgetfactory.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/abstractwidgetfactory.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/abstractwidgetfactory.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/dynamicpropertysheet.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/dynamicpropertysheet.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/dynamicpropertysheet.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/dynamicpropertysheet.qdoc
===================================================================
--- trunk/tools/designer/src/lib/sdk/dynamicpropertysheet.qdoc	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/dynamicpropertysheet.qdoc	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/extrainfo.cpp
===================================================================
--- trunk/tools/designer/src/lib/sdk/extrainfo.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/extrainfo.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/extrainfo.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/extrainfo.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/extrainfo.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/layoutdecoration.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/layoutdecoration.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/layoutdecoration.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/layoutdecoration.qdoc
===================================================================
--- trunk/tools/designer/src/lib/sdk/layoutdecoration.qdoc	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/layoutdecoration.qdoc	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/membersheet.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/membersheet.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/membersheet.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/membersheet.qdoc
===================================================================
--- trunk/tools/designer/src/lib/sdk/membersheet.qdoc	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/membersheet.qdoc	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/propertysheet.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/propertysheet.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/propertysheet.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/propertysheet.qdoc
===================================================================
--- trunk/tools/designer/src/lib/sdk/propertysheet.qdoc	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/propertysheet.qdoc	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/script.cpp
===================================================================
--- trunk/tools/designer/src/lib/sdk/script.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/script.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/script_p.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/script_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/script_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/sdk_global.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/sdk_global.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/sdk_global.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/taskmenu.h
===================================================================
--- trunk/tools/designer/src/lib/sdk/taskmenu.h	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/taskmenu.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/sdk/taskmenu.qdoc
===================================================================
--- trunk/tools/designer/src/lib/sdk/taskmenu.qdoc	(revision 647)
+++ trunk/tools/designer/src/lib/sdk/taskmenu.qdoc	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/actioneditor.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/actioneditor.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/actioneditor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/actioneditor_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/actioneditor_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/actioneditor_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/actionprovider_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/actionprovider_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/actionprovider_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/actionrepository.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/actionrepository.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/actionrepository.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/actionrepository_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/actionrepository_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/actionrepository_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/codedialog.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/codedialog.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/codedialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/codedialog_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/codedialog_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/codedialog_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/connectionedit.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/connectionedit.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/connectionedit.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/connectionedit_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/connectionedit_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/connectionedit_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/csshighlighter.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/csshighlighter.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/csshighlighter.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/csshighlighter_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/csshighlighter_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/csshighlighter_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/deviceprofile.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/deviceprofile.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/deviceprofile.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/deviceprofile_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/deviceprofile_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/deviceprofile_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/dialoggui.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/dialoggui.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/dialoggui.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/dialoggui_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/dialoggui_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/dialoggui_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/extensionfactory_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/extensionfactory_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/extensionfactory_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/filterwidget.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/filterwidget.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/filterwidget.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/filterwidget_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/filterwidget_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/filterwidget_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/formlayoutmenu.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/formlayoutmenu.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/formlayoutmenu.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/formlayoutmenu_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/formlayoutmenu_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/formlayoutmenu_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/formwindowbase.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/formwindowbase.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/formwindowbase.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/formwindowbase_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/formwindowbase_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/formwindowbase_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/grid.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/grid.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/grid.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/grid_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/grid_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/grid_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/gridpanel.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/gridpanel.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/gridpanel.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/gridpanel_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/gridpanel_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/gridpanel_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/htmlhighlighter.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/htmlhighlighter.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/htmlhighlighter.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/htmlhighlighter_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/htmlhighlighter_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/htmlhighlighter_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/iconloader.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/iconloader.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/iconloader.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/iconloader_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/iconloader_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/iconloader_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/iconselector.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/iconselector.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/iconselector.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/iconselector_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/iconselector_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/iconselector_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/invisible_widget.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/invisible_widget.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/invisible_widget.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/invisible_widget_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/invisible_widget_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/invisible_widget_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/layout.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/layout.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/layout.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/layout_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/layout_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/layout_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/layoutinfo.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/layoutinfo.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/layoutinfo.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/layoutinfo_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/layoutinfo_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/layoutinfo_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/metadatabase.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/metadatabase.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/metadatabase.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/metadatabase_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/metadatabase_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/metadatabase_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/morphmenu.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/morphmenu.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/morphmenu.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/morphmenu_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/morphmenu_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/morphmenu_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/newactiondialog.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/newactiondialog.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/newactiondialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/newactiondialog.ui
===================================================================
--- trunk/tools/designer/src/lib/shared/newactiondialog.ui	(revision 647)
+++ trunk/tools/designer/src/lib/shared/newactiondialog.ui	(revision 651)
@@ -3,5 +3,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/newactiondialog_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/newactiondialog_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/newactiondialog_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/newformwidget.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/newformwidget.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/newformwidget.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/newformwidget.ui
===================================================================
--- trunk/tools/designer/src/lib/shared/newformwidget.ui	(revision 647)
+++ trunk/tools/designer/src/lib/shared/newformwidget.ui	(revision 651)
@@ -3,5 +3,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/newformwidget_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/newformwidget_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/newformwidget_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/orderdialog.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/orderdialog.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/orderdialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/orderdialog.ui
===================================================================
--- trunk/tools/designer/src/lib/shared/orderdialog.ui	(revision 647)
+++ trunk/tools/designer/src/lib/shared/orderdialog.ui	(revision 651)
@@ -2,5 +2,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/orderdialog_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/orderdialog_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/orderdialog_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/plaintexteditor.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/plaintexteditor.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/plaintexteditor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/plaintexteditor_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/plaintexteditor_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/plaintexteditor_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/plugindialog.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/plugindialog.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/plugindialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/plugindialog.ui
===================================================================
--- trunk/tools/designer/src/lib/shared/plugindialog.ui	(revision 647)
+++ trunk/tools/designer/src/lib/shared/plugindialog.ui	(revision 651)
@@ -3,5 +3,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/plugindialog_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/plugindialog_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/plugindialog_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/pluginmanager.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/pluginmanager.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/pluginmanager.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/pluginmanager_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/pluginmanager_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/pluginmanager_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/previewconfigurationwidget.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/previewconfigurationwidget.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/previewconfigurationwidget.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/previewconfigurationwidget_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/previewconfigurationwidget_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/previewconfigurationwidget_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/previewmanager.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/previewmanager.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/previewmanager.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/previewmanager_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/previewmanager_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/previewmanager_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/promotionmodel.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/promotionmodel.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/promotionmodel.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/promotionmodel_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/promotionmodel_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/promotionmodel_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/promotiontaskmenu.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/promotiontaskmenu.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/promotiontaskmenu.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/promotiontaskmenu_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/promotiontaskmenu_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/promotiontaskmenu_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/propertylineedit.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/propertylineedit.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/propertylineedit.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/propertylineedit_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/propertylineedit_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/propertylineedit_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_command.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_command.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_command.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_command2.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_command2.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_command2.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_command2_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_command2_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_command2_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_command_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_command_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_command_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_dnditem.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_dnditem.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_dnditem.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_dnditem_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_dnditem_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_dnditem_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_dockwidget.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_dockwidget.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_dockwidget.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_dockwidget_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_dockwidget_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_dockwidget_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_formbuilder.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_formbuilder.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_formbuilder.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_formbuilder_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_formbuilder_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_formbuilder_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_formeditorcommand.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_formeditorcommand.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_formeditorcommand.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_formeditorcommand_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_formeditorcommand_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_formeditorcommand_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_formwindowcommand.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_formwindowcommand.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_formwindowcommand.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_formwindowcommand_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_formwindowcommand_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_formwindowcommand_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_formwindowmanager.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_formwindowmanager.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_formwindowmanager.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_formwindowmanager_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_formwindowmanager_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_formwindowmanager_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_integration.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_integration.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_integration.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_integration_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_integration_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_integration_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_introspection.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_introspection.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_introspection.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_introspection_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_introspection_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_introspection_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_membersheet.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_membersheet.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_membersheet.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_membersheet_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_membersheet_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_membersheet_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_menu.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_menu.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_menu.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_menu_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_menu_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_menu_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_menubar.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_menubar.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_menubar.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_menubar_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_menubar_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_menubar_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_objectinspector.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_objectinspector.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_objectinspector.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_objectinspector_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_objectinspector_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_objectinspector_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_promotion.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_promotion.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_promotion.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_promotion_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_promotion_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_promotion_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_promotiondialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_promotiondialog_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_promotiondialog_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_promotiondialog_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_propertycommand.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_propertycommand.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_propertycommand.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_propertycommand_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_propertycommand_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_propertycommand_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_propertyeditor.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_propertyeditor.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_propertyeditor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_propertyeditor_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_propertyeditor_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_propertyeditor_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_propertysheet_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_propertysheet_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_propertysheet_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_qsettings.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_qsettings.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_qsettings.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_qsettings_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_qsettings_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_qsettings_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_stackedbox.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_stackedbox.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_stackedbox.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_stackedbox_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_stackedbox_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_stackedbox_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_tabwidget.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_tabwidget.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_tabwidget.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_tabwidget_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_tabwidget_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_tabwidget_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_taskmenu.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_taskmenu.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_taskmenu.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_taskmenu_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_taskmenu_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_taskmenu_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_toolbar.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_toolbar.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_toolbar.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_toolbar_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_toolbar_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_toolbar_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_toolbox.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_toolbox.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_toolbox.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_toolbox_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_toolbox_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_toolbox_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_utils.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_utils.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_utils.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_utils_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_utils_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_utils_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_widget.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_widget.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_widget.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_widget_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_widget_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_widget_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_widgetbox.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_widgetbox.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_widgetbox.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_widgetbox_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_widgetbox_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_widgetbox_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_widgetitem.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_widgetitem.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_widgetitem.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qdesigner_widgetitem_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qdesigner_widgetitem_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qdesigner_widgetitem_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qlayout_widget.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qlayout_widget.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qlayout_widget.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qlayout_widget_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qlayout_widget_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qlayout_widget_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qscripthighlighter.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qscripthighlighter.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qscripthighlighter.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qscripthighlighter_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qscripthighlighter_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qscripthighlighter_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qsimpleresource.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qsimpleresource.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qsimpleresource.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qsimpleresource_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qsimpleresource_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qsimpleresource_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qtresourceeditordialog.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qtresourceeditordialog.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qtresourceeditordialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qtresourceeditordialog_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qtresourceeditordialog_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qtresourceeditordialog_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qtresourcemodel.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qtresourcemodel.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qtresourcemodel.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qtresourcemodel_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qtresourcemodel_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qtresourcemodel_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qtresourceview.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/qtresourceview.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qtresourceview.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/qtresourceview_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/qtresourceview_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/qtresourceview_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/richtexteditor.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/richtexteditor.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/richtexteditor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/richtexteditor_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/richtexteditor_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/richtexteditor_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/scriptcommand.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/scriptcommand.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/scriptcommand.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/scriptcommand_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/scriptcommand_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/scriptcommand_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/scriptdialog.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/scriptdialog.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/scriptdialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/scriptdialog_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/scriptdialog_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/scriptdialog_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/scripterrordialog.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/scripterrordialog.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/scripterrordialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/scripterrordialog_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/scripterrordialog_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/scripterrordialog_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/shared_enums_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/shared_enums_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/shared_enums_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/shared_global_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/shared_global_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/shared_global_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/shared_settings.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/shared_settings.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/shared_settings.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/shared_settings_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/shared_settings_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/shared_settings_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/sheet_delegate.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/sheet_delegate.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/sheet_delegate.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/sheet_delegate_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/sheet_delegate_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/sheet_delegate_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/signalslotdialog.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/signalslotdialog.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/signalslotdialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/signalslotdialog_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/signalslotdialog_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/signalslotdialog_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/spacer_widget.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/spacer_widget.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/spacer_widget.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/spacer_widget_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/spacer_widget_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/spacer_widget_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/stylesheeteditor.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/stylesheeteditor.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/stylesheeteditor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/stylesheeteditor_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/stylesheeteditor_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/stylesheeteditor_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/textpropertyeditor.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/textpropertyeditor.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/textpropertyeditor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/textpropertyeditor_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/textpropertyeditor_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/textpropertyeditor_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/widgetdatabase.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/widgetdatabase.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/widgetdatabase.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/widgetdatabase_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/widgetdatabase_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/widgetdatabase_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/widgetfactory.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/widgetfactory.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/widgetfactory.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -775,4 +775,6 @@
 void WidgetFactory::applyStyleToTopLevel(QStyle *style, QWidget *widget)
 {
+    if (!style)
+        return;
     const QPalette standardPalette = style->standardPalette();
     if (widget->style() == style && widget->palette() == standardPalette)
Index: trunk/tools/designer/src/lib/shared/widgetfactory_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/widgetfactory_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/widgetfactory_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/zoomwidget.cpp
===================================================================
--- trunk/tools/designer/src/lib/shared/zoomwidget.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/shared/zoomwidget.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/shared/zoomwidget_p.h
===================================================================
--- trunk/tools/designer/src/lib/shared/zoomwidget_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/shared/zoomwidget_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/uilib/abstractformbuilder.cpp
===================================================================
--- trunk/tools/designer/src/lib/uilib/abstractformbuilder.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/uilib/abstractformbuilder.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/uilib/abstractformbuilder.h
===================================================================
--- trunk/tools/designer/src/lib/uilib/abstractformbuilder.h	(revision 647)
+++ trunk/tools/designer/src/lib/uilib/abstractformbuilder.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/uilib/container.h
===================================================================
--- trunk/tools/designer/src/lib/uilib/container.h	(revision 647)
+++ trunk/tools/designer/src/lib/uilib/container.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/uilib/container.qdoc
===================================================================
--- trunk/tools/designer/src/lib/uilib/container.qdoc	(revision 647)
+++ trunk/tools/designer/src/lib/uilib/container.qdoc	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/uilib/customwidget.h
===================================================================
--- trunk/tools/designer/src/lib/uilib/customwidget.h	(revision 647)
+++ trunk/tools/designer/src/lib/uilib/customwidget.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/uilib/customwidget.qdoc
===================================================================
--- trunk/tools/designer/src/lib/uilib/customwidget.qdoc	(revision 647)
+++ trunk/tools/designer/src/lib/uilib/customwidget.qdoc	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/uilib/formbuilder.cpp
===================================================================
--- trunk/tools/designer/src/lib/uilib/formbuilder.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/uilib/formbuilder.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/uilib/formbuilder.h
===================================================================
--- trunk/tools/designer/src/lib/uilib/formbuilder.h	(revision 647)
+++ trunk/tools/designer/src/lib/uilib/formbuilder.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/uilib/formbuilderextra.cpp
===================================================================
--- trunk/tools/designer/src/lib/uilib/formbuilderextra.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/uilib/formbuilderextra.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/uilib/formbuilderextra_p.h
===================================================================
--- trunk/tools/designer/src/lib/uilib/formbuilderextra_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/uilib/formbuilderextra_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/uilib/formscriptrunner.cpp
===================================================================
--- trunk/tools/designer/src/lib/uilib/formscriptrunner.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/uilib/formscriptrunner.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/uilib/formscriptrunner_p.h
===================================================================
--- trunk/tools/designer/src/lib/uilib/formscriptrunner_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/uilib/formscriptrunner_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/uilib/properties.cpp
===================================================================
--- trunk/tools/designer/src/lib/uilib/properties.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/uilib/properties.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/uilib/properties_p.h
===================================================================
--- trunk/tools/designer/src/lib/uilib/properties_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/uilib/properties_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/uilib/qdesignerexportwidget.h
===================================================================
--- trunk/tools/designer/src/lib/uilib/qdesignerexportwidget.h	(revision 647)
+++ trunk/tools/designer/src/lib/uilib/qdesignerexportwidget.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/uilib/resourcebuilder.cpp
===================================================================
--- trunk/tools/designer/src/lib/uilib/resourcebuilder.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/uilib/resourcebuilder.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/uilib/resourcebuilder_p.h
===================================================================
--- trunk/tools/designer/src/lib/uilib/resourcebuilder_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/uilib/resourcebuilder_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/uilib/textbuilder.cpp
===================================================================
--- trunk/tools/designer/src/lib/uilib/textbuilder.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/uilib/textbuilder.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/uilib/textbuilder_p.h
===================================================================
--- trunk/tools/designer/src/lib/uilib/textbuilder_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/uilib/textbuilder_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/uilib/ui4.cpp
===================================================================
--- trunk/tools/designer/src/lib/uilib/ui4.cpp	(revision 647)
+++ trunk/tools/designer/src/lib/uilib/ui4.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/uilib/ui4_p.h
===================================================================
--- trunk/tools/designer/src/lib/uilib/ui4_p.h	(revision 647)
+++ trunk/tools/designer/src/lib/uilib/ui4_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/lib/uilib/uilib_global.h
===================================================================
--- trunk/tools/designer/src/lib/uilib/uilib_global.h	(revision 647)
+++ trunk/tools/designer/src/lib/uilib/uilib_global.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/activeqt/qaxwidgetextrainfo.cpp
===================================================================
--- trunk/tools/designer/src/plugins/activeqt/qaxwidgetextrainfo.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/activeqt/qaxwidgetextrainfo.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/activeqt/qaxwidgetextrainfo.h
===================================================================
--- trunk/tools/designer/src/plugins/activeqt/qaxwidgetextrainfo.h	(revision 647)
+++ trunk/tools/designer/src/plugins/activeqt/qaxwidgetextrainfo.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/activeqt/qaxwidgetplugin.cpp
===================================================================
--- trunk/tools/designer/src/plugins/activeqt/qaxwidgetplugin.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/activeqt/qaxwidgetplugin.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/activeqt/qaxwidgetplugin.h
===================================================================
--- trunk/tools/designer/src/plugins/activeqt/qaxwidgetplugin.h	(revision 647)
+++ trunk/tools/designer/src/plugins/activeqt/qaxwidgetplugin.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp
===================================================================
--- trunk/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.h
===================================================================
--- trunk/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.h	(revision 647)
+++ trunk/tools/designer/src/plugins/activeqt/qaxwidgetpropertysheet.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp
===================================================================
--- trunk/tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.h
===================================================================
--- trunk/tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.h	(revision 647)
+++ trunk/tools/designer/src/plugins/activeqt/qaxwidgettaskmenu.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/activeqt/qdesigneraxwidget.cpp
===================================================================
--- trunk/tools/designer/src/plugins/activeqt/qdesigneraxwidget.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/activeqt/qdesigneraxwidget.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/activeqt/qdesigneraxwidget.h
===================================================================
--- trunk/tools/designer/src/plugins/activeqt/qdesigneraxwidget.h	(revision 647)
+++ trunk/tools/designer/src/plugins/activeqt/qdesigneraxwidget.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/phononwidgets/phononcollection.cpp
===================================================================
--- trunk/tools/designer/src/plugins/phononwidgets/phononcollection.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/phononwidgets/phononcollection.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/phononwidgets/seeksliderplugin.cpp
===================================================================
--- trunk/tools/designer/src/plugins/phononwidgets/seeksliderplugin.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/phononwidgets/seeksliderplugin.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/phononwidgets/seeksliderplugin.h
===================================================================
--- trunk/tools/designer/src/plugins/phononwidgets/seeksliderplugin.h	(revision 647)
+++ trunk/tools/designer/src/plugins/phononwidgets/seeksliderplugin.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/phononwidgets/videoplayerplugin.cpp
===================================================================
--- trunk/tools/designer/src/plugins/phononwidgets/videoplayerplugin.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/phononwidgets/videoplayerplugin.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/phononwidgets/videoplayerplugin.h
===================================================================
--- trunk/tools/designer/src/plugins/phononwidgets/videoplayerplugin.h	(revision 647)
+++ trunk/tools/designer/src/plugins/phononwidgets/videoplayerplugin.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.cpp
===================================================================
--- trunk/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.h
===================================================================
--- trunk/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.h	(revision 647)
+++ trunk/tools/designer/src/plugins/phononwidgets/videoplayertaskmenu.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/phononwidgets/volumesliderplugin.cpp
===================================================================
--- trunk/tools/designer/src/plugins/phononwidgets/volumesliderplugin.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/phononwidgets/volumesliderplugin.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/phononwidgets/volumesliderplugin.h
===================================================================
--- trunk/tools/designer/src/plugins/phononwidgets/volumesliderplugin.h	(revision 647)
+++ trunk/tools/designer/src/plugins/phononwidgets/volumesliderplugin.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/qwebview/qwebview_plugin.cpp
===================================================================
--- trunk/tools/designer/src/plugins/qwebview/qwebview_plugin.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/qwebview/qwebview_plugin.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/qwebview/qwebview_plugin.h
===================================================================
--- trunk/tools/designer/src/plugins/qwebview/qwebview_plugin.h	(revision 647)
+++ trunk/tools/designer/src/plugins/qwebview/qwebview_plugin.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/tools/view3d/view3d.cpp
===================================================================
--- trunk/tools/designer/src/plugins/tools/view3d/view3d.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/tools/view3d/view3d.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/tools/view3d/view3d.h
===================================================================
--- trunk/tools/designer/src/plugins/tools/view3d/view3d.h	(revision 647)
+++ trunk/tools/designer/src/plugins/tools/view3d/view3d.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/tools/view3d/view3d_global.h
===================================================================
--- trunk/tools/designer/src/plugins/tools/view3d/view3d_global.h	(revision 647)
+++ trunk/tools/designer/src/plugins/tools/view3d/view3d_global.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/tools/view3d/view3d_plugin.cpp
===================================================================
--- trunk/tools/designer/src/plugins/tools/view3d/view3d_plugin.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/tools/view3d/view3d_plugin.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/tools/view3d/view3d_plugin.h
===================================================================
--- trunk/tools/designer/src/plugins/tools/view3d/view3d_plugin.h	(revision 647)
+++ trunk/tools/designer/src/plugins/tools/view3d/view3d_plugin.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/tools/view3d/view3d_tool.cpp
===================================================================
--- trunk/tools/designer/src/plugins/tools/view3d/view3d_tool.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/tools/view3d/view3d_tool.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/tools/view3d/view3d_tool.h
===================================================================
--- trunk/tools/designer/src/plugins/tools/view3d/view3d_tool.h	(revision 647)
+++ trunk/tools/designer/src/plugins/tools/view3d/view3d_tool.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3iconview/q3iconview_extrainfo.cpp
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3iconview/q3iconview_extrainfo.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3iconview/q3iconview_extrainfo.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3iconview/q3iconview_extrainfo.h
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3iconview/q3iconview_extrainfo.h	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3iconview/q3iconview_extrainfo.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3iconview/q3iconview_plugin.cpp
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3iconview/q3iconview_plugin.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3iconview/q3iconview_plugin.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3iconview/q3iconview_plugin.h
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3iconview/q3iconview_plugin.h	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3iconview/q3iconview_plugin.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3listbox/q3listbox_extrainfo.cpp
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3listbox/q3listbox_extrainfo.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3listbox/q3listbox_extrainfo.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3listbox/q3listbox_extrainfo.h
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3listbox/q3listbox_extrainfo.h	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3listbox/q3listbox_extrainfo.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3listbox/q3listbox_plugin.cpp
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3listbox/q3listbox_plugin.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3listbox/q3listbox_plugin.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3listbox/q3listbox_plugin.h
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3listbox/q3listbox_plugin.h	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3listbox/q3listbox_plugin.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3listview/q3listview_extrainfo.cpp
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3listview/q3listview_extrainfo.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3listview/q3listview_extrainfo.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3listview/q3listview_extrainfo.h
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3listview/q3listview_extrainfo.h	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3listview/q3listview_extrainfo.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3listview/q3listview_plugin.cpp
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3listview/q3listview_plugin.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3listview/q3listview_plugin.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3listview/q3listview_plugin.h
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3listview/q3listview_plugin.h	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3listview/q3listview_plugin.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_container.cpp
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_container.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_container.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_container.h
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_container.h	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_container.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_plugin.cpp
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_plugin.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_plugin.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_plugin.h
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_plugin.h	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3mainwindow/q3mainwindow_plugin.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3table/q3table_extrainfo.cpp
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3table/q3table_extrainfo.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3table/q3table_extrainfo.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3table/q3table_extrainfo.h
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3table/q3table_extrainfo.h	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3table/q3table_extrainfo.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3table/q3table_plugin.cpp
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3table/q3table_plugin.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3table/q3table_plugin.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3table/q3table_plugin.h
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3table/q3table_plugin.h	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3table/q3table_plugin.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3textedit/q3textedit_extrainfo.cpp
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3textedit/q3textedit_extrainfo.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3textedit/q3textedit_extrainfo.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3textedit/q3textedit_extrainfo.h
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3textedit/q3textedit_extrainfo.h	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3textedit/q3textedit_extrainfo.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3textedit/q3textedit_plugin.cpp
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3textedit/q3textedit_plugin.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3textedit/q3textedit_plugin.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3textedit/q3textedit_plugin.h
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3textedit/q3textedit_plugin.h	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3textedit/q3textedit_plugin.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_extrainfo.cpp
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_extrainfo.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_extrainfo.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_extrainfo.h
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_extrainfo.h	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_extrainfo.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_plugin.cpp
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_plugin.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_plugin.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_plugin.h
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_plugin.h	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3toolbar/q3toolbar_plugin.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3widgets/q3widget_plugins.cpp
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3widgets/q3widget_plugins.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3widgets/q3widget_plugins.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3widgets/q3widget_plugins.h
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3widgets/q3widget_plugins.h	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3widgets/q3widget_plugins.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_container.cpp
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_container.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_container.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_container.h
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_container.h	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_container.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_plugin.cpp
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_plugin.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_plugin.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_plugin.h
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_plugin.h	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3widgetstack/q3widgetstack_plugin.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3widgetstack/qdesigner_q3widgetstack.cpp
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3widgetstack/qdesigner_q3widgetstack.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3widgetstack/qdesigner_q3widgetstack.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3widgetstack/qdesigner_q3widgetstack_p.h
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3widgetstack/qdesigner_q3widgetstack_p.h	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3widgetstack/qdesigner_q3widgetstack_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3wizard/q3wizard_container.cpp
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3wizard/q3wizard_container.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3wizard/q3wizard_container.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3wizard/q3wizard_container.h
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3wizard/q3wizard_container.h	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3wizard/q3wizard_container.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3wizard/q3wizard_plugin.cpp
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3wizard/q3wizard_plugin.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3wizard/q3wizard_plugin.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/q3wizard/q3wizard_plugin.h
===================================================================
--- trunk/tools/designer/src/plugins/widgets/q3wizard/q3wizard_plugin.h	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/q3wizard/q3wizard_plugin.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/plugins/widgets/qt3supportwidgets.cpp
===================================================================
--- trunk/tools/designer/src/plugins/widgets/qt3supportwidgets.cpp	(revision 647)
+++ trunk/tools/designer/src/plugins/widgets/qt3supportwidgets.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/uitools/quiloader.cpp
===================================================================
--- trunk/tools/designer/src/uitools/quiloader.cpp	(revision 647)
+++ trunk/tools/designer/src/uitools/quiloader.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/uitools/quiloader.h
===================================================================
--- trunk/tools/designer/src/uitools/quiloader.h	(revision 647)
+++ trunk/tools/designer/src/uitools/quiloader.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/designer/src/uitools/quiloader_p.h
===================================================================
--- trunk/tools/designer/src/uitools/quiloader_p.h	(revision 647)
+++ trunk/tools/designer/src/uitools/quiloader_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/doxygen/config/footer.html
===================================================================
--- trunk/tools/doxygen/config/footer.html	(revision 647)
+++ trunk/tools/doxygen/config/footer.html	(revision 651)
@@ -1,5 +1,5 @@
 <p /><address><hr /><div align="center">
 <table width="100%" cellspacing="0" border="0"><tr class="address">
-<td width="30%">Copyright &copy; 2009 Nokia Corporation</td>
+<td width="30%">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies).</td>
 <td width="40%" align="center"><a href="trademarks.html">Trademarks</a></td>
 <td width="30%" align="right"><div align="right">Qt $projectnumber</div></td>
Index: trunk/tools/doxygen/config/phonon.doxyfile
===================================================================
--- trunk/tools/doxygen/config/phonon.doxyfile	(revision 647)
+++ trunk/tools/doxygen/config/phonon.doxyfile	(revision 651)
@@ -6,5 +6,5 @@
 #---------------------------------------------------------------------------
 PROJECT_NAME           = Qt
-PROJECT_NUMBER         = 4.6.1
+PROJECT_NUMBER         = 4.6.2
 OUTPUT_DIRECTORY       = doc
 CREATE_SUBDIRS         = NO
Index: trunk/tools/kmap2qmap/main.cpp
===================================================================
--- trunk/tools/kmap2qmap/main.cpp	(revision 647)
+++ trunk/tools/kmap2qmap/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/lconvert/main.cpp
===================================================================
--- trunk/tools/linguist/lconvert/main.cpp	(revision 647)
+++ trunk/tools/linguist/lconvert/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/batchtranslation.ui
===================================================================
--- trunk/tools/linguist/linguist/batchtranslation.ui	(revision 647)
+++ trunk/tools/linguist/linguist/batchtranslation.ui	(revision 651)
@@ -3,5 +3,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/batchtranslationdialog.cpp
===================================================================
--- trunk/tools/linguist/linguist/batchtranslationdialog.cpp	(revision 647)
+++ trunk/tools/linguist/linguist/batchtranslationdialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/batchtranslationdialog.h
===================================================================
--- trunk/tools/linguist/linguist/batchtranslationdialog.h	(revision 647)
+++ trunk/tools/linguist/linguist/batchtranslationdialog.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/errorsview.cpp
===================================================================
--- trunk/tools/linguist/linguist/errorsview.cpp	(revision 647)
+++ trunk/tools/linguist/linguist/errorsview.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/errorsview.h
===================================================================
--- trunk/tools/linguist/linguist/errorsview.h	(revision 647)
+++ trunk/tools/linguist/linguist/errorsview.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/finddialog.cpp
===================================================================
--- trunk/tools/linguist/linguist/finddialog.cpp	(revision 647)
+++ trunk/tools/linguist/linguist/finddialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/finddialog.h
===================================================================
--- trunk/tools/linguist/linguist/finddialog.h	(revision 647)
+++ trunk/tools/linguist/linguist/finddialog.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/finddialog.ui
===================================================================
--- trunk/tools/linguist/linguist/finddialog.ui	(revision 647)
+++ trunk/tools/linguist/linguist/finddialog.ui	(revision 651)
@@ -3,5 +3,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/formpreviewview.cpp
===================================================================
--- trunk/tools/linguist/linguist/formpreviewview.cpp	(revision 647)
+++ trunk/tools/linguist/linguist/formpreviewview.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/formpreviewview.h
===================================================================
--- trunk/tools/linguist/linguist/formpreviewview.h	(revision 647)
+++ trunk/tools/linguist/linguist/formpreviewview.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/globals.cpp
===================================================================
--- trunk/tools/linguist/linguist/globals.cpp	(revision 647)
+++ trunk/tools/linguist/linguist/globals.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/globals.h
===================================================================
--- trunk/tools/linguist/linguist/globals.h	(revision 647)
+++ trunk/tools/linguist/linguist/globals.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/linguist.rc
===================================================================
--- trunk/tools/linguist/linguist/linguist.rc	(revision 647)
+++ trunk/tools/linguist/linguist/linguist.rc	(revision 651)
@@ -19,5 +19,5 @@
             VALUE "FileDescription", "Qt Linguist"
             VALUE "FileVersion", "1.0.0.0"
-            VALUE "LegalCopyright", "Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)."
+            VALUE "LegalCopyright", "Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)."
             VALUE "InternalName", "linguist"
             VALUE "OriginalFilename", "linguist.exe"
Index: trunk/tools/linguist/linguist/main.cpp
===================================================================
--- trunk/tools/linguist/linguist/main.cpp	(revision 647)
+++ trunk/tools/linguist/linguist/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/mainwindow.cpp
===================================================================
--- trunk/tools/linguist/linguist/mainwindow.cpp	(revision 647)
+++ trunk/tools/linguist/linguist/mainwindow.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -1363,5 +1363,5 @@
                     "<p>Qt Linguist is a tool for adding translations to Qt "
                     "applications.</p>"
-                    "<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)."
+                    "<p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)."
                    ).arg(version));
 
Index: trunk/tools/linguist/linguist/mainwindow.h
===================================================================
--- trunk/tools/linguist/linguist/mainwindow.h	(revision 647)
+++ trunk/tools/linguist/linguist/mainwindow.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/mainwindow.ui
===================================================================
--- trunk/tools/linguist/linguist/mainwindow.ui	(revision 647)
+++ trunk/tools/linguist/linguist/mainwindow.ui	(revision 651)
@@ -3,5 +3,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/messageeditor.cpp
===================================================================
--- trunk/tools/linguist/linguist/messageeditor.cpp	(revision 647)
+++ trunk/tools/linguist/linguist/messageeditor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -136,10 +136,6 @@
 {
     QFrame *editorPage = new QFrame;
-    editorPage->setObjectName(QLatin1String("editorPage"));
 
     editorPage->setStyleSheet(QLatin1String(
-            "QFrame#editorPage { border-image: url(:/images/transbox.png) 12 16 16 12 repeat;"
-            "                    border-width: 12px 16px 16px 12px; }"
-            "QFrame#editorPage { background-color: white; }"
             "QLabel { font-weight: bold; }"
             ));
Index: trunk/tools/linguist/linguist/messageeditor.h
===================================================================
--- trunk/tools/linguist/linguist/messageeditor.h	(revision 647)
+++ trunk/tools/linguist/linguist/messageeditor.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/messageeditorwidgets.cpp
===================================================================
--- trunk/tools/linguist/linguist/messageeditorwidgets.cpp	(revision 647)
+++ trunk/tools/linguist/linguist/messageeditorwidgets.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/messageeditorwidgets.h
===================================================================
--- trunk/tools/linguist/linguist/messageeditorwidgets.h	(revision 647)
+++ trunk/tools/linguist/linguist/messageeditorwidgets.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/messagehighlighter.cpp
===================================================================
--- trunk/tools/linguist/linguist/messagehighlighter.cpp	(revision 647)
+++ trunk/tools/linguist/linguist/messagehighlighter.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/messagehighlighter.h
===================================================================
--- trunk/tools/linguist/linguist/messagehighlighter.h	(revision 647)
+++ trunk/tools/linguist/linguist/messagehighlighter.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/messagemodel.cpp
===================================================================
--- trunk/tools/linguist/linguist/messagemodel.cpp	(revision 647)
+++ trunk/tools/linguist/linguist/messagemodel.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/messagemodel.h
===================================================================
--- trunk/tools/linguist/linguist/messagemodel.h	(revision 647)
+++ trunk/tools/linguist/linguist/messagemodel.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/phrase.cpp
===================================================================
--- trunk/tools/linguist/linguist/phrase.cpp	(revision 647)
+++ trunk/tools/linguist/linguist/phrase.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/phrase.h
===================================================================
--- trunk/tools/linguist/linguist/phrase.h	(revision 647)
+++ trunk/tools/linguist/linguist/phrase.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/phrasebookbox.cpp
===================================================================
--- trunk/tools/linguist/linguist/phrasebookbox.cpp	(revision 647)
+++ trunk/tools/linguist/linguist/phrasebookbox.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/phrasebookbox.h
===================================================================
--- trunk/tools/linguist/linguist/phrasebookbox.h	(revision 647)
+++ trunk/tools/linguist/linguist/phrasebookbox.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/phrasebookbox.ui
===================================================================
--- trunk/tools/linguist/linguist/phrasebookbox.ui	(revision 647)
+++ trunk/tools/linguist/linguist/phrasebookbox.ui	(revision 651)
@@ -3,5 +3,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/phrasemodel.cpp
===================================================================
--- trunk/tools/linguist/linguist/phrasemodel.cpp	(revision 647)
+++ trunk/tools/linguist/linguist/phrasemodel.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/phrasemodel.h
===================================================================
--- trunk/tools/linguist/linguist/phrasemodel.h	(revision 647)
+++ trunk/tools/linguist/linguist/phrasemodel.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/phraseview.cpp
===================================================================
--- trunk/tools/linguist/linguist/phraseview.cpp	(revision 647)
+++ trunk/tools/linguist/linguist/phraseview.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/phraseview.h
===================================================================
--- trunk/tools/linguist/linguist/phraseview.h	(revision 647)
+++ trunk/tools/linguist/linguist/phraseview.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/printout.cpp
===================================================================
--- trunk/tools/linguist/linguist/printout.cpp	(revision 647)
+++ trunk/tools/linguist/linguist/printout.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/printout.h
===================================================================
--- trunk/tools/linguist/linguist/printout.h	(revision 647)
+++ trunk/tools/linguist/linguist/printout.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/recentfiles.cpp
===================================================================
--- trunk/tools/linguist/linguist/recentfiles.cpp	(revision 647)
+++ trunk/tools/linguist/linguist/recentfiles.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/recentfiles.h
===================================================================
--- trunk/tools/linguist/linguist/recentfiles.h	(revision 647)
+++ trunk/tools/linguist/linguist/recentfiles.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/sourcecodeview.cpp
===================================================================
--- trunk/tools/linguist/linguist/sourcecodeview.cpp	(revision 647)
+++ trunk/tools/linguist/linguist/sourcecodeview.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/sourcecodeview.h
===================================================================
--- trunk/tools/linguist/linguist/sourcecodeview.h	(revision 647)
+++ trunk/tools/linguist/linguist/sourcecodeview.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/statistics.cpp
===================================================================
--- trunk/tools/linguist/linguist/statistics.cpp	(revision 647)
+++ trunk/tools/linguist/linguist/statistics.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/statistics.h
===================================================================
--- trunk/tools/linguist/linguist/statistics.h	(revision 647)
+++ trunk/tools/linguist/linguist/statistics.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/statistics.ui
===================================================================
--- trunk/tools/linguist/linguist/statistics.ui	(revision 647)
+++ trunk/tools/linguist/linguist/statistics.ui	(revision 651)
@@ -3,5 +3,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/translatedialog.cpp
===================================================================
--- trunk/tools/linguist/linguist/translatedialog.cpp	(revision 647)
+++ trunk/tools/linguist/linguist/translatedialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/translatedialog.h
===================================================================
--- trunk/tools/linguist/linguist/translatedialog.h	(revision 647)
+++ trunk/tools/linguist/linguist/translatedialog.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/translatedialog.ui
===================================================================
--- trunk/tools/linguist/linguist/translatedialog.ui	(revision 647)
+++ trunk/tools/linguist/linguist/translatedialog.ui	(revision 651)
@@ -3,5 +3,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/translationsettingsdialog.cpp
===================================================================
--- trunk/tools/linguist/linguist/translationsettingsdialog.cpp	(revision 647)
+++ trunk/tools/linguist/linguist/translationsettingsdialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/linguist/translationsettingsdialog.h
===================================================================
--- trunk/tools/linguist/linguist/translationsettingsdialog.h	(revision 647)
+++ trunk/tools/linguist/linguist/translationsettingsdialog.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/lrelease/main.cpp
===================================================================
--- trunk/tools/linguist/lrelease/main.cpp	(revision 647)
+++ trunk/tools/linguist/lrelease/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -41,5 +41,5 @@
 
 #include "translator.h"
-#include "proreader.h"
+#include "profileevaluator.h"
 
 #ifndef QT_BOOTSTRAPPED
@@ -112,4 +112,5 @@
             printOut(cd.error());
     }
+    cd.clearErrors();
     return ok;
 }
@@ -142,9 +143,9 @@
         qWarning("lrelease error: cannot save '%s': %s\n",
                  qPrintable(qmFileName), qPrintable(cd.error()));
-        return false;
     } else if (!cd.errors().isEmpty()) {
         printOut(cd.error());
     }
-    return true;
+    cd.clearErrors();
+    return ok;
 }
 
@@ -246,22 +247,29 @@
         if (inputFile.endsWith(QLatin1String(".pro"), Qt::CaseInsensitive)
             || inputFile.endsWith(QLatin1String(".pri"), Qt::CaseInsensitive)) {
-            QHash<QByteArray, QStringList> varMap;
-            bool ok = evaluateProFile(inputFile, cd.isVerbose(), &varMap);
-            if (ok) {
-                QStringList translations = varMap.value("TRANSLATIONS");
-                if (translations.isEmpty()) {
-                    qWarning("lrelease warning: Met no 'TRANSLATIONS' entry in"
-                             " project file '%s'\n",
-                             qPrintable(inputFile));
-                } else {
-                    foreach (const QString &trans, translations)
-                        if (!releaseTsFile(trans, cd, removeIdentical))
-                            return 1;
-                }
+            QFileInfo fi(inputFile);
+            ProFile pro(fi.absoluteFilePath());
+
+            ProFileEvaluator visitor;
+            visitor.setVerbose(cd.isVerbose());
+
+            if (!visitor.queryProFile(&pro)) {
+                qWarning("lrelease error: cannot read project file '%s'.", qPrintable(inputFile));
+                continue;
+            }
+            if (!visitor.accept(&pro)) {
+                qWarning("lrelease error: cannot process project file '%s'.", qPrintable(inputFile));
+                continue;
+            }
+
+            QStringList translations = visitor.values(QLatin1String("TRANSLATIONS"));
+            if (translations.isEmpty()) {
+                qWarning("lrelease warning: Met no 'TRANSLATIONS' entry in"
+                         " project file '%s'\n",
+                         qPrintable(inputFile));
             } else {
-                qWarning("error: lrelease encountered project file functionality that is currently not supported.\n"
-                    "You might want to consider using TS files as input instead of a project file.\n"
-                    "Try the following syntax:\n"
-                    "    lrelease [options] ts-files [-qm qm-file]\n");
+                QDir proDir(fi.absolutePath());
+                foreach (const QString &trans, translations)
+                    if (!releaseTsFile(QFileInfo(proDir, trans).filePath(), cd, removeIdentical))
+                        return 1;
             }
         } else {
Index: trunk/tools/linguist/lupdate/cpp.cpp
===================================================================
--- trunk/tools/linguist/lupdate/cpp.cpp	(revision 647)
+++ trunk/tools/linguist/lupdate/cpp.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -1733,5 +1733,5 @@
                     }
                 }
-                if (!pendingContext.isEmpty()) {
+                if (!pendingContext.isEmpty() && !prefix.startsWith(strColons)) {
                     QStringList unresolved;
                     if (!fullyQualify(namespaces, pendingContext, true, &functionContext, &unresolved)) {
Index: trunk/tools/linguist/lupdate/java.cpp
===================================================================
--- trunk/tools/linguist/lupdate/java.cpp	(revision 647)
+++ trunk/tools/linguist/lupdate/java.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/lupdate/lupdate.h
===================================================================
--- trunk/tools/linguist/lupdate/lupdate.h	(revision 647)
+++ trunk/tools/linguist/lupdate/lupdate.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/lupdate/main.cpp
===================================================================
--- trunk/tools/linguist/lupdate/main.cpp	(revision 647)
+++ trunk/tools/linguist/lupdate/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -44,5 +44,4 @@
 #include <translator.h>
 #include <profileevaluator.h>
-#include <proreader.h>
 
 #include <QtCore/QCoreApplication>
@@ -119,6 +118,6 @@
         "           Disable the named merge heuristic. Can be specified multiple times.\n"
         "    -pro <filename>\n"
-        "           Name of a .pro file. Useful for files with .pro\n"
-        "           file syntax but different file suffix\n"
+        "           Name of a .pro file. Useful for files with .pro file syntax but\n"
+        "           different file suffix. Projects are recursed into and merged.\n"
         "    -source-language <language>[_<region>]\n"
         "           Specify the language of the source strings for new files.\n"
@@ -127,4 +126,9 @@
         "           Specify the language of the translations for new files.\n"
         "           Guessed from the file name if not specified.\n"
+        "    -ts <ts-file>...\n"
+        "           Specify the output file(s). This will override the TRANSLATIONS\n"
+        "           and nullify the CODECFORTR from possibly specified project files.\n"
+        "    -codecfortr <codec>\n"
+        "           Specify the codec assumed for tr() calls. Effective only with -ts.\n"
         "    -version\n"
         "           Display the version of lupdate and exit.\n"
@@ -215,4 +219,188 @@
 }
 
+static QStringList getSources(const char *var, const char *vvar, const QStringList &baseVPaths,
+                              const QString &projectDir, const ProFileEvaluator &visitor)
+{
+    QStringList vPaths = visitor.absolutePathValues(QLatin1String(vvar), projectDir);
+    vPaths += baseVPaths;
+    vPaths.removeDuplicates();
+    return visitor.absoluteFileValues(QLatin1String(var), projectDir, vPaths, 0);
+}
+
+static QStringList getSources(const ProFileEvaluator &visitor, const QString &projectDir)
+{
+    QStringList baseVPaths;
+    baseVPaths += visitor.absolutePathValues(QLatin1String("VPATH"), projectDir);
+    baseVPaths << projectDir; // QMAKE_ABSOLUTE_SOURCE_PATH
+    baseVPaths += visitor.absolutePathValues(QLatin1String("DEPENDPATH"), projectDir);
+    baseVPaths.removeDuplicates();
+
+    QStringList sourceFiles;
+
+    // app/lib template
+    sourceFiles += getSources("SOURCES", "VPATH_SOURCES", baseVPaths, projectDir, visitor);
+
+    sourceFiles += getSources("FORMS", "VPATH_FORMS", baseVPaths, projectDir, visitor);
+    sourceFiles += getSources("FORMS3", "VPATH_FORMS3", baseVPaths, projectDir, visitor);
+
+    QStringList vPathsInc = baseVPaths;
+    vPathsInc += visitor.absolutePathValues(QLatin1String("INCLUDEPATH"), projectDir);
+    vPathsInc.removeDuplicates();
+    sourceFiles += visitor.absoluteFileValues(QLatin1String("HEADERS"), projectDir, vPathsInc, 0);
+
+    sourceFiles.removeDuplicates();
+    sourceFiles.sort();
+
+    return sourceFiles;
+}
+
+static void processSources(Translator &fetchedTor,
+                           const QStringList &sourceFiles, ConversionData &cd)
+{
+    QStringList sourceFilesCpp;
+    for (QStringList::const_iterator it = sourceFiles.begin(); it != sourceFiles.end(); ++it) {
+        if (it->endsWith(QLatin1String(".java"), Qt::CaseInsensitive))
+            loadJava(fetchedTor, *it, cd);
+        else if (it->endsWith(QLatin1String(".ui"), Qt::CaseInsensitive)
+                 || it->endsWith(QLatin1String(".jui"), Qt::CaseInsensitive))
+            loadUI(fetchedTor, *it, cd);
+        else if (it->endsWith(QLatin1String(".js"), Qt::CaseInsensitive)
+                 || it->endsWith(QLatin1String(".qs"), Qt::CaseInsensitive))
+            loadQScript(fetchedTor, *it, cd);
+        else
+            sourceFilesCpp << *it;
+    }
+    loadCPP(fetchedTor, sourceFilesCpp, cd);
+    if (!cd.error().isEmpty())
+        printOut(cd.error());
+}
+
+static void processProjects(
+        bool topLevel, bool nestComplain, const QStringList &proFiles,
+        UpdateOptions options, const QByteArray &codecForSource,
+        const QString &targetLanguage, const QString &sourceLanguage,
+        Translator *parentTor, bool *fail);
+
+static void processProject(
+        bool nestComplain, const QFileInfo &pfi, ProFileEvaluator &visitor,
+        UpdateOptions options, const QByteArray &_codecForSource,
+        const QString &targetLanguage, const QString &sourceLanguage,
+        Translator *fetchedTor, bool *fail)
+{
+    QByteArray codecForSource = _codecForSource;
+    QStringList tmp = visitor.values(QLatin1String("CODECFORSRC"));
+    if (!tmp.isEmpty()) {
+        codecForSource = tmp.last().toLatin1();
+        if (!QTextCodec::codecForName(codecForSource)) {
+            qWarning("lupdate warning: Codec for source '%s' is invalid. "
+                     "Falling back to codec for tr().", codecForSource.constData());
+            codecForSource.clear();
+        }
+    }
+    if (visitor.templateType() == ProFileEvaluator::TT_Subdirs) {
+        QStringList subProFiles;
+        QDir proDir(pfi.absoluteDir());
+        foreach (const QString &subdir, visitor.values(QLatin1String("SUBDIRS"))) {
+            QString subPro = QDir::cleanPath(proDir.absoluteFilePath(subdir));
+            QFileInfo subInfo(subPro);
+            if (subInfo.isDir())
+                subProFiles << (subPro + QLatin1Char('/')
+                                + subInfo.fileName() + QLatin1String(".pro"));
+            else
+                subProFiles << subPro;
+        }
+        processProjects(false, nestComplain, subProFiles, options, codecForSource,
+                        targetLanguage, sourceLanguage, fetchedTor, fail);
+    } else {
+        ConversionData cd;
+        cd.m_noUiLines = options & NoUiLines;
+        cd.m_codecForSource = codecForSource;
+        cd.m_includePath = visitor.values(QLatin1String("INCLUDEPATH"));
+        QStringList sourceFiles = getSources(visitor, pfi.absolutePath());
+        QSet<QString> sourceDirs;
+        sourceDirs.insert(QDir::cleanPath(pfi.absolutePath()) + QLatin1Char('/'));
+        foreach (const QString &sf, sourceFiles)
+            sourceDirs.insert(sf.left(sf.lastIndexOf(QLatin1Char('/')) + 1));
+        QStringList rootList = sourceDirs.toList();
+        rootList.sort();
+        for (int prev = 0, curr = 1; curr < rootList.length(); )
+            if (rootList.at(curr).startsWith(rootList.at(prev)))
+                rootList.removeAt(curr);
+            else
+                prev = curr++;
+        cd.m_projectRoots = QSet<QString>::fromList(rootList);
+        processSources(*fetchedTor, sourceFiles, cd);
+    }
+}
+
+static void processProjects(
+        bool topLevel, bool nestComplain, const QStringList &proFiles,
+        UpdateOptions options, const QByteArray &codecForSource,
+        const QString &targetLanguage, const QString &sourceLanguage,
+        Translator *parentTor, bool *fail)
+{
+    foreach (const QString &proFile, proFiles) {
+        ProFileEvaluator visitor;
+        visitor.setVerbose(options & Verbose);
+
+        QFileInfo pfi(proFile);
+        ProFile pro(pfi.absoluteFilePath());
+        if (!visitor.queryProFile(&pro) || !visitor.accept(&pro)) {
+            if (topLevel)
+                *fail = true;
+            continue;
+        }
+
+        if (visitor.contains(QLatin1String("TRANSLATIONS"))) {
+            if (parentTor) {
+                if (topLevel) {
+                    std::cerr << "lupdate warning: TS files from command line "
+                            "will override TRANSLATIONS in " << qPrintable(proFile) << ".\n";
+                    goto noTrans;
+                } else if (nestComplain) {
+                    std::cerr << "lupdate warning: TS files from command line "
+                            "prevent recursing into " << qPrintable(proFile) << ".\n";
+                    continue;
+                }
+            }
+            QStringList tsFiles;
+            QDir proDir(pfi.absolutePath());
+            foreach (const QString &tsFile, visitor.values(QLatin1String("TRANSLATIONS")))
+                tsFiles << QFileInfo(proDir, tsFile).filePath();
+            if (tsFiles.isEmpty()) {
+                // This might mean either a buggy PRO file or an intentional detach -
+                // we can't know without seeing the actual RHS of the assignment ...
+                // Just assume correctness and be silent.
+                continue;
+            }
+            Translator tor;
+            QByteArray codecForTr;
+            QStringList tmp = visitor.values(QLatin1String("CODEC"))
+                              + visitor.values(QLatin1String("DEFAULTCODEC"))
+                              + visitor.values(QLatin1String("CODECFORTR"));
+            if (!tmp.isEmpty()) {
+                codecForTr = tmp.last().toLatin1();
+                tor.setCodecName(codecForTr);
+            }
+            processProject(false, pfi, visitor, options, codecForSource,
+                           targetLanguage, sourceLanguage, &tor, fail);
+            updateTsFiles(tor, tsFiles, codecForTr, sourceLanguage, targetLanguage, options, fail);
+            continue;
+        }
+      noTrans:
+        if (!parentTor) {
+            if (topLevel)
+                std::cerr << "lupdate warning: no TS files specified. Only diagnostics "
+                        "will be produced for '" << qPrintable(proFile) << "'.\n";
+            Translator tor;
+            processProject(nestComplain, pfi, visitor, options, codecForSource,
+                           targetLanguage, sourceLanguage, &tor, fail);
+        } else {
+            processProject(nestComplain, pfi, visitor, options, codecForSource,
+                           targetLanguage, sourceLanguage, parentTor, fail);
+        }
+    }
+}
+
 int main(int argc, char **argv)
 {
@@ -221,8 +409,4 @@
 
     QStringList args = app.arguments();
-    QString defaultContext; // This was QLatin1String("@default") before.
-    Translator fetchedTor;
-    QByteArray codecForTr;
-    QByteArray codecForSource;
     QStringList tsFileNames;
     QStringList proFiles;
@@ -233,4 +417,5 @@
     QString targetLanguage;
     QString sourceLanguage;
+    QByteArray codecForTr;
 
     UpdateOptions options =
@@ -238,5 +423,4 @@
         HeuristicSameText | HeuristicSimilarText | HeuristicNumber;
     int numFiles = 0;
-    bool standardSyntax = true;
     bool metTsFlag = false;
     bool recursiveScan = true;
@@ -244,9 +428,4 @@
     QString extensions = m_defaultExtensions;
     QSet<QString> extensionsNameFilters;
-
-    for (int  i = 1; i < argc; ++i) {
-        if (args.at(i) == QLatin1String("-ts"))
-            standardSyntax = false;
-    }
 
     for (int i = 1; i < argc; ++i) {
@@ -337,4 +516,12 @@
             printOut(QObject::tr("lupdate version %1\n").arg(QLatin1String(QT_VERSION_STR)));
             return 0;
+        } else if (arg == QLatin1String("-codecfortr")) {
+            ++i;
+            if (i == argc) {
+                qWarning("The -codecfortr option should be followed by a codec name.");
+                return 1;
+            }
+            codecForTr = args[i].toLatin1();
+            continue;
         } else if (arg == QLatin1String("-ts")) {
             metTsFlag = true;
@@ -373,11 +560,4 @@
             return 1;
         }
-
-        numFiles++;
-
-        QString fullText;
-
-        codecForTr.clear();
-        codecForSource.clear();
 
         if (metTsFlag) {
@@ -404,4 +584,5 @@
                 || arg.endsWith(QLatin1String(".pri"), Qt::CaseInsensitive)) {
             proFiles << arg;
+            numFiles++;
         } else {
             QFileInfo fi(arg);
@@ -448,104 +629,52 @@
                 sourceFiles << QDir::cleanPath(fi.absoluteFilePath());;
             }
+            numFiles++;
         }
     } // for args
 
-    foreach (const QString &proFile, proFiles)
-        projectRoots.insert(QDir::cleanPath(QFileInfo(proFile).absolutePath()) + QLatin1Char('/'));
-
-    bool firstPass = true;
+    if (numFiles == 0) {
+        printUsage();
+        return 1;
+    }
+
+    if (!targetLanguage.isEmpty() && tsFileNames.count() != 1)
+        std::cerr << "lupdate warning: -target-language usually only "
+                     "makes sense with exactly one TS file.\n";
+    if (!codecForTr.isEmpty() && tsFileNames.isEmpty())
+        std::cerr << "lupdate warning: -codecfortr has no effect without -ts.\n";
+
     bool fail = false;
-    while (firstPass || !proFiles.isEmpty()) {
+    if (proFiles.isEmpty()) {
+        if (tsFileNames.isEmpty())
+            std::cerr << "lupdate warning: no TS files specified. "
+                         "Only diagnostics will be produced.\n";
+
+        Translator fetchedTor;
         ConversionData cd;
-        cd.m_defaultContext = defaultContext;
         cd.m_noUiLines = options & NoUiLines;
         cd.m_projectRoots = projectRoots;
         cd.m_includePath = includePath;
         cd.m_allCSources = allCSources;
-
-        QStringList tsFiles = tsFileNames;
-        if (proFiles.count() > 0) {
-            QFileInfo pfi(proFiles.takeFirst());
-            QHash<QByteArray, QStringList> variables;
-
-            ProFileEvaluator visitor;
-            visitor.setVerbose(options & Verbose);
-
-            ProFile pro(pfi.absoluteFilePath());
-            if (!visitor.queryProFile(&pro))
-                return 2;
-            if (!visitor.accept(&pro))
-                return 2;
-
-            if (visitor.templateType() == ProFileEvaluator::TT_Subdirs) {
-                QDir proDir(pfi.absoluteDir());
-                foreach (const QString &subdir, visitor.values(QLatin1String("SUBDIRS"))) {
-                    QString subPro = QDir::cleanPath(proDir.absoluteFilePath(subdir));
-                    QFileInfo subInfo(subPro);
-                    if (subInfo.isDir())
-                        proFiles << (subPro + QLatin1Char('/')
-                                     + subInfo.fileName() + QLatin1String(".pro"));
-                    else
-                        proFiles << subPro;
-                }
-                continue;
-            }
-
-            cd.m_includePath += visitor.values(QLatin1String("INCLUDEPATH"));
-
-            evaluateProFile(visitor, &variables, pfi.absolutePath());
-
-            sourceFiles = variables.value("SOURCES");
-
-            QStringList tmp = variables.value("CODECFORTR");
-            if (!tmp.isEmpty() && !tmp.first().isEmpty()) {
-                codecForTr = tmp.first().toLatin1();
-                fetchedTor.setCodecName(codecForTr);
-                cd.m_outputCodec = codecForTr;
-            }
-            tmp = variables.value("CODECFORSRC");
-            if (!tmp.isEmpty() && !tmp.first().isEmpty()) {
-                codecForSource = tmp.first().toLatin1();
-                if (!QTextCodec::codecForName(codecForSource))
-                    qWarning("lupdate warning: Codec for source '%s' is invalid. Falling back to codec for tr().",
-                             codecForSource.constData());
-                else
-                    cd.m_codecForSource = codecForSource;
-            }
-
-            tsFiles += variables.value("TRANSLATIONS");
-        }
-
-        QStringList sourceFilesCpp;
-        for (QStringList::iterator it = sourceFiles.begin(); it != sourceFiles.end(); ++it) {
-            if (it->endsWith(QLatin1String(".java"), Qt::CaseInsensitive))
-                loadJava(fetchedTor, *it, cd);
-            else if (it->endsWith(QLatin1String(".ui"), Qt::CaseInsensitive)
-                     || it->endsWith(QLatin1String(".jui"), Qt::CaseInsensitive))
-                loadUI(fetchedTor, *it, cd);
-            else if (it->endsWith(QLatin1String(".js"), Qt::CaseInsensitive)
-                     || it->endsWith(QLatin1String(".qs"), Qt::CaseInsensitive))
-                loadQScript(fetchedTor, *it, cd);
-            else
-                sourceFilesCpp << *it;
-        }
-        loadCPP(fetchedTor, sourceFilesCpp, cd);
-        if (!cd.error().isEmpty())
-            printOut(cd.error());
-
-        tsFiles.sort();
-        tsFiles.removeDuplicates();
-
-        if (!tsFiles.isEmpty())
-            updateTsFiles(fetchedTor, tsFiles, codecForTr, sourceLanguage, targetLanguage, options, &fail);
-
-        firstPass = false;
+        fetchedTor.setCodecName(codecForTr);
+        processSources(fetchedTor, sourceFiles, cd);
+        updateTsFiles(fetchedTor, tsFileNames, codecForTr,
+                      sourceLanguage, targetLanguage, options, &fail);
+    } else {
+        if (!sourceFiles.isEmpty() || !includePath.isEmpty()) {
+            qWarning("lupdate error: Both project and source files / include paths specified.\n");
+            return 1;
+        }
+        if (!tsFileNames.isEmpty()) {
+            Translator fetchedTor;
+            fetchedTor.setCodecName(codecForTr);
+            processProjects(true, true, proFiles, options, QByteArray(),
+                            targetLanguage, sourceLanguage, &fetchedTor, &fail);
+            updateTsFiles(fetchedTor, tsFileNames, codecForTr,
+                          sourceLanguage, targetLanguage, options, &fail);
+        } else {
+            processProjects(true, false, proFiles, options, QByteArray(),
+                            targetLanguage, sourceLanguage, 0, &fail);
+        }
     }
-
-    if (numFiles == 0) {
-        printUsage();
-        return 1;
-    }
-
     return fail ? 1 : 0;
 }
Index: trunk/tools/linguist/lupdate/merge.cpp
===================================================================
--- trunk/tools/linguist/lupdate/merge.cpp	(revision 647)
+++ trunk/tools/linguist/lupdate/merge.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -61,5 +61,5 @@
 static int numberLength(const QString &s, int i)
 {
-    if (i < s.size() || !s.at(i).isDigit())
+    if (i >= s.size() || !s.at(i).isDigit())
         return 0;
 
@@ -88,5 +88,5 @@
     bool metSomething = false;
 
-    for (int i = 0; i != key.size(); ++i) {
+    for (int i = 0; i < key.size(); ++i) {
         int len = numberLength(key, i);
         if (len > 0) {
Index: trunk/tools/linguist/lupdate/qscript.cpp
===================================================================
--- trunk/tools/linguist/lupdate/qscript.cpp	(revision 647)
+++ trunk/tools/linguist/lupdate/qscript.cpp	(revision 651)
@@ -2,5 +2,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/lupdate/qscript.g
===================================================================
--- trunk/tools/linguist/lupdate/qscript.g	(revision 647)
+++ trunk/tools/linguist/lupdate/qscript.g	(revision 651)
@@ -1,5 +1,5 @@
 ----------------------------------------------------------------------------
 --
--- 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)
Index: trunk/tools/linguist/lupdate/ui.cpp
===================================================================
--- trunk/tools/linguist/lupdate/ui.cpp	(revision 647)
+++ trunk/tools/linguist/lupdate/ui.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/shared/abstractproitemvisitor.h
===================================================================
--- trunk/tools/linguist/shared/abstractproitemvisitor.h	(revision 647)
+++ trunk/tools/linguist/shared/abstractproitemvisitor.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/shared/numerus.cpp
===================================================================
--- trunk/tools/linguist/shared/numerus.cpp	(revision 647)
+++ trunk/tools/linguist/shared/numerus.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/shared/po.cpp
===================================================================
--- trunk/tools/linguist/shared/po.cpp	(revision 647)
+++ trunk/tools/linguist/shared/po.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/shared/profileevaluator.cpp
===================================================================
--- trunk/tools/linguist/shared/profileevaluator.cpp	(revision 647)
+++ trunk/tools/linguist/shared/profileevaluator.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/shared/profileevaluator.h
===================================================================
--- trunk/tools/linguist/shared/profileevaluator.h	(revision 647)
+++ trunk/tools/linguist/shared/profileevaluator.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/shared/proitems.cpp
===================================================================
--- trunk/tools/linguist/shared/proitems.cpp	(revision 647)
+++ trunk/tools/linguist/shared/proitems.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/shared/proitems.h
===================================================================
--- trunk/tools/linguist/shared/proitems.h	(revision 647)
+++ trunk/tools/linguist/shared/proitems.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/shared/proparser.pri
===================================================================
--- trunk/tools/linguist/shared/proparser.pri	(revision 647)
+++ trunk/tools/linguist/shared/proparser.pri	(revision 651)
@@ -3,5 +3,4 @@
 
 HEADERS += \
-    $$PWD/proreader.h \
     $$PWD/abstractproitemvisitor.h \
     $$PWD/proitems.h \
@@ -10,5 +9,4 @@
 
 SOURCES += \
-    $$PWD/proreader.cpp \
     $$PWD/proitems.cpp \
     $$PWD/profileevaluator.cpp 
Index: trunk/tools/linguist/shared/proparserutils.h
===================================================================
--- trunk/tools/linguist/shared/proparserutils.h	(revision 647)
+++ trunk/tools/linguist/shared/proparserutils.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/shared/proreader.cpp
===================================================================
--- trunk/tools/linguist/shared/proreader.cpp	(revision 647)
+++ 	(revision )
@@ -1,131 +1,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt Linguist of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "profileevaluator.h"
-
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-
-QT_BEGIN_NAMESPACE
-
-static QStringList getSources(const char *var, const char *vvar, const QStringList &baseVPaths,
-                              const QString &projectDir, const ProFileEvaluator &visitor)
-{
-    QStringList vPaths =
-        visitor.absolutePathValues(QLatin1String(vvar), projectDir);
-    vPaths += baseVPaths;
-    vPaths.removeDuplicates();
-    return visitor.absoluteFileValues(QLatin1String(var), projectDir, vPaths, 0);
-}
-
-void evaluateProFile(const ProFileEvaluator &visitor, QHash<QByteArray, QStringList> *varMap,
-                     const QString &projectDir)
-{
-    QStringList baseVPaths;
-    baseVPaths += visitor.absolutePathValues(QLatin1String("VPATH"), projectDir);
-    baseVPaths << projectDir; // QMAKE_ABSOLUTE_SOURCE_PATH
-    baseVPaths += visitor.absolutePathValues(QLatin1String("DEPENDPATH"), projectDir);
-    baseVPaths.removeDuplicates();
-
-    QStringList sourceFiles;
-    QString codecForTr;
-    QString codecForSource;
-    QStringList tsFileNames;
-
-    // app/lib template
-    sourceFiles += getSources("SOURCES", "VPATH_SOURCES", baseVPaths, projectDir, visitor);
-
-    sourceFiles += getSources("FORMS", "VPATH_FORMS", baseVPaths, projectDir, visitor);
-    sourceFiles += getSources("FORMS3", "VPATH_FORMS3", baseVPaths, projectDir, visitor);
-
-    QStringList vPathsInc = baseVPaths;
-    vPathsInc += visitor.absolutePathValues(QLatin1String("INCLUDEPATH"), projectDir);
-    vPathsInc.removeDuplicates();
-    sourceFiles += visitor.absoluteFileValues(QLatin1String("HEADERS"), projectDir, vPathsInc, 0);
-
-    QDir proDir(projectDir);
-    foreach (const QString &tsFile, visitor.values(QLatin1String("TRANSLATIONS")))
-        tsFileNames << QFileInfo(proDir, tsFile).filePath();
-
-    QStringList trcodec = visitor.values(QLatin1String("CODEC"))
-        + visitor.values(QLatin1String("DEFAULTCODEC"))
-        + visitor.values(QLatin1String("CODECFORTR"));
-    if (!trcodec.isEmpty())
-        codecForTr = trcodec.last();
-
-    QStringList srccodec = visitor.values(QLatin1String("CODECFORSRC"));
-    if (!srccodec.isEmpty())
-        codecForSource = srccodec.last();
-
-    sourceFiles.sort();
-    sourceFiles.removeDuplicates();
-    tsFileNames.sort();
-    tsFileNames.removeDuplicates();
-
-    varMap->insert("SOURCES", sourceFiles);
-    varMap->insert("CODECFORTR", QStringList() << codecForTr);
-    varMap->insert("CODECFORSRC", QStringList() << codecForSource);
-    varMap->insert("TRANSLATIONS", tsFileNames);
-}
-
-bool evaluateProFile(const QString &fileName, bool verbose, QHash<QByteArray, QStringList> *varMap)
-{
-    QFileInfo fi(fileName);
-    if (!fi.exists())
-        return false;
-
-    ProFile pro(fi.absoluteFilePath());
-
-    ProFileEvaluator visitor;
-    visitor.setVerbose(verbose);
-
-    if (!visitor.queryProFile(&pro))
-        return false;
-
-    if (!visitor.accept(&pro))
-        return false;
-
-    evaluateProFile(visitor, varMap, fi.absolutePath());
-
-    return true;
-}
-
-QT_END_NAMESPACE
Index: trunk/tools/linguist/shared/proreader.h
===================================================================
--- trunk/tools/linguist/shared/proreader.h	(revision 647)
+++ 	(revision )
@@ -1,57 +1,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt Linguist of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef PROREADER_H
-#define PROREADER_H
-
-#include <QtCore/QHash>
-
-QT_BEGIN_NAMESPACE
-
-class ProFileEvaluator;
-
-void evaluateProFile(const ProFileEvaluator &visitor, QHash<QByteArray, QStringList> *varMap,
-                     const QString &projectDir);
-bool evaluateProFile(const QString &fileName, bool verbose, QHash<QByteArray, QStringList> *varMap);
-
-QT_END_NAMESPACE
-
-#endif // PROREADER_H
Index: trunk/tools/linguist/shared/qm.cpp
===================================================================
--- trunk/tools/linguist/shared/qm.cpp	(revision 647)
+++ trunk/tools/linguist/shared/qm.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/shared/qph.cpp
===================================================================
--- trunk/tools/linguist/shared/qph.cpp	(revision 647)
+++ trunk/tools/linguist/shared/qph.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/shared/simtexth.cpp
===================================================================
--- trunk/tools/linguist/shared/simtexth.cpp	(revision 647)
+++ trunk/tools/linguist/shared/simtexth.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/shared/simtexth.h
===================================================================
--- trunk/tools/linguist/shared/simtexth.h	(revision 647)
+++ trunk/tools/linguist/shared/simtexth.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/shared/translator.cpp
===================================================================
--- trunk/tools/linguist/shared/translator.cpp	(revision 647)
+++ trunk/tools/linguist/shared/translator.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -45,4 +45,8 @@
 
 #include <stdio.h>
+#ifdef Q_OS_WIN
+#include <io.h> // required for _setmode, to avoid _O_TEXT streams...
+#include <fcntl.h> // for _O_BINARY
+#endif
 
 #include <QtCore/QDebug>
@@ -208,4 +212,8 @@
     QFile file;
     if (filename.isEmpty() || filename == QLatin1String("-")) {
+#ifdef Q_OS_WIN
+        // QFile is broken for text files
+        ::_setmode(0, _O_BINARY);
+#endif
         if (!file.open(stdin, QIODevice::ReadOnly)) {
             cd.appendError(QString::fromLatin1("Cannot open stdin!? (%1)")
@@ -244,4 +252,8 @@
     QFile file;
     if (filename.isEmpty() || filename == QLatin1String("-")) {
+#ifdef Q_OS_WIN
+        // QFile is broken for text files
+        ::_setmode(1, _O_BINARY);
+#endif
         if (!file.open(stdout, QIODevice::WriteOnly)) {
             cd.appendError(QString::fromLatin1("Cannot open stdout!? (%1)")
Index: trunk/tools/linguist/shared/translator.h
===================================================================
--- trunk/tools/linguist/shared/translator.h	(revision 647)
+++ trunk/tools/linguist/shared/translator.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/shared/translatormessage.cpp
===================================================================
--- trunk/tools/linguist/shared/translatormessage.cpp	(revision 647)
+++ trunk/tools/linguist/shared/translatormessage.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/shared/translatormessage.h
===================================================================
--- trunk/tools/linguist/shared/translatormessage.h	(revision 647)
+++ trunk/tools/linguist/shared/translatormessage.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/shared/ts.cpp
===================================================================
--- trunk/tools/linguist/shared/ts.cpp	(revision 647)
+++ trunk/tools/linguist/shared/ts.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/linguist/shared/xliff.cpp
===================================================================
--- trunk/tools/linguist/shared/xliff.cpp	(revision 647)
+++ trunk/tools/linguist/shared/xliff.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/macdeployqt/macchangeqt/main.cpp
===================================================================
--- trunk/tools/macdeployqt/macchangeqt/main.cpp	(revision 647)
+++ trunk/tools/macdeployqt/macchangeqt/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/macdeployqt/macdeployqt/main.cpp
===================================================================
--- trunk/tools/macdeployqt/macdeployqt/main.cpp	(revision 647)
+++ trunk/tools/macdeployqt/macdeployqt/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/macdeployqt/shared/shared.cpp
===================================================================
--- trunk/tools/macdeployqt/shared/shared.cpp	(revision 647)
+++ trunk/tools/macdeployqt/shared/shared.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/macdeployqt/shared/shared.h
===================================================================
--- trunk/tools/macdeployqt/shared/shared.h	(revision 647)
+++ trunk/tools/macdeployqt/shared/shared.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/macdeployqt/tests/tst_deployment_mac.cpp
===================================================================
--- trunk/tools/macdeployqt/tests/tst_deployment_mac.cpp	(revision 647)
+++ trunk/tools/macdeployqt/tests/tst_deployment_mac.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/makeqpf/main.cpp
===================================================================
--- trunk/tools/makeqpf/main.cpp	(revision 647)
+++ trunk/tools/makeqpf/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/makeqpf/mainwindow.cpp
===================================================================
--- trunk/tools/makeqpf/mainwindow.cpp	(revision 647)
+++ trunk/tools/makeqpf/mainwindow.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/makeqpf/mainwindow.h
===================================================================
--- trunk/tools/makeqpf/mainwindow.h	(revision 647)
+++ trunk/tools/makeqpf/mainwindow.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/makeqpf/qpf2.cpp
===================================================================
--- trunk/tools/makeqpf/qpf2.cpp	(revision 647)
+++ trunk/tools/makeqpf/qpf2.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/makeqpf/qpf2.h
===================================================================
--- trunk/tools/makeqpf/qpf2.h	(revision 647)
+++ trunk/tools/makeqpf/qpf2.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/pixeltool/main.cpp
===================================================================
--- trunk/tools/pixeltool/main.cpp	(revision 647)
+++ trunk/tools/pixeltool/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/pixeltool/qpixeltool.cpp
===================================================================
--- trunk/tools/pixeltool/qpixeltool.cpp	(revision 647)
+++ trunk/tools/pixeltool/qpixeltool.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/pixeltool/qpixeltool.h
===================================================================
--- trunk/tools/pixeltool/qpixeltool.h	(revision 647)
+++ trunk/tools/pixeltool/qpixeltool.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/ast.cpp
===================================================================
--- trunk/tools/porting/src/ast.cpp	(revision 647)
+++ trunk/tools/porting/src/ast.cpp	(revision 651)
@@ -2,5 +2,5 @@
 **
 ** Copyright (C) 2001-2004 Roberto Raggi
-** 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)
Index: trunk/tools/porting/src/ast.h
===================================================================
--- trunk/tools/porting/src/ast.h	(revision 647)
+++ trunk/tools/porting/src/ast.h	(revision 651)
@@ -2,5 +2,5 @@
 **
 ** Copyright (C) 2001-2004 Roberto Raggi
-** 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)
Index: trunk/tools/porting/src/codemodel.cpp
===================================================================
--- trunk/tools/porting/src/codemodel.cpp	(revision 647)
+++ trunk/tools/porting/src/codemodel.cpp	(revision 651)
@@ -2,5 +2,5 @@
 **
 ** Copyright (C) 2001-2004 Roberto Raggi
-** 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)
Index: trunk/tools/porting/src/codemodel.h
===================================================================
--- trunk/tools/porting/src/codemodel.h	(revision 647)
+++ trunk/tools/porting/src/codemodel.h	(revision 651)
@@ -2,5 +2,5 @@
 **
 ** Copyright (C) 2001-2004 Roberto Raggi
-** 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)
Index: trunk/tools/porting/src/codemodelattributes.cpp
===================================================================
--- trunk/tools/porting/src/codemodelattributes.cpp	(revision 647)
+++ trunk/tools/porting/src/codemodelattributes.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/codemodelattributes.h
===================================================================
--- trunk/tools/porting/src/codemodelattributes.h	(revision 647)
+++ trunk/tools/porting/src/codemodelattributes.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/codemodelwalker.cpp
===================================================================
--- trunk/tools/porting/src/codemodelwalker.cpp	(revision 647)
+++ trunk/tools/porting/src/codemodelwalker.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/codemodelwalker.h
===================================================================
--- trunk/tools/porting/src/codemodelwalker.h	(revision 647)
+++ trunk/tools/porting/src/codemodelwalker.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/cpplexer.cpp
===================================================================
--- trunk/tools/porting/src/cpplexer.cpp	(revision 647)
+++ trunk/tools/porting/src/cpplexer.cpp	(revision 651)
@@ -2,5 +2,5 @@
 **
 ** Copyright (C) 2001-2004 Roberto Raggi
-** 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)
Index: trunk/tools/porting/src/cpplexer.h
===================================================================
--- trunk/tools/porting/src/cpplexer.h	(revision 647)
+++ trunk/tools/porting/src/cpplexer.h	(revision 651)
@@ -2,5 +2,5 @@
 **
 ** Copyright (C) 2001-2004 Roberto Raggi
-** 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)
Index: trunk/tools/porting/src/errors.cpp
===================================================================
--- trunk/tools/porting/src/errors.cpp	(revision 647)
+++ trunk/tools/porting/src/errors.cpp	(revision 651)
@@ -2,5 +2,5 @@
 **
 ** Copyright (C) 2001-2004 Roberto Raggi
-** 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)
Index: trunk/tools/porting/src/errors.h
===================================================================
--- trunk/tools/porting/src/errors.h	(revision 647)
+++ trunk/tools/porting/src/errors.h	(revision 651)
@@ -2,5 +2,5 @@
 **
 ** Copyright (C) 2001-2004 Roberto Raggi
-** 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)
Index: trunk/tools/porting/src/fileporter.cpp
===================================================================
--- trunk/tools/porting/src/fileporter.cpp	(revision 647)
+++ trunk/tools/porting/src/fileporter.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/fileporter.h
===================================================================
--- trunk/tools/porting/src/fileporter.h	(revision 647)
+++ trunk/tools/porting/src/fileporter.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/filewriter.cpp
===================================================================
--- trunk/tools/porting/src/filewriter.cpp	(revision 647)
+++ trunk/tools/porting/src/filewriter.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/filewriter.h
===================================================================
--- trunk/tools/porting/src/filewriter.h	(revision 647)
+++ trunk/tools/porting/src/filewriter.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/list.h
===================================================================
--- trunk/tools/porting/src/list.h	(revision 647)
+++ trunk/tools/porting/src/list.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/logger.cpp
===================================================================
--- trunk/tools/porting/src/logger.cpp	(revision 647)
+++ trunk/tools/porting/src/logger.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/logger.h
===================================================================
--- trunk/tools/porting/src/logger.h	(revision 647)
+++ trunk/tools/porting/src/logger.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/parser.cpp
===================================================================
--- trunk/tools/porting/src/parser.cpp	(revision 647)
+++ trunk/tools/porting/src/parser.cpp	(revision 651)
@@ -2,5 +2,5 @@
 **
 ** Copyright (C) 2001-2004 Roberto Raggi
-** 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)
Index: trunk/tools/porting/src/parser.h
===================================================================
--- trunk/tools/porting/src/parser.h	(revision 647)
+++ trunk/tools/porting/src/parser.h	(revision 651)
@@ -2,5 +2,5 @@
 **
 ** Copyright (C) 2001-2004 Roberto Raggi
-** 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)
Index: trunk/tools/porting/src/port.cpp
===================================================================
--- trunk/tools/porting/src/port.cpp	(revision 647)
+++ trunk/tools/porting/src/port.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/portingrules.cpp
===================================================================
--- trunk/tools/porting/src/portingrules.cpp	(revision 647)
+++ trunk/tools/porting/src/portingrules.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/portingrules.h
===================================================================
--- trunk/tools/porting/src/portingrules.h	(revision 647)
+++ trunk/tools/porting/src/portingrules.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/preprocessorcontrol.cpp
===================================================================
--- trunk/tools/porting/src/preprocessorcontrol.cpp	(revision 647)
+++ trunk/tools/porting/src/preprocessorcontrol.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/preprocessorcontrol.h
===================================================================
--- trunk/tools/porting/src/preprocessorcontrol.h	(revision 647)
+++ trunk/tools/porting/src/preprocessorcontrol.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/projectporter.cpp
===================================================================
--- trunk/tools/porting/src/projectporter.cpp	(revision 647)
+++ trunk/tools/porting/src/projectporter.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/projectporter.h
===================================================================
--- trunk/tools/porting/src/projectporter.h	(revision 647)
+++ trunk/tools/porting/src/projectporter.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/proparser.cpp
===================================================================
--- trunk/tools/porting/src/proparser.cpp	(revision 647)
+++ trunk/tools/porting/src/proparser.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/proparser.h
===================================================================
--- trunk/tools/porting/src/proparser.h	(revision 647)
+++ trunk/tools/porting/src/proparser.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/q3porting.xml
===================================================================
--- trunk/tools/porting/src/q3porting.xml	(revision 647)
+++ trunk/tools/porting/src/q3porting.xml	(revision 651)
@@ -2,5 +2,5 @@
 <!--************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/qtsimplexml.cpp
===================================================================
--- trunk/tools/porting/src/qtsimplexml.cpp	(revision 647)
+++ trunk/tools/porting/src/qtsimplexml.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/qtsimplexml.h
===================================================================
--- trunk/tools/porting/src/qtsimplexml.h	(revision 647)
+++ trunk/tools/porting/src/qtsimplexml.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/replacetoken.cpp
===================================================================
--- trunk/tools/porting/src/replacetoken.cpp	(revision 647)
+++ trunk/tools/porting/src/replacetoken.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/replacetoken.h
===================================================================
--- trunk/tools/porting/src/replacetoken.h	(revision 647)
+++ trunk/tools/porting/src/replacetoken.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/rpp.cpp
===================================================================
--- trunk/tools/porting/src/rpp.cpp	(revision 647)
+++ trunk/tools/porting/src/rpp.cpp	(revision 651)
@@ -2,5 +2,5 @@
 **
 ** Copyright (C) 2001-2004 Roberto Raggi
-** 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)
Index: trunk/tools/porting/src/rpp.h
===================================================================
--- trunk/tools/porting/src/rpp.h	(revision 647)
+++ trunk/tools/porting/src/rpp.h	(revision 651)
@@ -2,5 +2,5 @@
 **
 ** Copyright (C) 2001-2004 Roberto Raggi
-** 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)
Index: trunk/tools/porting/src/rppexpressionbuilder.cpp
===================================================================
--- trunk/tools/porting/src/rppexpressionbuilder.cpp	(revision 647)
+++ trunk/tools/porting/src/rppexpressionbuilder.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/rppexpressionbuilder.h
===================================================================
--- trunk/tools/porting/src/rppexpressionbuilder.h	(revision 647)
+++ trunk/tools/porting/src/rppexpressionbuilder.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/rpplexer.cpp
===================================================================
--- trunk/tools/porting/src/rpplexer.cpp	(revision 647)
+++ trunk/tools/porting/src/rpplexer.cpp	(revision 651)
@@ -2,5 +2,5 @@
 **
 ** Copyright (C) 2001-2004 Roberto Raggi
-** 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)
Index: trunk/tools/porting/src/rpplexer.h
===================================================================
--- trunk/tools/porting/src/rpplexer.h	(revision 647)
+++ trunk/tools/porting/src/rpplexer.h	(revision 651)
@@ -2,5 +2,5 @@
 **
 ** Copyright (C) 2001-2004 Roberto Raggi
-** 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)
Index: trunk/tools/porting/src/rpptreeevaluator.cpp
===================================================================
--- trunk/tools/porting/src/rpptreeevaluator.cpp	(revision 647)
+++ trunk/tools/porting/src/rpptreeevaluator.cpp	(revision 651)
@@ -2,5 +2,5 @@
 **
 ** Copyright (C) 2001-2004 Roberto Raggi
-** 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)
Index: trunk/tools/porting/src/rpptreeevaluator.h
===================================================================
--- trunk/tools/porting/src/rpptreeevaluator.h	(revision 647)
+++ trunk/tools/porting/src/rpptreeevaluator.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/rpptreewalker.cpp
===================================================================
--- trunk/tools/porting/src/rpptreewalker.cpp	(revision 647)
+++ trunk/tools/porting/src/rpptreewalker.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/rpptreewalker.h
===================================================================
--- trunk/tools/porting/src/rpptreewalker.h	(revision 647)
+++ trunk/tools/porting/src/rpptreewalker.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/semantic.cpp
===================================================================
--- trunk/tools/porting/src/semantic.cpp	(revision 647)
+++ trunk/tools/porting/src/semantic.cpp	(revision 651)
@@ -2,5 +2,5 @@
 **
 ** Copyright (C) 2001-2004 Roberto Raggi
-** 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)
Index: trunk/tools/porting/src/semantic.h
===================================================================
--- trunk/tools/porting/src/semantic.h	(revision 647)
+++ trunk/tools/porting/src/semantic.h	(revision 651)
@@ -2,5 +2,5 @@
 **
 ** Copyright (C) 2001-2004 Roberto Raggi
-** 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)
Index: trunk/tools/porting/src/smallobject.cpp
===================================================================
--- trunk/tools/porting/src/smallobject.cpp	(revision 647)
+++ trunk/tools/porting/src/smallobject.cpp	(revision 651)
@@ -2,5 +2,5 @@
 **
 ** Copyright (C) 2001-2004 Roberto Raggi
-** 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)
Index: trunk/tools/porting/src/smallobject.h
===================================================================
--- trunk/tools/porting/src/smallobject.h	(revision 647)
+++ trunk/tools/porting/src/smallobject.h	(revision 651)
@@ -2,5 +2,5 @@
 **
 ** Copyright (C) 2001-2004 Roberto Raggi
-** 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)
Index: trunk/tools/porting/src/textreplacement.cpp
===================================================================
--- trunk/tools/porting/src/textreplacement.cpp	(revision 647)
+++ trunk/tools/porting/src/textreplacement.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/textreplacement.h
===================================================================
--- trunk/tools/porting/src/textreplacement.h	(revision 647)
+++ trunk/tools/porting/src/textreplacement.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/tokenengine.cpp
===================================================================
--- trunk/tools/porting/src/tokenengine.cpp	(revision 647)
+++ trunk/tools/porting/src/tokenengine.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/tokenengine.h
===================================================================
--- trunk/tools/porting/src/tokenengine.h	(revision 647)
+++ trunk/tools/porting/src/tokenengine.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/tokenizer.cpp
===================================================================
--- trunk/tools/porting/src/tokenizer.cpp	(revision 647)
+++ trunk/tools/porting/src/tokenizer.cpp	(revision 651)
@@ -2,5 +2,5 @@
 **
 ** Copyright (C) 2001-2004 Roberto Raggi
-** 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)
Index: trunk/tools/porting/src/tokenizer.h
===================================================================
--- trunk/tools/porting/src/tokenizer.h	(revision 647)
+++ trunk/tools/porting/src/tokenizer.h	(revision 651)
@@ -2,5 +2,5 @@
 **
 ** Copyright (C) 2001-2004 Roberto Raggi
-** 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)
Index: trunk/tools/porting/src/tokenreplacements.cpp
===================================================================
--- trunk/tools/porting/src/tokenreplacements.cpp	(revision 647)
+++ trunk/tools/porting/src/tokenreplacements.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/tokenreplacements.h
===================================================================
--- trunk/tools/porting/src/tokenreplacements.h	(revision 647)
+++ trunk/tools/porting/src/tokenreplacements.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/tokens.h
===================================================================
--- trunk/tools/porting/src/tokens.h	(revision 647)
+++ trunk/tools/porting/src/tokens.h	(revision 651)
@@ -2,5 +2,5 @@
 **
 ** Copyright (C) 2001-2004 Roberto Raggi
-** 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)
Index: trunk/tools/porting/src/tokenstreamadapter.h
===================================================================
--- trunk/tools/porting/src/tokenstreamadapter.h	(revision 647)
+++ trunk/tools/porting/src/tokenstreamadapter.h	(revision 651)
@@ -2,5 +2,5 @@
 **
 ** Copyright (C) 2001-2004 Roberto Raggi
-** 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)
Index: trunk/tools/porting/src/translationunit.cpp
===================================================================
--- trunk/tools/porting/src/translationunit.cpp	(revision 647)
+++ trunk/tools/porting/src/translationunit.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/translationunit.h
===================================================================
--- trunk/tools/porting/src/translationunit.h	(revision 647)
+++ trunk/tools/porting/src/translationunit.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/porting/src/treewalker.cpp
===================================================================
--- trunk/tools/porting/src/treewalker.cpp	(revision 647)
+++ trunk/tools/porting/src/treewalker.cpp	(revision 651)
@@ -2,5 +2,5 @@
 **
 ** Copyright (C) 2001-2004 Roberto Raggi
-** 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)
Index: trunk/tools/porting/src/treewalker.h
===================================================================
--- trunk/tools/porting/src/treewalker.h	(revision 647)
+++ trunk/tools/porting/src/treewalker.h	(revision 651)
@@ -2,5 +2,5 @@
 **
 ** Copyright (C) 2001-2004 Roberto Raggi
-** 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)
Index: trunk/tools/qconfig/feature.cpp
===================================================================
--- trunk/tools/qconfig/feature.cpp	(revision 647)
+++ trunk/tools/qconfig/feature.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qconfig/feature.h
===================================================================
--- trunk/tools/qconfig/feature.h	(revision 647)
+++ trunk/tools/qconfig/feature.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qconfig/featuretreemodel.cpp
===================================================================
--- trunk/tools/qconfig/featuretreemodel.cpp	(revision 647)
+++ trunk/tools/qconfig/featuretreemodel.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qconfig/featuretreemodel.h
===================================================================
--- trunk/tools/qconfig/featuretreemodel.h	(revision 647)
+++ trunk/tools/qconfig/featuretreemodel.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qconfig/graphics.h
===================================================================
--- trunk/tools/qconfig/graphics.h	(revision 647)
+++ trunk/tools/qconfig/graphics.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qconfig/main.cpp
===================================================================
--- trunk/tools/qconfig/main.cpp	(revision 647)
+++ trunk/tools/qconfig/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -506,5 +506,5 @@
 	"<p></p>"
 	"<p>Version 2.0</p>"
-	"<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p>"
+	"<p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p>"
 	"<p></p>"
     );
Index: trunk/tools/qdbus/qdbus/qdbus.cpp
===================================================================
--- trunk/tools/qdbus/qdbus/qdbus.cpp	(revision 647)
+++ trunk/tools/qdbus/qdbus/qdbus.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp
===================================================================
--- trunk/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp	(revision 647)
+++ trunk/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -71,5 +71,5 @@
 #define PROGRAMNAME     "qdbuscpp2xml"
 #define PROGRAMVERSION  "0.1"
-#define PROGRAMCOPYRIGHT "Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)."
+#define PROGRAMCOPYRIGHT "Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)."
 
 static QString outputFile;
Index: trunk/tools/qdbus/qdbusviewer/main.cpp
===================================================================
--- trunk/tools/qdbus/qdbusviewer/main.cpp	(revision 647)
+++ trunk/tools/qdbus/qdbusviewer/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdbus/qdbusviewer/propertydialog.cpp
===================================================================
--- trunk/tools/qdbus/qdbusviewer/propertydialog.cpp	(revision 647)
+++ trunk/tools/qdbus/qdbusviewer/propertydialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdbus/qdbusviewer/propertydialog.h
===================================================================
--- trunk/tools/qdbus/qdbusviewer/propertydialog.h	(revision 647)
+++ trunk/tools/qdbus/qdbusviewer/propertydialog.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdbus/qdbusviewer/qdbusmodel.cpp
===================================================================
--- trunk/tools/qdbus/qdbusviewer/qdbusmodel.cpp	(revision 647)
+++ trunk/tools/qdbus/qdbusviewer/qdbusmodel.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdbus/qdbusviewer/qdbusmodel.h
===================================================================
--- trunk/tools/qdbus/qdbusviewer/qdbusmodel.h	(revision 647)
+++ trunk/tools/qdbus/qdbusviewer/qdbusmodel.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdbus/qdbusviewer/qdbusviewer.cpp
===================================================================
--- trunk/tools/qdbus/qdbusviewer/qdbusviewer.cpp	(revision 647)
+++ trunk/tools/qdbus/qdbusviewer/qdbusviewer.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -445,5 +445,5 @@
                 "<h3>%1</h3>"
                 "<p>Version %2</p></center>"
-                "<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p>")
+                "<p>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).</p>")
             .arg(tr("D-Bus Viewer")).arg(QLatin1String(QT_VERSION_STR)));
     box.setWindowTitle(tr("D-Bus Viewer"));
Index: trunk/tools/qdbus/qdbusviewer/qdbusviewer.h
===================================================================
--- trunk/tools/qdbus/qdbusviewer/qdbusviewer.h	(revision 647)
+++ trunk/tools/qdbus/qdbusviewer/qdbusviewer.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp
===================================================================
--- trunk/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp	(revision 647)
+++ trunk/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -64,5 +64,5 @@
 #define PROGRAMNAME     "qdbusxml2cpp"
 #define PROGRAMVERSION  "0.7"
-#define PROGRAMCOPYRIGHT "Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)."
+#define PROGRAMCOPYRIGHT "Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)."
 
 #define ANNOTATION_NO_WAIT      "org.freedesktop.DBus.Method.NoReply"
Index: trunk/tools/qdoc3/apigenerator.cpp
===================================================================
--- trunk/tools/qdoc3/apigenerator.cpp	(revision 647)
+++ trunk/tools/qdoc3/apigenerator.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/apigenerator.h
===================================================================
--- trunk/tools/qdoc3/apigenerator.h	(revision 647)
+++ trunk/tools/qdoc3/apigenerator.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/archiveextractor.cpp
===================================================================
--- trunk/tools/qdoc3/archiveextractor.cpp	(revision 647)
+++ trunk/tools/qdoc3/archiveextractor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/archiveextractor.h
===================================================================
--- trunk/tools/qdoc3/archiveextractor.h	(revision 647)
+++ trunk/tools/qdoc3/archiveextractor.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/atom.cpp
===================================================================
--- trunk/tools/qdoc3/atom.cpp	(revision 647)
+++ trunk/tools/qdoc3/atom.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/atom.h
===================================================================
--- trunk/tools/qdoc3/atom.h	(revision 647)
+++ trunk/tools/qdoc3/atom.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/bookgenerator.cpp
===================================================================
--- trunk/tools/qdoc3/bookgenerator.cpp	(revision 647)
+++ trunk/tools/qdoc3/bookgenerator.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/bookgenerator.h
===================================================================
--- trunk/tools/qdoc3/bookgenerator.h	(revision 647)
+++ trunk/tools/qdoc3/bookgenerator.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/ccodeparser.cpp
===================================================================
--- trunk/tools/qdoc3/ccodeparser.cpp	(revision 647)
+++ trunk/tools/qdoc3/ccodeparser.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/ccodeparser.h
===================================================================
--- trunk/tools/qdoc3/ccodeparser.h	(revision 647)
+++ trunk/tools/qdoc3/ccodeparser.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/codechunk.cpp
===================================================================
--- trunk/tools/qdoc3/codechunk.cpp	(revision 647)
+++ trunk/tools/qdoc3/codechunk.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/codechunk.h
===================================================================
--- trunk/tools/qdoc3/codechunk.h	(revision 647)
+++ trunk/tools/qdoc3/codechunk.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/codemarker.cpp
===================================================================
--- trunk/tools/qdoc3/codemarker.cpp	(revision 647)
+++ trunk/tools/qdoc3/codemarker.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/codemarker.h
===================================================================
--- trunk/tools/qdoc3/codemarker.h	(revision 647)
+++ trunk/tools/qdoc3/codemarker.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/codeparser.cpp
===================================================================
--- trunk/tools/qdoc3/codeparser.cpp	(revision 647)
+++ trunk/tools/qdoc3/codeparser.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/codeparser.h
===================================================================
--- trunk/tools/qdoc3/codeparser.h	(revision 647)
+++ trunk/tools/qdoc3/codeparser.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/command.cpp
===================================================================
--- trunk/tools/qdoc3/command.cpp	(revision 647)
+++ trunk/tools/qdoc3/command.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/command.h
===================================================================
--- trunk/tools/qdoc3/command.h	(revision 647)
+++ trunk/tools/qdoc3/command.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/config.cpp
===================================================================
--- trunk/tools/qdoc3/config.cpp	(revision 647)
+++ trunk/tools/qdoc3/config.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/config.h
===================================================================
--- trunk/tools/qdoc3/config.h	(revision 647)
+++ trunk/tools/qdoc3/config.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/cppcodemarker.cpp
===================================================================
--- trunk/tools/qdoc3/cppcodemarker.cpp	(revision 647)
+++ trunk/tools/qdoc3/cppcodemarker.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/cppcodemarker.h
===================================================================
--- trunk/tools/qdoc3/cppcodemarker.h	(revision 647)
+++ trunk/tools/qdoc3/cppcodemarker.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/cppcodeparser.cpp
===================================================================
--- trunk/tools/qdoc3/cppcodeparser.cpp	(revision 647)
+++ trunk/tools/qdoc3/cppcodeparser.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/cppcodeparser.h
===================================================================
--- trunk/tools/qdoc3/cppcodeparser.h	(revision 647)
+++ trunk/tools/qdoc3/cppcodeparser.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/cpptoqsconverter.cpp
===================================================================
--- trunk/tools/qdoc3/cpptoqsconverter.cpp	(revision 647)
+++ trunk/tools/qdoc3/cpptoqsconverter.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/cpptoqsconverter.h
===================================================================
--- trunk/tools/qdoc3/cpptoqsconverter.h	(revision 647)
+++ trunk/tools/qdoc3/cpptoqsconverter.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/dcfsection.cpp
===================================================================
--- trunk/tools/qdoc3/dcfsection.cpp	(revision 647)
+++ trunk/tools/qdoc3/dcfsection.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/dcfsection.h
===================================================================
--- trunk/tools/qdoc3/dcfsection.h	(revision 647)
+++ trunk/tools/qdoc3/dcfsection.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/doc.cpp
===================================================================
--- trunk/tools/qdoc3/doc.cpp	(revision 647)
+++ trunk/tools/qdoc3/doc.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/doc.h
===================================================================
--- trunk/tools/qdoc3/doc.h	(revision 647)
+++ trunk/tools/qdoc3/doc.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/editdistance.cpp
===================================================================
--- trunk/tools/qdoc3/editdistance.cpp	(revision 647)
+++ trunk/tools/qdoc3/editdistance.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/editdistance.h
===================================================================
--- trunk/tools/qdoc3/editdistance.h	(revision 647)
+++ trunk/tools/qdoc3/editdistance.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/generator.cpp
===================================================================
--- trunk/tools/qdoc3/generator.cpp	(revision 647)
+++ trunk/tools/qdoc3/generator.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/generator.h
===================================================================
--- trunk/tools/qdoc3/generator.h	(revision 647)
+++ trunk/tools/qdoc3/generator.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/helpprojectwriter.cpp
===================================================================
--- trunk/tools/qdoc3/helpprojectwriter.cpp	(revision 647)
+++ trunk/tools/qdoc3/helpprojectwriter.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/helpprojectwriter.h
===================================================================
--- trunk/tools/qdoc3/helpprojectwriter.h	(revision 647)
+++ trunk/tools/qdoc3/helpprojectwriter.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/htmlgenerator.cpp
===================================================================
--- trunk/tools/qdoc3/htmlgenerator.cpp	(revision 647)
+++ trunk/tools/qdoc3/htmlgenerator.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/htmlgenerator.h
===================================================================
--- trunk/tools/qdoc3/htmlgenerator.h	(revision 647)
+++ trunk/tools/qdoc3/htmlgenerator.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/jambiapiparser.cpp
===================================================================
--- trunk/tools/qdoc3/jambiapiparser.cpp	(revision 647)
+++ trunk/tools/qdoc3/jambiapiparser.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/jambiapiparser.h
===================================================================
--- trunk/tools/qdoc3/jambiapiparser.h	(revision 647)
+++ trunk/tools/qdoc3/jambiapiparser.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/javacodemarker.cpp
===================================================================
--- trunk/tools/qdoc3/javacodemarker.cpp	(revision 647)
+++ trunk/tools/qdoc3/javacodemarker.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/javacodemarker.h
===================================================================
--- trunk/tools/qdoc3/javacodemarker.h	(revision 647)
+++ trunk/tools/qdoc3/javacodemarker.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/javadocgenerator.cpp
===================================================================
--- trunk/tools/qdoc3/javadocgenerator.cpp	(revision 647)
+++ trunk/tools/qdoc3/javadocgenerator.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/javadocgenerator.h
===================================================================
--- trunk/tools/qdoc3/javadocgenerator.h	(revision 647)
+++ trunk/tools/qdoc3/javadocgenerator.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/linguistgenerator.cpp
===================================================================
--- trunk/tools/qdoc3/linguistgenerator.cpp	(revision 647)
+++ trunk/tools/qdoc3/linguistgenerator.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/linguistgenerator.h
===================================================================
--- trunk/tools/qdoc3/linguistgenerator.h	(revision 647)
+++ trunk/tools/qdoc3/linguistgenerator.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/location.cpp
===================================================================
--- trunk/tools/qdoc3/location.cpp	(revision 647)
+++ trunk/tools/qdoc3/location.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/location.h
===================================================================
--- trunk/tools/qdoc3/location.h	(revision 647)
+++ trunk/tools/qdoc3/location.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/loutgenerator.cpp
===================================================================
--- trunk/tools/qdoc3/loutgenerator.cpp	(revision 647)
+++ trunk/tools/qdoc3/loutgenerator.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/loutgenerator.h
===================================================================
--- trunk/tools/qdoc3/loutgenerator.h	(revision 647)
+++ trunk/tools/qdoc3/loutgenerator.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/main.cpp
===================================================================
--- trunk/tools/qdoc3/main.cpp	(revision 647)
+++ trunk/tools/qdoc3/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/mangenerator.cpp
===================================================================
--- trunk/tools/qdoc3/mangenerator.cpp	(revision 647)
+++ trunk/tools/qdoc3/mangenerator.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/mangenerator.h
===================================================================
--- trunk/tools/qdoc3/mangenerator.h	(revision 647)
+++ trunk/tools/qdoc3/mangenerator.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/node.cpp
===================================================================
--- trunk/tools/qdoc3/node.cpp	(revision 647)
+++ trunk/tools/qdoc3/node.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/node.h
===================================================================
--- trunk/tools/qdoc3/node.h	(revision 647)
+++ trunk/tools/qdoc3/node.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/openedlist.cpp
===================================================================
--- trunk/tools/qdoc3/openedlist.cpp	(revision 647)
+++ trunk/tools/qdoc3/openedlist.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/openedlist.h
===================================================================
--- trunk/tools/qdoc3/openedlist.h	(revision 647)
+++ trunk/tools/qdoc3/openedlist.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/pagegenerator.cpp
===================================================================
--- trunk/tools/qdoc3/pagegenerator.cpp	(revision 647)
+++ trunk/tools/qdoc3/pagegenerator.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/pagegenerator.h
===================================================================
--- trunk/tools/qdoc3/pagegenerator.h	(revision 647)
+++ trunk/tools/qdoc3/pagegenerator.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/plaincodemarker.cpp
===================================================================
--- trunk/tools/qdoc3/plaincodemarker.cpp	(revision 647)
+++ trunk/tools/qdoc3/plaincodemarker.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/plaincodemarker.h
===================================================================
--- trunk/tools/qdoc3/plaincodemarker.h	(revision 647)
+++ trunk/tools/qdoc3/plaincodemarker.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/polyarchiveextractor.cpp
===================================================================
--- trunk/tools/qdoc3/polyarchiveextractor.cpp	(revision 647)
+++ trunk/tools/qdoc3/polyarchiveextractor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/polyarchiveextractor.h
===================================================================
--- trunk/tools/qdoc3/polyarchiveextractor.h	(revision 647)
+++ trunk/tools/qdoc3/polyarchiveextractor.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/polyuncompressor.cpp
===================================================================
--- trunk/tools/qdoc3/polyuncompressor.cpp	(revision 647)
+++ trunk/tools/qdoc3/polyuncompressor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/polyuncompressor.h
===================================================================
--- trunk/tools/qdoc3/polyuncompressor.h	(revision 647)
+++ trunk/tools/qdoc3/polyuncompressor.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/qsakernelparser.cpp
===================================================================
--- trunk/tools/qdoc3/qsakernelparser.cpp	(revision 647)
+++ trunk/tools/qdoc3/qsakernelparser.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/qsakernelparser.h
===================================================================
--- trunk/tools/qdoc3/qsakernelparser.h	(revision 647)
+++ trunk/tools/qdoc3/qsakernelparser.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/qscodemarker.cpp
===================================================================
--- trunk/tools/qdoc3/qscodemarker.cpp	(revision 647)
+++ trunk/tools/qdoc3/qscodemarker.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/qscodemarker.h
===================================================================
--- trunk/tools/qdoc3/qscodemarker.h	(revision 647)
+++ trunk/tools/qdoc3/qscodemarker.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/qscodeparser.cpp
===================================================================
--- trunk/tools/qdoc3/qscodeparser.cpp	(revision 647)
+++ trunk/tools/qdoc3/qscodeparser.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/qscodeparser.h
===================================================================
--- trunk/tools/qdoc3/qscodeparser.h	(revision 647)
+++ trunk/tools/qdoc3/qscodeparser.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/quoter.cpp
===================================================================
--- trunk/tools/qdoc3/quoter.cpp	(revision 647)
+++ trunk/tools/qdoc3/quoter.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/quoter.h
===================================================================
--- trunk/tools/qdoc3/quoter.h	(revision 647)
+++ trunk/tools/qdoc3/quoter.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/separator.cpp
===================================================================
--- trunk/tools/qdoc3/separator.cpp	(revision 647)
+++ trunk/tools/qdoc3/separator.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/separator.h
===================================================================
--- trunk/tools/qdoc3/separator.h	(revision 647)
+++ trunk/tools/qdoc3/separator.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/sgmlgenerator.cpp
===================================================================
--- trunk/tools/qdoc3/sgmlgenerator.cpp	(revision 647)
+++ trunk/tools/qdoc3/sgmlgenerator.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/sgmlgenerator.h
===================================================================
--- trunk/tools/qdoc3/sgmlgenerator.h	(revision 647)
+++ trunk/tools/qdoc3/sgmlgenerator.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/test/assistant.qdocconf
===================================================================
--- trunk/tools/qdoc3/test/assistant.qdocconf	(revision 647)
+++ trunk/tools/qdoc3/test/assistant.qdocconf	(revision 651)
@@ -18,5 +18,5 @@
 qhp.Assistant.indexTitle          = Qt Assistant Manual
 qhp.Assistant.extraFiles          = classic.css images/qt-logo.png images/trolltech-logo.png
-qhp.Assistant.filterAttributes    = qt 4.6.1 tools assistant
+qhp.Assistant.filterAttributes    = qt 4.6.2 tools assistant
 qhp.Assistant.customFilters.Assistant.name = Qt Assistant Manual
 qhp.Assistant.customFilters.Assistant.filterAttributes = qt tools assistant
Index: trunk/tools/qdoc3/test/carbide-eclipse-integration.qdocconf
===================================================================
--- trunk/tools/qdoc3/test/carbide-eclipse-integration.qdocconf	(revision 647)
+++ trunk/tools/qdoc3/test/carbide-eclipse-integration.qdocconf	(revision 651)
@@ -7,5 +7,5 @@
 HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
               "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
-              "<td width=\"30%\" align=\"left\">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
+              "<td width=\"30%\" align=\"left\">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
               "<td width=\"40%\" align=\"center\"><a href=\"http://qt.nokia.com/doc\">Trademarks</a></td>\n" \
               "<td width=\"30%\" align=\"right\"><div align=\"right\">Carbide.c++</div></td>\n" \
Index: trunk/tools/qdoc3/test/designer.qdocconf
===================================================================
--- trunk/tools/qdoc3/test/designer.qdocconf	(revision 647)
+++ trunk/tools/qdoc3/test/designer.qdocconf	(revision 651)
@@ -18,5 +18,5 @@
 qhp.Designer.indexTitle          = Qt Designer Manual
 qhp.Designer.extraFiles          = classic.css images/qt-logo.png images/trolltech-logo.png
-qhp.Designer.filterAttributes    = qt 4.6.1 tools designer
+qhp.Designer.filterAttributes    = qt 4.6.2 tools designer
 qhp.Designer.customFilters.Designer.name = Qt Designer Manual
 qhp.Designer.customFilters.Designer.filterAttributes = qt tools designer
Index: trunk/tools/qdoc3/test/jambi.qdocconf
===================================================================
--- trunk/tools/qdoc3/test/jambi.qdocconf	(revision 647)
+++ trunk/tools/qdoc3/test/jambi.qdocconf	(revision 651)
@@ -42,5 +42,5 @@
 HTML.footer             = "<p /><address><hr /><div align=\"center\">\n" \
                           "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
-                          "<td width=\"30%\" align=\"left\">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
+                          "<td width=\"30%\" align=\"left\">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
                           "<td width=\"40%\" align=\"center\"><a href=\"trademarks.html\">Trademarks</a></td>\n" \
                           "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt Jambi \\version</div></td>\n" \
Index: trunk/tools/qdoc3/test/linguist.qdocconf
===================================================================
--- trunk/tools/qdoc3/test/linguist.qdocconf	(revision 647)
+++ trunk/tools/qdoc3/test/linguist.qdocconf	(revision 651)
@@ -18,5 +18,5 @@
 qhp.Linguist.indexTitle          = Qt Linguist Manual
 qhp.Linguist.extraFiles          = classic.css images/qt-logo.png images/trolltech-logo.png
-qhp.Linguist.filterAttributes    = qt 4.6.1 tools linguist
+qhp.Linguist.filterAttributes    = qt 4.6.2 tools linguist
 qhp.Linguist.customFilters.Linguist.name = Qt Linguist Manual
 qhp.Linguist.customFilters.Linguist.filterAttributes = qt tools linguist
Index: trunk/tools/qdoc3/test/macros.qdocconf
===================================================================
--- trunk/tools/qdoc3/test/macros.qdocconf	(revision 647)
+++ trunk/tools/qdoc3/test/macros.qdocconf	(revision 651)
@@ -33,3 +33,3 @@
 macro.beginfloatright.HTML  = "<div style=\"float: right; margin-left: 2em\">"
 macro.endfloat.HTML         = "</div>"
-macro.clearfloat.HTML       = "<div style=\"clear: both\">"
+macro.clearfloat.HTML       = "<br style=\"clear: both\" />"
Index: trunk/tools/qdoc3/test/qmake.qdocconf
===================================================================
--- trunk/tools/qdoc3/test/qmake.qdocconf	(revision 647)
+++ trunk/tools/qdoc3/test/qmake.qdocconf	(revision 651)
@@ -18,5 +18,5 @@
 qhp.qmake.indexTitle          = QMake Manual
 qhp.qmake.extraFiles          = classic.css images/qt-logo.png images/trolltech-logo.png
-qhp.qmake.filterAttributes    = qt 4.6.1 tools qmake
+qhp.qmake.filterAttributes    = qt 4.6.2 tools qmake
 qhp.qmake.customFilters.qmake.name = qmake Manual
 qhp.qmake.customFilters.qmake.filterAttributes = qt tools qmake
Index: trunk/tools/qdoc3/test/qt-build-docs.qdocconf
===================================================================
--- trunk/tools/qdoc3/test/qt-build-docs.qdocconf	(revision 647)
+++ trunk/tools/qdoc3/test/qt-build-docs.qdocconf	(revision 651)
@@ -33,7 +33,7 @@
                              images/stylesheet-coffee-plastique.png
 
-qhp.Qt.filterAttributes    = qt 4.6.1 qtrefdoc
-qhp.Qt.customFilters.Qt.name = Qt 4.6.1
-qhp.Qt.customFilters.Qt.filterAttributes = qt 4.6.1
+qhp.Qt.filterAttributes    = qt 4.6.2 qtrefdoc
+qhp.Qt.customFilters.Qt.name = Qt 4.6.2
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.6.2
 qhp.Qt.subprojects         = classes overviews examples
 qhp.Qt.subprojects.classes.title = Classes
Index: trunk/tools/qdoc3/test/qt-html-templates.qdocconf
===================================================================
--- trunk/tools/qdoc3/test/qt-html-templates.qdocconf	(revision 647)
+++ trunk/tools/qdoc3/test/qt-html-templates.qdocconf	(revision 651)
@@ -20,5 +20,5 @@
 HTML.footer             = "<p /><address><hr /><div align=\"center\">\n" \
                           "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
-                          "<td width=\"40%\" align=\"left\">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
+                          "<td width=\"40%\" align=\"left\">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
                           "<td width=\"20%\" align=\"center\"><a href=\"trademarks.html\">Trademarks</a></td>\n" \
                           "<td width=\"40%\" align=\"right\"><div align=\"right\">Qt \\version</div></td>\n" \
Index: trunk/tools/qdoc3/test/qt.qdocconf
===================================================================
--- trunk/tools/qdoc3/test/qt.qdocconf	(revision 647)
+++ trunk/tools/qdoc3/test/qt.qdocconf	(revision 651)
@@ -7,5 +7,5 @@
 project                 = Qt
 versionsym              =
-version                 = 4.6.1
+version                 = 4.6.2
 description             = Qt Reference Documentation
 url                     = http://qt.nokia.com/doc/4.6
@@ -35,7 +35,7 @@
                              images/stylesheet-coffee-plastique.png
 
-qhp.Qt.filterAttributes    = qt 4.6.1 qtrefdoc
-qhp.Qt.customFilters.Qt.name = Qt 4.6.1
-qhp.Qt.customFilters.Qt.filterAttributes = qt 4.6.1
+qhp.Qt.filterAttributes    = qt 4.6.2 qtrefdoc
+qhp.Qt.customFilters.Qt.name = Qt 4.6.2
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.6.2
 qhp.Qt.subprojects         = classes overviews examples
 qhp.Qt.subprojects.classes.title = Classes
Index: trunk/tools/qdoc3/test/standalone-eclipse-integration.qdocconf
===================================================================
--- trunk/tools/qdoc3/test/standalone-eclipse-integration.qdocconf	(revision 647)
+++ trunk/tools/qdoc3/test/standalone-eclipse-integration.qdocconf	(revision 651)
@@ -6,5 +6,5 @@
 HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
               "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
-              "<td width=\"30%\" align=\"left\">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
+              "<td width=\"30%\" align=\"left\">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
               "<td width=\"40%\" align=\"center\"><a href=\"http://qt.nokia.com/doc/trademarks.html\">Trademarks</a></td>\n" \
               "<td width=\"30%\" align=\"right\"><div align=\"right\">Qt Eclipse Integration 1.5.3</div></td>\n" \
Index: trunk/tools/qdoc3/text.cpp
===================================================================
--- trunk/tools/qdoc3/text.cpp	(revision 647)
+++ trunk/tools/qdoc3/text.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/text.h
===================================================================
--- trunk/tools/qdoc3/text.h	(revision 647)
+++ trunk/tools/qdoc3/text.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/tokenizer.cpp
===================================================================
--- trunk/tools/qdoc3/tokenizer.cpp	(revision 647)
+++ trunk/tools/qdoc3/tokenizer.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/tokenizer.h
===================================================================
--- trunk/tools/qdoc3/tokenizer.h	(revision 647)
+++ trunk/tools/qdoc3/tokenizer.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/tr.h
===================================================================
--- trunk/tools/qdoc3/tr.h	(revision 647)
+++ trunk/tools/qdoc3/tr.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/tree.cpp
===================================================================
--- trunk/tools/qdoc3/tree.cpp	(revision 647)
+++ trunk/tools/qdoc3/tree.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/tree.h
===================================================================
--- trunk/tools/qdoc3/tree.h	(revision 647)
+++ trunk/tools/qdoc3/tree.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/uncompressor.cpp
===================================================================
--- trunk/tools/qdoc3/uncompressor.cpp	(revision 647)
+++ trunk/tools/qdoc3/uncompressor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/uncompressor.h
===================================================================
--- trunk/tools/qdoc3/uncompressor.h	(revision 647)
+++ trunk/tools/qdoc3/uncompressor.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/webxmlgenerator.cpp
===================================================================
--- trunk/tools/qdoc3/webxmlgenerator.cpp	(revision 647)
+++ trunk/tools/qdoc3/webxmlgenerator.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/webxmlgenerator.h
===================================================================
--- trunk/tools/qdoc3/webxmlgenerator.h	(revision 647)
+++ trunk/tools/qdoc3/webxmlgenerator.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qdoc3/yyindent.cpp
===================================================================
--- trunk/tools/qdoc3/yyindent.cpp	(revision 647)
+++ trunk/tools/qdoc3/yyindent.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtconcurrent/codegenerator/example/main.cpp
===================================================================
--- trunk/tools/qtconcurrent/codegenerator/example/main.cpp	(revision 647)
+++ trunk/tools/qtconcurrent/codegenerator/example/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtconcurrent/codegenerator/src/codegenerator.cpp
===================================================================
--- trunk/tools/qtconcurrent/codegenerator/src/codegenerator.cpp	(revision 647)
+++ trunk/tools/qtconcurrent/codegenerator/src/codegenerator.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtconcurrent/codegenerator/src/codegenerator.h
===================================================================
--- trunk/tools/qtconcurrent/codegenerator/src/codegenerator.h	(revision 647)
+++ trunk/tools/qtconcurrent/codegenerator/src/codegenerator.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtconcurrent/generaterun/main.cpp
===================================================================
--- trunk/tools/qtconcurrent/generaterun/main.cpp	(revision 647)
+++ trunk/tools/qtconcurrent/generaterun/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -326,5 +326,5 @@
                        Line("/****************************************************************************") +
                        Line("**") +
-                       Line("** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).") +
+                       Line("** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).") +
                        Line("** Contact: Nokia Corporation (qt-info@nokia.com)") +
                        Line("**") +
@@ -376,5 +376,5 @@
                                      Line("/****************************************************************************") +
                                      Line("**") +
-                                     Line("** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).") +
+                                     Line("** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).") +
                                      Line("** Contact: Nokia Corporation (qt-info@nokia.com)") +
                                      Line("**") +
Index: trunk/tools/qtconfig/colorbutton.cpp
===================================================================
--- trunk/tools/qtconfig/colorbutton.cpp	(revision 647)
+++ trunk/tools/qtconfig/colorbutton.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtconfig/colorbutton.h
===================================================================
--- trunk/tools/qtconfig/colorbutton.h	(revision 647)
+++ trunk/tools/qtconfig/colorbutton.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtconfig/main.cpp
===================================================================
--- trunk/tools/qtconfig/main.cpp	(revision 647)
+++ trunk/tools/qtconfig/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtconfig/mainwindow.cpp
===================================================================
--- trunk/tools/qtconfig/mainwindow.cpp	(revision 647)
+++ trunk/tools/qtconfig/mainwindow.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -1000,5 +1000,5 @@
     box.setText(tr("<h3>%1</h3>"
                    "<br/>Version %2"
-                   "<br/><br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).")
+                   "<br/><br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).")
                    .arg(tr("Qt Configuration")).arg(QLatin1String(QT_VERSION_STR)));
     box.setWindowTitle(tr("Qt Configuration"));
Index: trunk/tools/qtconfig/mainwindow.h
===================================================================
--- trunk/tools/qtconfig/mainwindow.h	(revision 647)
+++ trunk/tools/qtconfig/mainwindow.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtconfig/mainwindowbase.cpp
===================================================================
--- trunk/tools/qtconfig/mainwindowbase.cpp	(revision 647)
+++ trunk/tools/qtconfig/mainwindowbase.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtconfig/mainwindowbase.h
===================================================================
--- trunk/tools/qtconfig/mainwindowbase.h	(revision 647)
+++ trunk/tools/qtconfig/mainwindowbase.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtconfig/mainwindowbase.ui
===================================================================
--- trunk/tools/qtconfig/mainwindowbase.ui	(revision 647)
+++ trunk/tools/qtconfig/mainwindowbase.ui	(revision 651)
@@ -3,5 +3,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/qtconfig/paletteeditoradvanced.cpp
===================================================================
--- trunk/tools/qtconfig/paletteeditoradvanced.cpp	(revision 647)
+++ trunk/tools/qtconfig/paletteeditoradvanced.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtconfig/paletteeditoradvanced.h
===================================================================
--- trunk/tools/qtconfig/paletteeditoradvanced.h	(revision 647)
+++ trunk/tools/qtconfig/paletteeditoradvanced.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtconfig/paletteeditoradvancedbase.cpp
===================================================================
--- trunk/tools/qtconfig/paletteeditoradvancedbase.cpp	(revision 647)
+++ trunk/tools/qtconfig/paletteeditoradvancedbase.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtconfig/paletteeditoradvancedbase.h
===================================================================
--- trunk/tools/qtconfig/paletteeditoradvancedbase.h	(revision 647)
+++ trunk/tools/qtconfig/paletteeditoradvancedbase.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtconfig/paletteeditoradvancedbase.ui
===================================================================
--- trunk/tools/qtconfig/paletteeditoradvancedbase.ui	(revision 647)
+++ trunk/tools/qtconfig/paletteeditoradvancedbase.ui	(revision 651)
@@ -3,5 +3,5 @@
   <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/qtconfig/previewframe.cpp
===================================================================
--- trunk/tools/qtconfig/previewframe.cpp	(revision 647)
+++ trunk/tools/qtconfig/previewframe.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtconfig/previewframe.h
===================================================================
--- trunk/tools/qtconfig/previewframe.h	(revision 647)
+++ trunk/tools/qtconfig/previewframe.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtconfig/previewwidget.cpp
===================================================================
--- trunk/tools/qtconfig/previewwidget.cpp	(revision 647)
+++ trunk/tools/qtconfig/previewwidget.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtconfig/previewwidget.h
===================================================================
--- trunk/tools/qtconfig/previewwidget.h	(revision 647)
+++ trunk/tools/qtconfig/previewwidget.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtconfig/previewwidgetbase.cpp
===================================================================
--- trunk/tools/qtconfig/previewwidgetbase.cpp	(revision 647)
+++ trunk/tools/qtconfig/previewwidgetbase.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtconfig/previewwidgetbase.h
===================================================================
--- trunk/tools/qtconfig/previewwidgetbase.h	(revision 647)
+++ trunk/tools/qtconfig/previewwidgetbase.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtconfig/previewwidgetbase.ui
===================================================================
--- trunk/tools/qtconfig/previewwidgetbase.ui	(revision 647)
+++ trunk/tools/qtconfig/previewwidgetbase.ui	(revision 651)
@@ -3,5 +3,5 @@
   <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/qtestlib/chart/database.cpp
===================================================================
--- trunk/tools/qtestlib/chart/database.cpp	(revision 647)
+++ trunk/tools/qtestlib/chart/database.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtestlib/chart/database.h
===================================================================
--- trunk/tools/qtestlib/chart/database.h	(revision 647)
+++ trunk/tools/qtestlib/chart/database.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtestlib/chart/main.cpp
===================================================================
--- trunk/tools/qtestlib/chart/main.cpp	(revision 647)
+++ trunk/tools/qtestlib/chart/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtestlib/chart/reportgenerator.cpp
===================================================================
--- trunk/tools/qtestlib/chart/reportgenerator.cpp	(revision 647)
+++ trunk/tools/qtestlib/chart/reportgenerator.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtestlib/chart/reportgenerator.h
===================================================================
--- trunk/tools/qtestlib/chart/reportgenerator.h	(revision 647)
+++ trunk/tools/qtestlib/chart/reportgenerator.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtestlib/updater/main.cpp
===================================================================
--- trunk/tools/qtestlib/updater/main.cpp	(revision 647)
+++ trunk/tools/qtestlib/updater/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtestlib/wince/cetcpsync/main.cpp
===================================================================
--- trunk/tools/qtestlib/wince/cetcpsync/main.cpp	(revision 647)
+++ trunk/tools/qtestlib/wince/cetcpsync/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtestlib/wince/cetcpsync/qtcesterconnection.cpp
===================================================================
--- trunk/tools/qtestlib/wince/cetcpsync/qtcesterconnection.cpp	(revision 647)
+++ trunk/tools/qtestlib/wince/cetcpsync/qtcesterconnection.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtestlib/wince/cetcpsync/qtcesterconnection.h
===================================================================
--- trunk/tools/qtestlib/wince/cetcpsync/qtcesterconnection.h	(revision 647)
+++ trunk/tools/qtestlib/wince/cetcpsync/qtcesterconnection.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtestlib/wince/cetcpsync/remoteconnection.cpp
===================================================================
--- trunk/tools/qtestlib/wince/cetcpsync/remoteconnection.cpp	(revision 647)
+++ trunk/tools/qtestlib/wince/cetcpsync/remoteconnection.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtestlib/wince/cetcpsync/remoteconnection.h
===================================================================
--- trunk/tools/qtestlib/wince/cetcpsync/remoteconnection.h	(revision 647)
+++ trunk/tools/qtestlib/wince/cetcpsync/remoteconnection.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtestlib/wince/cetcpsyncserver/commands.cpp
===================================================================
--- trunk/tools/qtestlib/wince/cetcpsyncserver/commands.cpp	(revision 647)
+++ trunk/tools/qtestlib/wince/cetcpsyncserver/commands.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtestlib/wince/cetcpsyncserver/commands.h
===================================================================
--- trunk/tools/qtestlib/wince/cetcpsyncserver/commands.h	(revision 647)
+++ trunk/tools/qtestlib/wince/cetcpsyncserver/commands.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtestlib/wince/cetcpsyncserver/connectionmanager.cpp
===================================================================
--- trunk/tools/qtestlib/wince/cetcpsyncserver/connectionmanager.cpp	(revision 647)
+++ trunk/tools/qtestlib/wince/cetcpsyncserver/connectionmanager.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtestlib/wince/cetcpsyncserver/connectionmanager.h
===================================================================
--- trunk/tools/qtestlib/wince/cetcpsyncserver/connectionmanager.h	(revision 647)
+++ trunk/tools/qtestlib/wince/cetcpsyncserver/connectionmanager.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtestlib/wince/cetcpsyncserver/main.cpp
===================================================================
--- trunk/tools/qtestlib/wince/cetcpsyncserver/main.cpp	(revision 647)
+++ trunk/tools/qtestlib/wince/cetcpsyncserver/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtestlib/wince/cetcpsyncserver/transfer_global.h
===================================================================
--- trunk/tools/qtestlib/wince/cetcpsyncserver/transfer_global.h	(revision 647)
+++ trunk/tools/qtestlib/wince/cetcpsyncserver/transfer_global.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtestlib/wince/cetest/activesyncconnection.cpp
===================================================================
--- trunk/tools/qtestlib/wince/cetest/activesyncconnection.cpp	(revision 647)
+++ trunk/tools/qtestlib/wince/cetest/activesyncconnection.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtestlib/wince/cetest/activesyncconnection.h
===================================================================
--- trunk/tools/qtestlib/wince/cetest/activesyncconnection.h	(revision 647)
+++ trunk/tools/qtestlib/wince/cetest/activesyncconnection.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtestlib/wince/cetest/cetcpsyncconnection.cpp
===================================================================
--- trunk/tools/qtestlib/wince/cetest/cetcpsyncconnection.cpp	(revision 647)
+++ trunk/tools/qtestlib/wince/cetest/cetcpsyncconnection.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtestlib/wince/cetest/cetcpsyncconnection.h
===================================================================
--- trunk/tools/qtestlib/wince/cetest/cetcpsyncconnection.h	(revision 647)
+++ trunk/tools/qtestlib/wince/cetest/cetcpsyncconnection.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtestlib/wince/cetest/deployment.cpp
===================================================================
--- trunk/tools/qtestlib/wince/cetest/deployment.cpp	(revision 647)
+++ trunk/tools/qtestlib/wince/cetest/deployment.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtestlib/wince/cetest/deployment.h
===================================================================
--- trunk/tools/qtestlib/wince/cetest/deployment.h	(revision 647)
+++ trunk/tools/qtestlib/wince/cetest/deployment.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtestlib/wince/cetest/main.cpp
===================================================================
--- trunk/tools/qtestlib/wince/cetest/main.cpp	(revision 647)
+++ trunk/tools/qtestlib/wince/cetest/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtestlib/wince/cetest/remoteconnection.cpp
===================================================================
--- trunk/tools/qtestlib/wince/cetest/remoteconnection.cpp	(revision 647)
+++ trunk/tools/qtestlib/wince/cetest/remoteconnection.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtestlib/wince/cetest/remoteconnection.h
===================================================================
--- trunk/tools/qtestlib/wince/cetest/remoteconnection.h	(revision 647)
+++ trunk/tools/qtestlib/wince/cetest/remoteconnection.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtestlib/wince/remotelib/commands.cpp
===================================================================
--- trunk/tools/qtestlib/wince/remotelib/commands.cpp	(revision 647)
+++ trunk/tools/qtestlib/wince/remotelib/commands.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qtestlib/wince/remotelib/commands.h
===================================================================
--- trunk/tools/qtestlib/wince/remotelib/commands.h	(revision 647)
+++ trunk/tools/qtestlib/wince/remotelib/commands.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qttracereplay/main.cpp
===================================================================
--- trunk/tools/qttracereplay/main.cpp	(revision 647)
+++ trunk/tools/qttracereplay/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -53,4 +53,5 @@
 
     void paintEvent(QPaintEvent *event);
+    void resizeEvent(QResizeEvent *event);
 
 public slots:
@@ -65,4 +66,5 @@
     QTime timer;
 
+    QList<uint> visibleUpdates;
     QList<uint> iterationTimes;
     QString filename;
@@ -71,6 +73,6 @@
 void ReplayWidget::updateRect()
 {
-    if (!updates.isEmpty())
-        update(updates.at(currentFrame));
+    if (!visibleUpdates.isEmpty())
+        update(updates.at(visibleUpdates.at(currentFrame)));
 }
 
@@ -81,8 +83,8 @@
 //    p.setClipRegion(frames.at(currentFrame).updateRegion);
 
-    buffer.draw(&p, currentFrame);
+    buffer.draw(&p, visibleUpdates.at(currentFrame));
 
     ++currentFrame;
-    if (currentFrame >= buffer.numFrames()) {
+    if (currentFrame >= visibleUpdates.size()) {
         currentFrame = 0;
         ++currentIteration;
@@ -120,5 +122,5 @@
                 if (iterationTimes.size() >= 10 || stddev < 4) {
                     printf("%s, iterations: %d, frames: %d, min(ms): %d, median(ms): %d, stddev: %f %%, max(fps): %f\n", qPrintable(filename),
-                            iterationTimes.size(), updates.size(), min, median, stddev, 1000. * updates.size() / min);
+                            iterationTimes.size(), visibleUpdates.size(), min, median, stddev, 1000. * visibleUpdates.size() / min);
                     deleteLater();
                     return;
@@ -131,4 +133,19 @@
 }
 
+void ReplayWidget::resizeEvent(QResizeEvent *event)
+{
+    visibleUpdates.clear();
+
+    QRect bounds = rect();
+    for (int i = 0; i < updates.size(); ++i) {
+        if (updates.at(i).intersects(bounds))
+            visibleUpdates << i;
+    }
+
+    if (visibleUpdates.size() != updates.size())
+        printf("Warning: skipped %d frames due to limited resolution\n", updates.size() - visibleUpdates.size());
+
+}
+
 ReplayWidget::ReplayWidget(const QString &filename_)
     : currentFrame(0)
@@ -139,5 +156,4 @@
     QFile file(filename);
 
-    QRect bounds;
     if (!file.open(QIODevice::ReadOnly)) {
         printf("Failed to load input file '%s'\n", qPrintable(filename_));
Index: trunk/tools/qvfb/config.ui
===================================================================
--- trunk/tools/qvfb/config.ui	(revision 647)
+++ trunk/tools/qvfb/config.ui	(revision 651)
@@ -3,5 +3,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/qvfb/gammaview.h
===================================================================
--- trunk/tools/qvfb/gammaview.h	(revision 647)
+++ trunk/tools/qvfb/gammaview.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qvfb/main.cpp
===================================================================
--- trunk/tools/qvfb/main.cpp	(revision 647)
+++ trunk/tools/qvfb/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qvfb/qanimationwriter.cpp
===================================================================
--- trunk/tools/qvfb/qanimationwriter.cpp	(revision 647)
+++ trunk/tools/qvfb/qanimationwriter.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qvfb/qanimationwriter.h
===================================================================
--- trunk/tools/qvfb/qanimationwriter.h	(revision 647)
+++ trunk/tools/qvfb/qanimationwriter.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qvfb/qlock.cpp
===================================================================
--- trunk/tools/qvfb/qlock.cpp	(revision 647)
+++ trunk/tools/qvfb/qlock.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qvfb/qlock_p.h
===================================================================
--- trunk/tools/qvfb/qlock_p.h	(revision 647)
+++ trunk/tools/qvfb/qlock_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qvfb/qtopiakeysym.h
===================================================================
--- trunk/tools/qvfb/qtopiakeysym.h	(revision 647)
+++ trunk/tools/qvfb/qtopiakeysym.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qvfb/qvfb.cpp
===================================================================
--- trunk/tools/qvfb/qvfb.cpp	(revision 647)
+++ trunk/tools/qvfb/qvfb.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qvfb/qvfb.h
===================================================================
--- trunk/tools/qvfb/qvfb.h	(revision 647)
+++ trunk/tools/qvfb/qvfb.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qvfb/qvfbhdr.h
===================================================================
--- trunk/tools/qvfb/qvfbhdr.h	(revision 647)
+++ trunk/tools/qvfb/qvfbhdr.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qvfb/qvfbmmap.cpp
===================================================================
--- trunk/tools/qvfb/qvfbmmap.cpp	(revision 647)
+++ trunk/tools/qvfb/qvfbmmap.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qvfb/qvfbmmap.h
===================================================================
--- trunk/tools/qvfb/qvfbmmap.h	(revision 647)
+++ trunk/tools/qvfb/qvfbmmap.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qvfb/qvfbprotocol.cpp
===================================================================
--- trunk/tools/qvfb/qvfbprotocol.cpp	(revision 647)
+++ trunk/tools/qvfb/qvfbprotocol.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qvfb/qvfbprotocol.h
===================================================================
--- trunk/tools/qvfb/qvfbprotocol.h	(revision 647)
+++ trunk/tools/qvfb/qvfbprotocol.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qvfb/qvfbratedlg.cpp
===================================================================
--- trunk/tools/qvfb/qvfbratedlg.cpp	(revision 647)
+++ trunk/tools/qvfb/qvfbratedlg.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qvfb/qvfbratedlg.h
===================================================================
--- trunk/tools/qvfb/qvfbratedlg.h	(revision 647)
+++ trunk/tools/qvfb/qvfbratedlg.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qvfb/qvfbshmem.cpp
===================================================================
--- trunk/tools/qvfb/qvfbshmem.cpp	(revision 647)
+++ trunk/tools/qvfb/qvfbshmem.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qvfb/qvfbshmem.h
===================================================================
--- trunk/tools/qvfb/qvfbshmem.h	(revision 647)
+++ trunk/tools/qvfb/qvfbshmem.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qvfb/qvfbview.cpp
===================================================================
--- trunk/tools/qvfb/qvfbview.cpp	(revision 647)
+++ trunk/tools/qvfb/qvfbview.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qvfb/qvfbview.h
===================================================================
--- trunk/tools/qvfb/qvfbview.h	(revision 647)
+++ trunk/tools/qvfb/qvfbview.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qvfb/qvfbx11view.cpp
===================================================================
--- trunk/tools/qvfb/qvfbx11view.cpp	(revision 647)
+++ trunk/tools/qvfb/qvfbx11view.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qvfb/qvfbx11view.h
===================================================================
--- trunk/tools/qvfb/qvfbx11view.h	(revision 647)
+++ trunk/tools/qvfb/qvfbx11view.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qvfb/qwssignalhandler.cpp
===================================================================
--- trunk/tools/qvfb/qwssignalhandler.cpp	(revision 647)
+++ trunk/tools/qvfb/qwssignalhandler.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qvfb/qwssignalhandler_p.h
===================================================================
--- trunk/tools/qvfb/qwssignalhandler_p.h	(revision 647)
+++ trunk/tools/qvfb/qwssignalhandler_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qvfb/x11keyfaker.cpp
===================================================================
--- trunk/tools/qvfb/x11keyfaker.cpp	(revision 647)
+++ trunk/tools/qvfb/x11keyfaker.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/qvfb/x11keyfaker.h
===================================================================
--- trunk/tools/qvfb/x11keyfaker.h	(revision 647)
+++ trunk/tools/qvfb/x11keyfaker.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/runonphone/main.cpp
===================================================================
--- trunk/tools/runonphone/main.cpp	(revision 647)
+++ trunk/tools/runonphone/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -73,5 +73,5 @@
     QString sisFile;
     QString exeFile;
-    QString cmdLine;
+    QStringList cmdLine;
     QStringList args = QCoreApplication::arguments();
     QTextStream outstream(stdout);
@@ -125,5 +125,4 @@
             for(;i<args.size();i++) {
                 cmdLine.append(args.at(i));
-                if(i + 1 < args.size()) cmdLine.append(' ');
             }
         }
@@ -176,5 +175,9 @@
     if(loglevel > 0)
         outstream << "Connecting to target via " << serialPortName << endl;
+#ifdef Q_OS_WIN
     launcher->setTrkServerName(QString("\\\\.\\") + serialPortName);
+#else
+    launcher->setTrkServerName(serialPortName);
+#endif
 
     launcher->setFileName(QString("c:\\sys\\bin\\") + exeFile);
@@ -201,6 +204,6 @@
     QObject::connect(launcher.data(), SIGNAL(copyProgress(int)), &handler, SLOT(copyProgress(int)));
     QObject::connect(launcher.data(), SIGNAL(stateChanged(int)), &handler, SLOT(stateChanged(int)));
-    QObject::connect(launcher.data(), SIGNAL(stopped(uint,uint,uint,QString)), &handler, SLOT(stopped(uint,uint,uint,QString)));
-    QObject::connect(&handler, SIGNAL(resume(uint,uint)), launcher.data(), SLOT(resume(uint,uint)));
+    QObject::connect(launcher.data(), SIGNAL(processStopped(uint,uint,uint,QString)), &handler, SLOT(stopped(uint,uint,uint,QString)));
+    QObject::connect(&handler, SIGNAL(resume(uint,uint)), launcher.data(), SLOT(resumeProcess(uint,uint)));
     QObject::connect(&handler, SIGNAL(terminate()), launcher.data(), SLOT(terminate()));
     QObject::connect(launcher.data(), SIGNAL(finished()), &handler, SLOT(finished()));
Index: trunk/tools/runonphone/runonphone.pro
===================================================================
--- trunk/tools/runonphone/runonphone.pro	(revision 647)
+++ trunk/tools/runonphone/runonphone.pro	(revision 651)
@@ -19,2 +19,8 @@
         -ladvapi32
 }
+else:unix:!symbian {
+    SOURCES += serenum_unix.cpp
+}
+else {
+    SOURCES += serenum_stub.cpp
+}
Index: trunk/tools/runonphone/serenum.h
===================================================================
--- trunk/tools/runonphone/serenum.h	(revision 647)
+++ trunk/tools/runonphone/serenum.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/runonphone/serenum_stub.cpp
===================================================================
--- trunk/tools/runonphone/serenum_stub.cpp	(revision 651)
+++ trunk/tools/runonphone/serenum_stub.cpp	(revision 651)
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "serenum.h"
+#include <QByteArray>
+#include <QString>
+#include <QDebug>
+
+QList<SerialPortId> enumerateSerialPorts()
+{
+    QList<SerialPortId> list;
+    qWarning() << "enumerateSerialPorts not implemented" << endl;
+    return list;
+}
+
Index: trunk/tools/runonphone/serenum_unix.cpp
===================================================================
--- trunk/tools/runonphone/serenum_unix.cpp	(revision 651)
+++ trunk/tools/runonphone/serenum_unix.cpp	(revision 651)
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "serenum.h"
+#include <QByteArray>
+#include <QString>
+#include <QDebug>
+#include <QFileInfo>
+#include <QDir>
+
+QList<SerialPortId> enumerateSerialPorts()
+{
+    QList<SerialPortId> list;
+    QDir dir("/dev/serial/by-id/");
+    QFileInfoList ports(dir.entryInfoList());
+    foreach(QFileInfo info, ports) {
+        if (!info.isDir()) {
+            SerialPortId id;
+            id.friendlyName = info.fileName();
+            id.portName = info.canonicalFilePath();
+            list << id;
+        }
+    }
+    return list;
+}
+
Index: trunk/tools/runonphone/serenum_win.cpp
===================================================================
--- trunk/tools/runonphone/serenum_win.cpp	(revision 647)
+++ trunk/tools/runonphone/serenum_win.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/runonphone/trk/bluetoothlistener.cpp
===================================================================
--- trunk/tools/runonphone/trk/bluetoothlistener.cpp	(revision 647)
+++ trunk/tools/runonphone/trk/bluetoothlistener.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/runonphone/trk/bluetoothlistener.h
===================================================================
--- trunk/tools/runonphone/trk/bluetoothlistener.h	(revision 647)
+++ trunk/tools/runonphone/trk/bluetoothlistener.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/runonphone/trk/bluetoothlistener_gui.cpp
===================================================================
--- trunk/tools/runonphone/trk/bluetoothlistener_gui.cpp	(revision 647)
+++ trunk/tools/runonphone/trk/bluetoothlistener_gui.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/runonphone/trk/bluetoothlistener_gui.h
===================================================================
--- trunk/tools/runonphone/trk/bluetoothlistener_gui.h	(revision 647)
+++ trunk/tools/runonphone/trk/bluetoothlistener_gui.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/runonphone/trk/callback.h
===================================================================
--- trunk/tools/runonphone/trk/callback.h	(revision 647)
+++ trunk/tools/runonphone/trk/callback.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/runonphone/trk/communicationstarter.cpp
===================================================================
--- trunk/tools/runonphone/trk/communicationstarter.cpp	(revision 647)
+++ trunk/tools/runonphone/trk/communicationstarter.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/runonphone/trk/communicationstarter.h
===================================================================
--- trunk/tools/runonphone/trk/communicationstarter.h	(revision 647)
+++ trunk/tools/runonphone/trk/communicationstarter.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/runonphone/trk/launcher.cpp
===================================================================
--- trunk/tools/runonphone/trk/launcher.cpp	(revision 647)
+++ trunk/tools/runonphone/trk/launcher.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -77,5 +77,5 @@
     CopyState m_copyState;
     QString m_fileName;
-    QString m_commandLineArgs;
+    QStringList m_commandLineArgs;
     QString m_installFileName;
     int m_verbose;
@@ -160,5 +160,5 @@
 }
 
-void Launcher::setCommandLineArgs(const QString &args)
+void Launcher::setCommandLineArgs(const QStringList &args)
 {
     d->m_commandLineArgs = args;
@@ -190,6 +190,8 @@
     errorMessage->clear();
     if (d->m_verbose) {
-        const QString msg = QString::fromLatin1("Port=%1 Executable=%2 Package=%3 Remote Package=%4 Install file=%5")
-                            .arg(d->m_trkServerName, d->m_fileName, d->m_copyState.sourceFileName, d->m_copyState.destinationFileName, d->m_installFileName);
+        const QString msg = QString::fromLatin1("Port=%1 Executable=%2 Arguments=%3 Package=%4 Remote Package=%5 Install file=%6")
+                            .arg(d->m_trkServerName, d->m_fileName,
+                                 d->m_commandLineArgs.join(QString(QLatin1Char(' '))),
+                                 d->m_copyState.sourceFileName, d->m_copyState.destinationFileName, d->m_installFileName);
         logMessage(msg);
     }
@@ -297,4 +299,32 @@
 }
 
+QString Launcher::msgStopped(uint pid, uint tid, uint address, const QString &why)
+{
+    return QString::fromLatin1("Process %1, thread %2 stopped at 0x%3: %4").
+            arg(pid).arg(tid).arg(address, 0, 16).
+            arg(why.isEmpty() ? QString::fromLatin1("<Unknown reason>") : why);
+}
+
+bool Launcher::parseNotifyStopped(const QByteArray &dataBA,
+                                  uint *pid, uint *tid, uint *address,
+                                  QString *why /* = 0 */)
+{
+    if (why)
+        why->clear();
+    *address = *pid = *tid = 0;
+    if (dataBA.size() < 12)
+        return false;
+    const char *data = dataBA.data();
+    *address = extractInt(data);
+    *pid = extractInt(data + 4);
+    *tid = extractInt(data + 8);
+    if (why && dataBA.size() >= 14) {
+        const unsigned short len = extractShort(data + 12);
+        if (len > 0)
+            *why = QString::fromLatin1(data + 14, len);
+    }
+    return true;
+}
+
 void Launcher::handleResult(const TrkResult &result)
 {
@@ -316,23 +346,11 @@
         }
         case TrkNotifyStopped: { // Notified Stopped
-            logMessage(prefix + "NOTE: STOPPED  " + str);
-            // 90 01   78 6a 40 40   00 00 07 23   00 00 07 24  00 00
             QString reason;
-            if (result.data.size() >= 14) {
-                uint pc = extractInt(result.data.mid(0,4).constData());
-                uint pid = extractInt(result.data.mid(4,4).constData());
-                uint tid = extractInt(result.data.mid(8,4).constData());
-                ushort len = extractShort(result.data.mid(12,2).constData());
-                if(len > 0)
-                    reason = result.data.mid(14, len);
-                emit(stopped(pc, pid, tid, reason));
-            } else {
-                emit(stopped(0, 0, 0, reason));
-            }
-            //const char *data = result.data.data();
-//            uint addr = extractInt(data); //code address: 4 bytes; code base address for the library
-//            uint pid = extractInt(data + 4); // ProcessID: 4 bytes;
-//            uint tid = extractInt(data + 8); // ThreadID: 4 bytes
-            //logMessage(prefix << "      ADDR: " << addr << " PID: " << pid << " TID: " << tid);
+            uint pc;
+            uint pid;
+            uint tid;
+            parseNotifyStopped(result.data, &pid, &tid, &pc, &reason);
+            logMessage(prefix + msgStopped(pid, tid, pc, reason));
+            emit(processStopped(pc, pid, tid, reason));
             d->m_device->sendTrkAck(result.token);
             break;
@@ -682,29 +700,36 @@
 }
 
-void Launcher::startInferiorIfNeeded()
-{
-    emit startingApplication();
-    if (d->m_session.pid != 0) {
-        logMessage("Process already 'started'");
-        return;
-    }
+QByteArray Launcher::startProcessMessage(const QString &executable,
+                                         const QStringList &arguments)
+{
     // It's not started yet
     QByteArray ba;
     appendShort(&ba, 0, TargetByteOrder); // create new process
     appendByte(&ba, 0); // options - currently unused
-
-    if(d->m_commandLineArgs.isEmpty()) {
-        appendString(&ba, d->m_fileName.toLocal8Bit(), TargetByteOrder);
-    } else {
-        QByteArray ba2;
-        ba2.append(d->m_fileName.toLocal8Bit());
-        ba2.append('\0');
-        ba2.append(d->m_commandLineArgs.toLocal8Bit());
-        appendString(&ba, ba2, TargetByteOrder);
-    }
-    d->m_device->sendTrkMessage(TrkCreateItem, TrkCallback(this, &Launcher::handleCreateProcess), ba); // Create Item
-}
-
-void Launcher::resume(uint pid, uint tid)
+    if(arguments.isEmpty()) {
+        appendString(&ba, executable.toLocal8Bit(), TargetByteOrder);
+        return ba;
+    }
+    // Append full command line as one string (leading length information).
+    QByteArray commandLineBa;
+    commandLineBa.append(executable.toLocal8Bit());
+    commandLineBa.append('\0');
+    commandLineBa.append(arguments.join(QString(QLatin1Char(' '))).toLocal8Bit());
+    appendString(&ba, commandLineBa, TargetByteOrder);
+    return ba;
+}
+
+void Launcher::startInferiorIfNeeded()
+{
+    emit startingApplication();
+    if (d->m_session.pid != 0) {
+        logMessage("Process already 'started'");
+        return;
+    }
+    d->m_device->sendTrkMessage(TrkCreateItem, TrkCallback(this, &Launcher::handleCreateProcess),
+                                startProcessMessage(d->m_fileName, d->m_commandLineArgs)); // Create Item
+}
+
+void Launcher::resumeProcess(uint pid, uint tid)
 {
     QByteArray ba;
Index: trunk/tools/runonphone/trk/launcher.h
===================================================================
--- trunk/tools/runonphone/trk/launcher.h	(revision 647)
+++ trunk/tools/runonphone/trk/launcher.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -96,5 +96,5 @@
     void setCopyFileName(const QString &srcName, const QString &dstName);
     void setInstallFileName(const QString &name);
-    void setCommandLineArgs(const QString &args);
+    void setCommandLineArgs(const QStringList &args);
     bool startServer(QString *errorMessage);
     void setVerbose(int v);    
@@ -109,4 +109,13 @@
     // becomes valid after successful execution of ActionPingOnly
     QString deviceDescription(unsigned verbose = 0u) const;
+
+    static QByteArray startProcessMessage(const QString &executable,
+                                          const QStringList &arguments);
+    // Parse a TrkNotifyStopped message
+    static bool parseNotifyStopped(const QByteArray &a,
+                                   uint *pid, uint *tid, uint *address,
+                                   QString *why = 0);
+    // Helper message
+    static QString msgStopped(uint pid, uint tid, uint address, const QString &why);
 
 signals:
@@ -126,9 +135,9 @@
     void copyProgress(int percent);
     void stateChanged(int);
-    void stopped(uint pc, uint pid, uint tid, const QString& reason);
+    void processStopped(uint pc, uint pid, uint tid, const QString& reason);
 
 public slots:
     void terminate();
-    void resume(uint pid, uint tid);
+    void resumeProcess(uint pid, uint tid);
 
 private slots:
Index: trunk/tools/runonphone/trk/trkdevice.cpp
===================================================================
--- trunk/tools/runonphone/trk/trkdevice.cpp	(revision 647)
+++ trunk/tools/runonphone/trk/trkdevice.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -100,4 +100,6 @@
 #endif
 
+enum { verboseTrk = 0 };
+
 namespace trk {
 
@@ -127,4 +129,10 @@
     callback(cb)
 {
+}
+
+QDebug operator<<(QDebug d, const TrkMessage &msg)
+{
+    return d << "Message: Code: " << msg.code
+        << " Token: " << msg.token << " " << msg.data.toHex();
 }
 
@@ -205,4 +213,6 @@
     if (m_trkWriteToken == 0)
         ++m_trkWriteToken;
+    if (verboseTrk)
+        qDebug() << "Write token: " << m_trkWriteToken;
     return m_trkWriteToken;
 }
@@ -335,5 +345,6 @@
 ///////////////////////////////////////////////////////////////////////
 
-class WriterThread : public QThread {
+class WriterThread : public QThread
+{
     Q_OBJECT
     Q_DISABLE_COPY(WriterThread)
@@ -401,4 +412,5 @@
     if (m_terminate)
         return 1;
+
     // Send off message
     m_dataMutex.lock();
@@ -406,8 +418,10 @@
     const TrkWriteQueue::PendingMessageResult pr = m_queue.pendingMessage(&message);
     m_dataMutex.unlock();
+
     switch (pr) {
     case TrkWriteQueue::NoMessage:
         break;
     case TrkWriteQueue::PendingMessage: {
+            //qDebug() << "Write pending message " << message;
             // Untested: try to re-send a few times
             bool success = false;
@@ -429,4 +443,6 @@
     case TrkWriteQueue::NoopMessageDequeued:
         // Sync with thread that owns us via a blocking signal
+        if (verboseTrk)
+            qDebug() << "Noop message dequeued" << message;
         emit internalNoopMessageDequeued(message);
         break;
@@ -500,4 +516,6 @@
 bool WriterThread::write(const QByteArray &data, QString *errorMessage)
 {
+    if (verboseTrk)
+        qDebug() << "Write raw data: " << data.toHex();
     QMutexLocker locker(&m_context->mutex);
 #ifdef Q_OS_WIN
@@ -558,4 +576,5 @@
 }
 
+
 ///////////////////////////////////////////////////////////////////////
 //
@@ -567,5 +586,6 @@
 ///////////////////////////////////////////////////////////////////////
 
-class ReaderThreadBase : public QThread {
+class ReaderThreadBase : public QThread
+{
     Q_OBJECT
     Q_DISABLE_COPY(ReaderThreadBase)
@@ -626,5 +646,6 @@
 ///////////////////////////////////////////////////////////////////////
 
-class WinReaderThread : public ReaderThreadBase {
+class WinReaderThread : public ReaderThreadBase
+{
     Q_OBJECT
     Q_DISABLE_COPY(WinReaderThread)
@@ -836,5 +857,6 @@
     // Trigger select() by writing to the pipe
     char c = 0;
-    write(m_terminatePipeFileDescriptors[1], &c, 1);
+    int written = write(m_terminatePipeFileDescriptors[1], &c, 1);
+    // FIXME: Use result.
     wait();
 }
@@ -1022,4 +1044,6 @@
 {
     d->writerThread->slotHandleResult(result);
+    if (d->verbose > 1)
+        qDebug() << "Received: " << result.toString();
     emit messageReceived(result);    
     if (!rawData.isEmpty())
@@ -1058,4 +1082,6 @@
     msg.token = token;
     msg.data.append('\0');
+    if (verboseTrk)
+        qDebug() << "Write synchroneous message: " << msg;
     return d->writerThread->trkWriteRawMessage(msg);
     // 01 90 00 07 7e 80 01 00 7d 5e 7e
Index: trunk/tools/runonphone/trk/trkdevice.h
===================================================================
--- trunk/tools/runonphone/trk/trkdevice.h	(revision 647)
+++ trunk/tools/runonphone/trk/trkdevice.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/runonphone/trk/trkutils.cpp
===================================================================
--- trunk/tools/runonphone/trk/trkutils.cpp	(revision 647)
+++ trunk/tools/runonphone/trk/trkutils.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/runonphone/trk/trkutils.h
===================================================================
--- trunk/tools/runonphone/trk/trkutils.h	(revision 647)
+++ trunk/tools/runonphone/trk/trkutils.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -120,5 +120,6 @@
 };
 
-struct TrkAppVersion {
+struct TrkAppVersion
+{
     TrkAppVersion();
     void reset();    
@@ -153,4 +154,8 @@
     typedef QList<Library> Libraries;
     Libraries libraries;
+
+    typedef uint Thread;
+    typedef QList<Thread> Threads;
+    Threads threads;
 
     // Gdb request
Index: trunk/tools/runonphone/trksignalhandler.cpp
===================================================================
--- trunk/tools/runonphone/trksignalhandler.cpp	(revision 647)
+++ trunk/tools/runonphone/trksignalhandler.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/runonphone/trksignalhandler.h
===================================================================
--- trunk/tools/runonphone/trksignalhandler.h	(revision 647)
+++ trunk/tools/runonphone/trksignalhandler.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/deviceskin/deviceskin.cpp
===================================================================
--- trunk/tools/shared/deviceskin/deviceskin.cpp	(revision 647)
+++ trunk/tools/shared/deviceskin/deviceskin.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/deviceskin/deviceskin.h
===================================================================
--- trunk/tools/shared/deviceskin/deviceskin.h	(revision 647)
+++ trunk/tools/shared/deviceskin/deviceskin.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/findwidget/abstractfindwidget.cpp
===================================================================
--- trunk/tools/shared/findwidget/abstractfindwidget.cpp	(revision 647)
+++ trunk/tools/shared/findwidget/abstractfindwidget.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/findwidget/abstractfindwidget.h
===================================================================
--- trunk/tools/shared/findwidget/abstractfindwidget.h	(revision 647)
+++ trunk/tools/shared/findwidget/abstractfindwidget.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/findwidget/itemviewfindwidget.cpp
===================================================================
--- trunk/tools/shared/findwidget/itemviewfindwidget.cpp	(revision 647)
+++ trunk/tools/shared/findwidget/itemviewfindwidget.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/findwidget/itemviewfindwidget.h
===================================================================
--- trunk/tools/shared/findwidget/itemviewfindwidget.h	(revision 647)
+++ trunk/tools/shared/findwidget/itemviewfindwidget.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/findwidget/texteditfindwidget.cpp
===================================================================
--- trunk/tools/shared/findwidget/texteditfindwidget.cpp	(revision 647)
+++ trunk/tools/shared/findwidget/texteditfindwidget.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/findwidget/texteditfindwidget.h
===================================================================
--- trunk/tools/shared/findwidget/texteditfindwidget.h	(revision 647)
+++ trunk/tools/shared/findwidget/texteditfindwidget.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/fontpanel/fontpanel.cpp
===================================================================
--- trunk/tools/shared/fontpanel/fontpanel.cpp	(revision 647)
+++ trunk/tools/shared/fontpanel/fontpanel.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/fontpanel/fontpanel.h
===================================================================
--- trunk/tools/shared/fontpanel/fontpanel.h	(revision 647)
+++ trunk/tools/shared/fontpanel/fontpanel.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtgradienteditor/qtcolorbutton.cpp
===================================================================
--- trunk/tools/shared/qtgradienteditor/qtcolorbutton.cpp	(revision 647)
+++ trunk/tools/shared/qtgradienteditor/qtcolorbutton.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtgradienteditor/qtcolorbutton.h
===================================================================
--- trunk/tools/shared/qtgradienteditor/qtcolorbutton.h	(revision 647)
+++ trunk/tools/shared/qtgradienteditor/qtcolorbutton.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtgradienteditor/qtcolorline.cpp
===================================================================
--- trunk/tools/shared/qtgradienteditor/qtcolorline.cpp	(revision 647)
+++ trunk/tools/shared/qtgradienteditor/qtcolorline.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtgradienteditor/qtcolorline.h
===================================================================
--- trunk/tools/shared/qtgradienteditor/qtcolorline.h	(revision 647)
+++ trunk/tools/shared/qtgradienteditor/qtcolorline.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtgradienteditor/qtgradientdialog.cpp
===================================================================
--- trunk/tools/shared/qtgradienteditor/qtgradientdialog.cpp	(revision 647)
+++ trunk/tools/shared/qtgradienteditor/qtgradientdialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtgradienteditor/qtgradientdialog.h
===================================================================
--- trunk/tools/shared/qtgradienteditor/qtgradientdialog.h	(revision 647)
+++ trunk/tools/shared/qtgradienteditor/qtgradientdialog.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtgradienteditor/qtgradientdialog.ui
===================================================================
--- trunk/tools/shared/qtgradienteditor/qtgradientdialog.ui	(revision 647)
+++ trunk/tools/shared/qtgradienteditor/qtgradientdialog.ui	(revision 651)
@@ -2,5 +2,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtgradienteditor/qtgradienteditor.cpp
===================================================================
--- trunk/tools/shared/qtgradienteditor/qtgradienteditor.cpp	(revision 647)
+++ trunk/tools/shared/qtgradienteditor/qtgradienteditor.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtgradienteditor/qtgradienteditor.h
===================================================================
--- trunk/tools/shared/qtgradienteditor/qtgradienteditor.h	(revision 647)
+++ trunk/tools/shared/qtgradienteditor/qtgradienteditor.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtgradienteditor/qtgradienteditor.ui
===================================================================
--- trunk/tools/shared/qtgradienteditor/qtgradienteditor.ui	(revision 647)
+++ trunk/tools/shared/qtgradienteditor/qtgradienteditor.ui	(revision 651)
@@ -2,5 +2,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtgradienteditor/qtgradientmanager.cpp
===================================================================
--- trunk/tools/shared/qtgradienteditor/qtgradientmanager.cpp	(revision 647)
+++ trunk/tools/shared/qtgradienteditor/qtgradientmanager.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtgradienteditor/qtgradientmanager.h
===================================================================
--- trunk/tools/shared/qtgradienteditor/qtgradientmanager.h	(revision 647)
+++ trunk/tools/shared/qtgradienteditor/qtgradientmanager.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp
===================================================================
--- trunk/tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp	(revision 647)
+++ trunk/tools/shared/qtgradienteditor/qtgradientstopscontroller.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtgradienteditor/qtgradientstopscontroller.h
===================================================================
--- trunk/tools/shared/qtgradienteditor/qtgradientstopscontroller.h	(revision 647)
+++ trunk/tools/shared/qtgradienteditor/qtgradientstopscontroller.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtgradienteditor/qtgradientstopsmodel.cpp
===================================================================
--- trunk/tools/shared/qtgradienteditor/qtgradientstopsmodel.cpp	(revision 647)
+++ trunk/tools/shared/qtgradienteditor/qtgradientstopsmodel.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtgradienteditor/qtgradientstopsmodel.h
===================================================================
--- trunk/tools/shared/qtgradienteditor/qtgradientstopsmodel.h	(revision 647)
+++ trunk/tools/shared/qtgradienteditor/qtgradientstopsmodel.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtgradienteditor/qtgradientstopswidget.cpp
===================================================================
--- trunk/tools/shared/qtgradienteditor/qtgradientstopswidget.cpp	(revision 647)
+++ trunk/tools/shared/qtgradienteditor/qtgradientstopswidget.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtgradienteditor/qtgradientstopswidget.h
===================================================================
--- trunk/tools/shared/qtgradienteditor/qtgradientstopswidget.h	(revision 647)
+++ trunk/tools/shared/qtgradienteditor/qtgradientstopswidget.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtgradienteditor/qtgradientutils.cpp
===================================================================
--- trunk/tools/shared/qtgradienteditor/qtgradientutils.cpp	(revision 647)
+++ trunk/tools/shared/qtgradienteditor/qtgradientutils.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtgradienteditor/qtgradientutils.h
===================================================================
--- trunk/tools/shared/qtgradienteditor/qtgradientutils.h	(revision 647)
+++ trunk/tools/shared/qtgradienteditor/qtgradientutils.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtgradienteditor/qtgradientview.cpp
===================================================================
--- trunk/tools/shared/qtgradienteditor/qtgradientview.cpp	(revision 647)
+++ trunk/tools/shared/qtgradienteditor/qtgradientview.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtgradienteditor/qtgradientview.h
===================================================================
--- trunk/tools/shared/qtgradienteditor/qtgradientview.h	(revision 647)
+++ trunk/tools/shared/qtgradienteditor/qtgradientview.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtgradienteditor/qtgradientviewdialog.cpp
===================================================================
--- trunk/tools/shared/qtgradienteditor/qtgradientviewdialog.cpp	(revision 647)
+++ trunk/tools/shared/qtgradienteditor/qtgradientviewdialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtgradienteditor/qtgradientviewdialog.h
===================================================================
--- trunk/tools/shared/qtgradienteditor/qtgradientviewdialog.h	(revision 647)
+++ trunk/tools/shared/qtgradienteditor/qtgradientviewdialog.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtgradienteditor/qtgradientviewdialog.ui
===================================================================
--- trunk/tools/shared/qtgradienteditor/qtgradientviewdialog.ui	(revision 647)
+++ trunk/tools/shared/qtgradienteditor/qtgradientviewdialog.ui	(revision 651)
@@ -2,5 +2,5 @@
  <comment>*********************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtgradienteditor/qtgradientwidget.cpp
===================================================================
--- trunk/tools/shared/qtgradienteditor/qtgradientwidget.cpp	(revision 647)
+++ trunk/tools/shared/qtgradienteditor/qtgradientwidget.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtgradienteditor/qtgradientwidget.h
===================================================================
--- trunk/tools/shared/qtgradienteditor/qtgradientwidget.h	(revision 647)
+++ trunk/tools/shared/qtgradienteditor/qtgradientwidget.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp
===================================================================
--- trunk/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp	(revision 647)
+++ trunk/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h
===================================================================
--- trunk/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h	(revision 647)
+++ trunk/tools/shared/qtpropertybrowser/qtbuttonpropertybrowser.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtpropertybrowser/qteditorfactory.cpp
===================================================================
--- trunk/tools/shared/qtpropertybrowser/qteditorfactory.cpp	(revision 647)
+++ trunk/tools/shared/qtpropertybrowser/qteditorfactory.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -1159,4 +1159,5 @@
 {
     QDateEdit *editor = d_ptr->createEditor(property, parent);
+    editor->setDisplayFormat(QtPropertyBrowserUtils::dateFormat());
     editor->setCalendarPopup(true);
     editor->setDateRange(manager->minimum(property), manager->maximum(property));
@@ -1273,4 +1274,5 @@
 {
     QTimeEdit *editor = d_ptr->createEditor(property, parent);
+    editor->setDisplayFormat(QtPropertyBrowserUtils::timeFormat());
     editor->setTime(manager->value(property));
 
@@ -1386,4 +1388,5 @@
 {
     QDateTimeEdit *editor =  d_ptr->createEditor(property, parent);
+    editor->setDisplayFormat(QtPropertyBrowserUtils::dateTimeFormat());
     editor->setDateTime(manager->value(property));
 
Index: trunk/tools/shared/qtpropertybrowser/qteditorfactory.h
===================================================================
--- trunk/tools/shared/qtpropertybrowser/qteditorfactory.h	(revision 647)
+++ trunk/tools/shared/qtpropertybrowser/qteditorfactory.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp
===================================================================
--- trunk/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp	(revision 647)
+++ trunk/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h
===================================================================
--- trunk/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h	(revision 647)
+++ trunk/tools/shared/qtpropertybrowser/qtgroupboxpropertybrowser.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtpropertybrowser/qtpropertybrowser.cpp
===================================================================
--- trunk/tools/shared/qtpropertybrowser/qtpropertybrowser.cpp	(revision 647)
+++ trunk/tools/shared/qtpropertybrowser/qtpropertybrowser.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtpropertybrowser/qtpropertybrowser.h
===================================================================
--- trunk/tools/shared/qtpropertybrowser/qtpropertybrowser.h	(revision 647)
+++ trunk/tools/shared/qtpropertybrowser/qtpropertybrowser.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp
===================================================================
--- trunk/tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp	(revision 647)
+++ trunk/tools/shared/qtpropertybrowser/qtpropertybrowserutils.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -48,4 +48,5 @@
 #include <QtGui/QLineEdit>
 #include <QtGui/QMenu>
+#include <QtCore/QLocale>
 
 QT_BEGIN_NAMESPACE
@@ -209,4 +210,24 @@
 }
 
+QString QtPropertyBrowserUtils::dateFormat()
+{
+    QLocale loc;
+    return loc.dateFormat(QLocale::ShortFormat);
+}
+
+QString QtPropertyBrowserUtils::timeFormat()
+{
+    QLocale loc;
+    // ShortFormat is missing seconds on UNIX.
+    return loc.timeFormat(QLocale::LongFormat);    
+}
+
+QString QtPropertyBrowserUtils::dateTimeFormat()
+{
+    QString format = dateFormat();
+    format += QLatin1Char(' ');
+    format += timeFormat();
+    return format;
+}
 
 QtBoolEdit::QtBoolEdit(QWidget *parent) :
Index: trunk/tools/shared/qtpropertybrowser/qtpropertybrowserutils_p.h
===================================================================
--- trunk/tools/shared/qtpropertybrowser/qtpropertybrowserutils_p.h	(revision 647)
+++ trunk/tools/shared/qtpropertybrowser/qtpropertybrowserutils_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -95,4 +95,7 @@
     static QIcon fontValueIcon(const QFont &f);
     static QString fontValueText(const QFont &f);
+    static QString dateFormat();
+    static QString timeFormat();
+    static QString dateTimeFormat();
 };
 
Index: trunk/tools/shared/qtpropertybrowser/qtpropertymanager.cpp
===================================================================
--- trunk/tools/shared/qtpropertybrowser/qtpropertymanager.cpp	(revision 647)
+++ trunk/tools/shared/qtpropertybrowser/qtpropertymanager.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
@@ -1554,4 +1554,5 @@
     Q_DECLARE_PUBLIC(QtDatePropertyManager)
 public:
+    explicit QtDatePropertyManagerPrivate(QtDatePropertyManager *q);
 
     struct Data
@@ -1574,4 +1575,10 @@
 };
 
+QtDatePropertyManagerPrivate::QtDatePropertyManagerPrivate(QtDatePropertyManager *q) :
+    q_ptr(q),
+    m_format(QtPropertyBrowserUtils::dateFormat())
+{
+}
+
 /*!
     \class QtDatePropertyManager
@@ -1623,10 +1630,6 @@
 */
 QtDatePropertyManager::QtDatePropertyManager(QObject *parent)
-    : QtAbstractPropertyManager(parent), d_ptr(new QtDatePropertyManagerPrivate)
-{
-    d_ptr->q_ptr = this;
-
-    QLocale loc;
-    d_ptr->m_format = loc.dateFormat(QLocale::ShortFormat);
+    : QtAbstractPropertyManager(parent), d_ptr(new QtDatePropertyManagerPrivate(this))
+{
 }
 
@@ -1787,10 +1790,17 @@
     Q_DECLARE_PUBLIC(QtTimePropertyManager)
 public:
-
-    QString m_format;
+    explicit QtTimePropertyManagerPrivate(QtTimePropertyManager *q);
+
+    const QString m_format;
 
     typedef QMap<const QtProperty *, QTime> PropertyValueMap;
     PropertyValueMap m_values;
 };
+
+QtTimePropertyManagerPrivate::QtTimePropertyManagerPrivate(QtTimePropertyManager *q) :
+    q_ptr(q),
+    m_format(QtPropertyBrowserUtils::timeFormat())
+{
+}
 
 /*!
@@ -1826,10 +1836,6 @@
 */
 QtTimePropertyManager::QtTimePropertyManager(QObject *parent)
-    : QtAbstractPropertyManager(parent), d_ptr(new QtTimePropertyManagerPrivate)
-{
-    d_ptr->q_ptr = this;
-
-    QLocale loc;
-    d_ptr->m_format = loc.timeFormat(QLocale::ShortFormat);
+    : QtAbstractPropertyManager(parent), d_ptr(new QtTimePropertyManagerPrivate(this))
+{
 }
 
@@ -1904,10 +1910,17 @@
     Q_DECLARE_PUBLIC(QtDateTimePropertyManager)
 public:
-
-    QString m_format;
+    explicit QtDateTimePropertyManagerPrivate(QtDateTimePropertyManager *q);
+
+    const QString m_format;
 
     typedef QMap<const QtProperty *, QDateTime> PropertyValueMap;
     PropertyValueMap m_values;
 };
+
+QtDateTimePropertyManagerPrivate::QtDateTimePropertyManagerPrivate(QtDateTimePropertyManager *q) :
+    q_ptr(q),
+    m_format(QtPropertyBrowserUtils::dateTimeFormat())
+{
+}
 
 /*! \class QtDateTimePropertyManager
@@ -1939,12 +1952,6 @@
 */
 QtDateTimePropertyManager::QtDateTimePropertyManager(QObject *parent)
-    : QtAbstractPropertyManager(parent), d_ptr(new QtDateTimePropertyManagerPrivate)
-{
-    d_ptr->q_ptr = this;
-
-    QLocale loc;
-    d_ptr->m_format = loc.dateFormat(QLocale::ShortFormat);
-    d_ptr->m_format += QLatin1Char(' ');
-    d_ptr->m_format += loc.timeFormat(QLocale::ShortFormat);
+    : QtAbstractPropertyManager(parent), d_ptr(new QtDateTimePropertyManagerPrivate(this))
+{
 }
 
Index: trunk/tools/shared/qtpropertybrowser/qtpropertymanager.h
===================================================================
--- trunk/tools/shared/qtpropertybrowser/qtpropertymanager.h	(revision 647)
+++ trunk/tools/shared/qtpropertybrowser/qtpropertymanager.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtpropertybrowser/qttreepropertybrowser.cpp
===================================================================
--- trunk/tools/shared/qtpropertybrowser/qttreepropertybrowser.cpp	(revision 647)
+++ trunk/tools/shared/qtpropertybrowser/qttreepropertybrowser.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtpropertybrowser/qttreepropertybrowser.h
===================================================================
--- trunk/tools/shared/qtpropertybrowser/qttreepropertybrowser.h	(revision 647)
+++ trunk/tools/shared/qtpropertybrowser/qttreepropertybrowser.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtpropertybrowser/qtvariantproperty.cpp
===================================================================
--- trunk/tools/shared/qtpropertybrowser/qtvariantproperty.cpp	(revision 647)
+++ trunk/tools/shared/qtpropertybrowser/qtvariantproperty.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qtpropertybrowser/qtvariantproperty.h
===================================================================
--- trunk/tools/shared/qtpropertybrowser/qtvariantproperty.h	(revision 647)
+++ trunk/tools/shared/qtpropertybrowser/qtvariantproperty.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qttoolbardialog/qttoolbardialog.cpp
===================================================================
--- trunk/tools/shared/qttoolbardialog/qttoolbardialog.cpp	(revision 647)
+++ trunk/tools/shared/qttoolbardialog/qttoolbardialog.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/shared/qttoolbardialog/qttoolbardialog.h
===================================================================
--- trunk/tools/shared/qttoolbardialog/qttoolbardialog.h	(revision 647)
+++ trunk/tools/shared/qttoolbardialog/qttoolbardialog.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/xmlpatterns/main.cpp
===================================================================
--- trunk/tools/xmlpatterns/main.cpp	(revision 647)
+++ trunk/tools/xmlpatterns/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/xmlpatterns/main.h
===================================================================
--- trunk/tools/xmlpatterns/main.h	(revision 647)
+++ trunk/tools/xmlpatterns/main.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/xmlpatterns/qapplicationargument.cpp
===================================================================
--- trunk/tools/xmlpatterns/qapplicationargument.cpp	(revision 647)
+++ trunk/tools/xmlpatterns/qapplicationargument.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/xmlpatterns/qapplicationargument_p.h
===================================================================
--- trunk/tools/xmlpatterns/qapplicationargument_p.h	(revision 647)
+++ trunk/tools/xmlpatterns/qapplicationargument_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/xmlpatterns/qapplicationargumentparser.cpp
===================================================================
--- trunk/tools/xmlpatterns/qapplicationargumentparser.cpp	(revision 647)
+++ trunk/tools/xmlpatterns/qapplicationargumentparser.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/xmlpatterns/qapplicationargumentparser_p.h
===================================================================
--- trunk/tools/xmlpatterns/qapplicationargumentparser_p.h	(revision 647)
+++ trunk/tools/xmlpatterns/qapplicationargumentparser_p.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/xmlpatternsvalidator/main.cpp
===================================================================
--- trunk/tools/xmlpatternsvalidator/main.cpp	(revision 647)
+++ trunk/tools/xmlpatternsvalidator/main.cpp	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
Index: trunk/tools/xmlpatternsvalidator/main.h
===================================================================
--- trunk/tools/xmlpatternsvalidator/main.h	(revision 647)
+++ trunk/tools/xmlpatternsvalidator/main.h	(revision 651)
@@ -1,5 +1,5 @@
 /****************************************************************************
 **
-** 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)
