Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (49 commits)
  Reverted two commits that were pushed to the wrong branch.
  Use the new QTextCodec api in the QXmlStreamWriter.
  Added new functions to QTextCodec that accept ConversionFlags.
  Fix passing of arguments to syncqt
  doc: Fixed typos.
  Fixes:    Fix spinbox with NoButton style in QGtkStyle
  doc: Explained parameter value defaults where appropriate.
  Cocoa: Fix painting errors on QGLWidget resizing.
  Fix broken QGLWidget::renderPixmap on Mac/Carbon
  Fixes:    Setting any style sheet breaks checkbox positioning
  Fixes:    MenuItem size fixes and missing separator with Gtk+
  Autotest: add a test for QNAM's HTTP cache handling code
  QNAM HTTP: just use the expirationDate in the code that validates the cache
  QNAM HTTP: change the caching semantics to match documentation
  QNAM HTTP: fix the caching algorithm from RFC 2616
  Avoid repeatedly calling LookupAccountSid in QFSFileEngine::owner
  improve readability a bit more
  fix styling; improve readability
  make it possible to retrieve name of the user who owns the file
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d )
  ...

91 files changed, 93 insertions, 93 deletions

diff --git a/tests/auto/uic3/baseline/about.ui b/tests/auto/uic3/baseline/about.ui
index 619b4db..496c927 100644
--- a/tests/auto/uic3/baseline/about.ui
+++ b/tests/auto/uic3/baseline/about.ui
@@ -2,7 +2,7 @@
 <class>AboutDialog</class>
 <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)
 **
@@ -105,7 +105,7 @@
                 <cstring>aboutCopyright</cstring>
             </property>
             <property name="text">
-                <string>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). All Rights Reserved.</string>
+                <string>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). All Rights Reserved.</string>
             </property>
             <property name="alignment">
                 <set>AlignCenter</set>
diff --git a/tests/auto/uic3/baseline/about.ui.4 b/tests/auto/uic3/baseline/about.ui.4
index 0674d0f..c2f90a2 100644
--- a/tests/auto/uic3/baseline/about.ui.4
+++ b/tests/auto/uic3/baseline/about.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
@@ -100,7 +100,7 @@
       <item>
         <widget class="QLabel" name="aboutCopyright">
           <property name="text">
-            <string>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). All Rights Reserved.</string>
+            <string>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). All Rights Reserved.</string>
           </property>
           <property name="alignment">
             <set>Qt::AlignCenter</set>
diff --git a/tests/auto/uic3/baseline/actioneditor.ui b/tests/auto/uic3/baseline/actioneditor.ui
index d3deb10..3226a05 100644
--- a/tests/auto/uic3/baseline/actioneditor.ui
+++ b/tests/auto/uic3/baseline/actioneditor.ui
@@ -2,7 +2,7 @@
 <class>ActionEditorBase</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/actioneditor.ui.4 b/tests/auto/uic3/baseline/actioneditor.ui.4
index 68be75c..cbe9fe5 100644
--- a/tests/auto/uic3/baseline/actioneditor.ui.4
+++ b/tests/auto/uic3/baseline/actioneditor.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/config.ui b/tests/auto/uic3/baseline/config.ui
index dc02682..2b857a7 100644
--- a/tests/auto/uic3/baseline/config.ui
+++ b/tests/auto/uic3/baseline/config.ui
@@ -2,7 +2,7 @@
 <class>Config</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/config.ui.4 b/tests/auto/uic3/baseline/config.ui.4
index 0bd6256..2e7addb 100644
--- a/tests/auto/uic3/baseline/config.ui.4
+++ b/tests/auto/uic3/baseline/config.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/configtoolboxdialog.ui b/tests/auto/uic3/baseline/configtoolboxdialog.ui
index 2ffa4b7..bf11aed 100644
--- a/tests/auto/uic3/baseline/configtoolboxdialog.ui
+++ b/tests/auto/uic3/baseline/configtoolboxdialog.ui
@@ -2,7 +2,7 @@
 <class>ConfigToolboxDialog</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/configtoolboxdialog.ui.4 b/tests/auto/uic3/baseline/configtoolboxdialog.ui.4
index d138e16..4ae9e06 100644
--- a/tests/auto/uic3/baseline/configtoolboxdialog.ui.4
+++ b/tests/auto/uic3/baseline/configtoolboxdialog.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/connectiondialog.ui b/tests/auto/uic3/baseline/connectiondialog.ui
index 3364af7..660dee8 100644
--- a/tests/auto/uic3/baseline/connectiondialog.ui
+++ b/tests/auto/uic3/baseline/connectiondialog.ui
@@ -2,7 +2,7 @@
 <class>ConnectionDialog</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/connectiondialog.ui.4 b/tests/auto/uic3/baseline/connectiondialog.ui.4
index 7f390f6..987acdf 100644
--- a/tests/auto/uic3/baseline/connectiondialog.ui.4
+++ b/tests/auto/uic3/baseline/connectiondialog.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/createtemplate.ui b/tests/auto/uic3/baseline/createtemplate.ui
index e819b9d..f7345df 100644
--- a/tests/auto/uic3/baseline/createtemplate.ui
+++ b/tests/auto/uic3/baseline/createtemplate.ui
@@ -2,7 +2,7 @@
 <class>CreateTemplate</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/createtemplate.ui.4 b/tests/auto/uic3/baseline/createtemplate.ui.4
index 1c7b2c2..e611050 100644
--- a/tests/auto/uic3/baseline/createtemplate.ui.4
+++ b/tests/auto/uic3/baseline/createtemplate.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/customwidgeteditor.ui b/tests/auto/uic3/baseline/customwidgeteditor.ui
index b6a3599..55acaea 100644
--- a/tests/auto/uic3/baseline/customwidgeteditor.ui
+++ b/tests/auto/uic3/baseline/customwidgeteditor.ui
@@ -2,7 +2,7 @@
 <class>CustomWidgetEditorBase</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/customwidgeteditor.ui.4 b/tests/auto/uic3/baseline/customwidgeteditor.ui.4
index 1c1ff86..978e329 100644
--- a/tests/auto/uic3/baseline/customwidgeteditor.ui.4
+++ b/tests/auto/uic3/baseline/customwidgeteditor.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/dbconnection.ui b/tests/auto/uic3/baseline/dbconnection.ui
index 99a8397..0f21a9f 100644
--- a/tests/auto/uic3/baseline/dbconnection.ui
+++ b/tests/auto/uic3/baseline/dbconnection.ui
@@ -2,7 +2,7 @@
 <class>DatabaseConnectionWidget</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/dbconnection.ui.4 b/tests/auto/uic3/baseline/dbconnection.ui.4
index 16e1966..fc08f49 100644
--- a/tests/auto/uic3/baseline/dbconnection.ui.4
+++ b/tests/auto/uic3/baseline/dbconnection.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/dbconnectioneditor.ui b/tests/auto/uic3/baseline/dbconnectioneditor.ui
index fc2a66e..3886f98 100644
--- a/tests/auto/uic3/baseline/dbconnectioneditor.ui
+++ b/tests/auto/uic3/baseline/dbconnectioneditor.ui
@@ -2,7 +2,7 @@
 <class>DatabaseConnectionEditorBase</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/dbconnectioneditor.ui.4 b/tests/auto/uic3/baseline/dbconnectioneditor.ui.4
index 76e1045..1fe2dc7 100644
--- a/tests/auto/uic3/baseline/dbconnectioneditor.ui.4
+++ b/tests/auto/uic3/baseline/dbconnectioneditor.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/dbconnections.ui b/tests/auto/uic3/baseline/dbconnections.ui
index 1e70aee..198ff76 100644
--- a/tests/auto/uic3/baseline/dbconnections.ui
+++ b/tests/auto/uic3/baseline/dbconnections.ui
@@ -2,7 +2,7 @@
 <class>DatabaseConnectionBase</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/dbconnections.ui.4 b/tests/auto/uic3/baseline/dbconnections.ui.4
index 74dabb9..b008125 100644
--- a/tests/auto/uic3/baseline/dbconnections.ui.4
+++ b/tests/auto/uic3/baseline/dbconnections.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/editfunctions.ui b/tests/auto/uic3/baseline/editfunctions.ui
index 0660e57..5b0ad26 100644
--- a/tests/auto/uic3/baseline/editfunctions.ui
+++ b/tests/auto/uic3/baseline/editfunctions.ui
@@ -2,7 +2,7 @@
 <class>EditFunctionsBase</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/editfunctions.ui.4 b/tests/auto/uic3/baseline/editfunctions.ui.4
index 9c1f5c8..e8e9838 100644
--- a/tests/auto/uic3/baseline/editfunctions.ui.4
+++ b/tests/auto/uic3/baseline/editfunctions.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/finddialog.ui b/tests/auto/uic3/baseline/finddialog.ui
index bb4b632..f6acdca 100644
--- a/tests/auto/uic3/baseline/finddialog.ui
+++ b/tests/auto/uic3/baseline/finddialog.ui
@@ -2,7 +2,7 @@
 <class>FindDialog</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/finddialog.ui.4 b/tests/auto/uic3/baseline/finddialog.ui.4
index d19db23..89c4f6e 100644
--- a/tests/auto/uic3/baseline/finddialog.ui.4
+++ b/tests/auto/uic3/baseline/finddialog.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/formsettings.ui b/tests/auto/uic3/baseline/formsettings.ui
index 8d2c00b..064262c 100644
--- a/tests/auto/uic3/baseline/formsettings.ui
+++ b/tests/auto/uic3/baseline/formsettings.ui
@@ -2,7 +2,7 @@
 <class>FormSettingsBase</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/formsettings.ui.4 b/tests/auto/uic3/baseline/formsettings.ui.4
index c08daba..5f769db 100644
--- a/tests/auto/uic3/baseline/formsettings.ui.4
+++ b/tests/auto/uic3/baseline/formsettings.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/gotolinedialog.ui b/tests/auto/uic3/baseline/gotolinedialog.ui
index 277444e..3c8d21e 100644
--- a/tests/auto/uic3/baseline/gotolinedialog.ui
+++ b/tests/auto/uic3/baseline/gotolinedialog.ui
@@ -2,7 +2,7 @@
 <class>GotoLineDialog</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/gotolinedialog.ui.4 b/tests/auto/uic3/baseline/gotolinedialog.ui.4
index b4e51cd..b91269f 100644
--- a/tests/auto/uic3/baseline/gotolinedialog.ui.4
+++ b/tests/auto/uic3/baseline/gotolinedialog.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/helpdialog.ui b/tests/auto/uic3/baseline/helpdialog.ui
index d95c9d0..5683b52 100644
--- a/tests/auto/uic3/baseline/helpdialog.ui
+++ b/tests/auto/uic3/baseline/helpdialog.ui
@@ -2,7 +2,7 @@
 <class>HelpDialogBase</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/helpdialog.ui.4 b/tests/auto/uic3/baseline/helpdialog.ui.4
index 60568f8..b640005 100644
--- a/tests/auto/uic3/baseline/helpdialog.ui.4
+++ b/tests/auto/uic3/baseline/helpdialog.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/iconvieweditor.ui b/tests/auto/uic3/baseline/iconvieweditor.ui
index fbc6e1f..dd26fd5 100644
--- a/tests/auto/uic3/baseline/iconvieweditor.ui
+++ b/tests/auto/uic3/baseline/iconvieweditor.ui
@@ -2,7 +2,7 @@
 <class>IconViewEditorBase</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/iconvieweditor.ui.4 b/tests/auto/uic3/baseline/iconvieweditor.ui.4
index b4c1c40..48a248c 100644
--- a/tests/auto/uic3/baseline/iconvieweditor.ui.4
+++ b/tests/auto/uic3/baseline/iconvieweditor.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/listboxeditor.ui b/tests/auto/uic3/baseline/listboxeditor.ui
index 6cb2f67..1a5b6c1 100644
--- a/tests/auto/uic3/baseline/listboxeditor.ui
+++ b/tests/auto/uic3/baseline/listboxeditor.ui
@@ -2,7 +2,7 @@
 <class>ListBoxEditorBase</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/listboxeditor.ui.4 b/tests/auto/uic3/baseline/listboxeditor.ui.4
index 8de9fa7..bcf3226 100644
--- a/tests/auto/uic3/baseline/listboxeditor.ui.4
+++ b/tests/auto/uic3/baseline/listboxeditor.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/listeditor.ui b/tests/auto/uic3/baseline/listeditor.ui
index e2d3bf2..947e0fe 100644
--- a/tests/auto/uic3/baseline/listeditor.ui
+++ b/tests/auto/uic3/baseline/listeditor.ui
@@ -2,7 +2,7 @@
 <class>ListEditor</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/listeditor.ui.4 b/tests/auto/uic3/baseline/listeditor.ui.4
index e523390..dad5a4e 100644
--- a/tests/auto/uic3/baseline/listeditor.ui.4
+++ b/tests/auto/uic3/baseline/listeditor.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/listvieweditor.ui b/tests/auto/uic3/baseline/listvieweditor.ui
index 51d614e..4c07588 100644
--- a/tests/auto/uic3/baseline/listvieweditor.ui
+++ b/tests/auto/uic3/baseline/listvieweditor.ui
@@ -2,7 +2,7 @@
 <class>ListViewEditorBase</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/listvieweditor.ui.4 b/tests/auto/uic3/baseline/listvieweditor.ui.4
index 53f03cb..024b148 100644
--- a/tests/auto/uic3/baseline/listvieweditor.ui.4
+++ b/tests/auto/uic3/baseline/listvieweditor.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/mainfilesettings.ui b/tests/auto/uic3/baseline/mainfilesettings.ui
index 6d8b374..be3b85a 100644
--- a/tests/auto/uic3/baseline/mainfilesettings.ui
+++ b/tests/auto/uic3/baseline/mainfilesettings.ui
@@ -2,7 +2,7 @@
 <class>CppMainFile</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/mainfilesettings.ui.4 b/tests/auto/uic3/baseline/mainfilesettings.ui.4
index 07b039c..db9033f 100644
--- a/tests/auto/uic3/baseline/mainfilesettings.ui.4
+++ b/tests/auto/uic3/baseline/mainfilesettings.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/mainwindowbase.ui b/tests/auto/uic3/baseline/mainwindowbase.ui
index 55d485f..435266a 100644
--- a/tests/auto/uic3/baseline/mainwindowbase.ui
+++ b/tests/auto/uic3/baseline/mainwindowbase.ui
@@ -2,7 +2,7 @@
 <class>MainWindowBase</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/mainwindowbase.ui.4 b/tests/auto/uic3/baseline/mainwindowbase.ui.4
index 2340576..8b61514 100644
--- a/tests/auto/uic3/baseline/mainwindowbase.ui.4
+++ b/tests/auto/uic3/baseline/mainwindowbase.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/mainwindowwizard.ui b/tests/auto/uic3/baseline/mainwindowwizard.ui
index bc91a24..5c8a80b 100644
--- a/tests/auto/uic3/baseline/mainwindowwizard.ui
+++ b/tests/auto/uic3/baseline/mainwindowwizard.ui
@@ -2,7 +2,7 @@
 <class>MainWindowWizardBase</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/mainwindowwizard.ui.4 b/tests/auto/uic3/baseline/mainwindowwizard.ui.4
index 1690533..e979ec9 100644
--- a/tests/auto/uic3/baseline/mainwindowwizard.ui.4
+++ b/tests/auto/uic3/baseline/mainwindowwizard.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/multilineeditor.ui b/tests/auto/uic3/baseline/multilineeditor.ui
index 220bfd1..ec1d10c 100644
--- a/tests/auto/uic3/baseline/multilineeditor.ui
+++ b/tests/auto/uic3/baseline/multilineeditor.ui
@@ -2,7 +2,7 @@
 <class>MultiLineEditorBase</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/multilineeditor.ui.4 b/tests/auto/uic3/baseline/multilineeditor.ui.4
index 9362f9f..bbedf70 100644
--- a/tests/auto/uic3/baseline/multilineeditor.ui.4
+++ b/tests/auto/uic3/baseline/multilineeditor.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/newform.ui b/tests/auto/uic3/baseline/newform.ui
index 8f0ca72..4ef1e20 100644
--- a/tests/auto/uic3/baseline/newform.ui
+++ b/tests/auto/uic3/baseline/newform.ui
@@ -2,7 +2,7 @@
 <class>NewFormBase</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/newform.ui.4 b/tests/auto/uic3/baseline/newform.ui.4
index 51c4c05..26944fb 100644
--- a/tests/auto/uic3/baseline/newform.ui.4
+++ b/tests/auto/uic3/baseline/newform.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/paletteeditor.ui b/tests/auto/uic3/baseline/paletteeditor.ui
index 76f6236..9b1c867 100644
--- a/tests/auto/uic3/baseline/paletteeditor.ui
+++ b/tests/auto/uic3/baseline/paletteeditor.ui
@@ -2,7 +2,7 @@
 <class>PaletteEditorBase</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/paletteeditor.ui.4 b/tests/auto/uic3/baseline/paletteeditor.ui.4
index 6443e1f..0cc66bd 100644
--- a/tests/auto/uic3/baseline/paletteeditor.ui.4
+++ b/tests/auto/uic3/baseline/paletteeditor.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/paletteeditoradvanced.ui b/tests/auto/uic3/baseline/paletteeditoradvanced.ui
index b4f9f23..1d4b571 100644
--- a/tests/auto/uic3/baseline/paletteeditoradvanced.ui
+++ b/tests/auto/uic3/baseline/paletteeditoradvanced.ui
@@ -2,7 +2,7 @@
 <class>PaletteEditorAdvancedBase</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/paletteeditoradvanced.ui.4 b/tests/auto/uic3/baseline/paletteeditoradvanced.ui.4
index 648fe0a..1c98529 100644
--- a/tests/auto/uic3/baseline/paletteeditoradvanced.ui.4
+++ b/tests/auto/uic3/baseline/paletteeditoradvanced.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/paletteeditoradvancedbase.ui b/tests/auto/uic3/baseline/paletteeditoradvancedbase.ui
index 2bb1a29..7c22eaa 100644
--- a/tests/auto/uic3/baseline/paletteeditoradvancedbase.ui
+++ b/tests/auto/uic3/baseline/paletteeditoradvancedbase.ui
@@ -2,7 +2,7 @@
 <class>PaletteEditorAdvancedBase</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/paletteeditoradvancedbase.ui.4 b/tests/auto/uic3/baseline/paletteeditoradvancedbase.ui.4
index 65a04fd..95b0ea0 100644
--- a/tests/auto/uic3/baseline/paletteeditoradvancedbase.ui.4
+++ b/tests/auto/uic3/baseline/paletteeditoradvancedbase.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/pixmapcollectioneditor.ui b/tests/auto/uic3/baseline/pixmapcollectioneditor.ui
index dea9b23..6e0512e 100644
--- a/tests/auto/uic3/baseline/pixmapcollectioneditor.ui
+++ b/tests/auto/uic3/baseline/pixmapcollectioneditor.ui
@@ -2,7 +2,7 @@
 <class>PixmapCollectionEditor</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/pixmapcollectioneditor.ui.4 b/tests/auto/uic3/baseline/pixmapcollectioneditor.ui.4
index 6b8c54a..0817f1c 100644
--- a/tests/auto/uic3/baseline/pixmapcollectioneditor.ui.4
+++ b/tests/auto/uic3/baseline/pixmapcollectioneditor.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/pixmapfunction.ui b/tests/auto/uic3/baseline/pixmapfunction.ui
index 38caeb7..cf150dd 100644
--- a/tests/auto/uic3/baseline/pixmapfunction.ui
+++ b/tests/auto/uic3/baseline/pixmapfunction.ui
@@ -2,7 +2,7 @@
 <class>PixmapFunction</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/pixmapfunction.ui.4 b/tests/auto/uic3/baseline/pixmapfunction.ui.4
index a3b6a23..c6e7ddb 100644
--- a/tests/auto/uic3/baseline/pixmapfunction.ui.4
+++ b/tests/auto/uic3/baseline/pixmapfunction.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/preferences.ui b/tests/auto/uic3/baseline/preferences.ui
index b2098a9..34c48a1 100644
--- a/tests/auto/uic3/baseline/preferences.ui
+++ b/tests/auto/uic3/baseline/preferences.ui
@@ -2,7 +2,7 @@
 <class>Preferences</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/preferences.ui.4 b/tests/auto/uic3/baseline/preferences.ui.4
index eb6f07c..41fd130 100644
--- a/tests/auto/uic3/baseline/preferences.ui.4
+++ b/tests/auto/uic3/baseline/preferences.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/previewwidget.ui b/tests/auto/uic3/baseline/previewwidget.ui
index 8ca4a04..41ba5d4 100644
--- a/tests/auto/uic3/baseline/previewwidget.ui
+++ b/tests/auto/uic3/baseline/previewwidget.ui
@@ -2,7 +2,7 @@
 <class>PreviewWidgetBase</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/previewwidget.ui.4 b/tests/auto/uic3/baseline/previewwidget.ui.4
index 2bb0c40..36cf91d 100644
--- a/tests/auto/uic3/baseline/previewwidget.ui.4
+++ b/tests/auto/uic3/baseline/previewwidget.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/previewwidgetbase.ui b/tests/auto/uic3/baseline/previewwidgetbase.ui
index e4a5231..a6d21ca 100644
--- a/tests/auto/uic3/baseline/previewwidgetbase.ui
+++ b/tests/auto/uic3/baseline/previewwidgetbase.ui
@@ -2,7 +2,7 @@
 <class>PreviewWidgetBase</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/previewwidgetbase.ui.4 b/tests/auto/uic3/baseline/previewwidgetbase.ui.4
index f144a4e..673850b 100644
--- a/tests/auto/uic3/baseline/previewwidgetbase.ui.4
+++ b/tests/auto/uic3/baseline/previewwidgetbase.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/projectsettings.ui b/tests/auto/uic3/baseline/projectsettings.ui
index b6b535b..e35cde6 100644
--- a/tests/auto/uic3/baseline/projectsettings.ui
+++ b/tests/auto/uic3/baseline/projectsettings.ui
@@ -2,7 +2,7 @@
 <class>ProjectSettingsBase</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/projectsettings.ui.4 b/tests/auto/uic3/baseline/projectsettings.ui.4
index 00fd34e..a84f3b8 100644
--- a/tests/auto/uic3/baseline/projectsettings.ui.4
+++ b/tests/auto/uic3/baseline/projectsettings.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/qactivexselect.ui b/tests/auto/uic3/baseline/qactivexselect.ui
index fed830b..07e7483 100644
--- a/tests/auto/uic3/baseline/qactivexselect.ui
+++ b/tests/auto/uic3/baseline/qactivexselect.ui
@@ -2,7 +2,7 @@
 <class>QActiveXSelect</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/qactivexselect.ui.4 b/tests/auto/uic3/baseline/qactivexselect.ui.4
index 9755ee6..c3d29f5 100644
--- a/tests/auto/uic3/baseline/qactivexselect.ui.4
+++ b/tests/auto/uic3/baseline/qactivexselect.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/replacedialog.ui b/tests/auto/uic3/baseline/replacedialog.ui
index 7328501..6ad9387 100644
--- a/tests/auto/uic3/baseline/replacedialog.ui
+++ b/tests/auto/uic3/baseline/replacedialog.ui
@@ -2,7 +2,7 @@
 <class>ReplaceDialog</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/replacedialog.ui.4 b/tests/auto/uic3/baseline/replacedialog.ui.4
index 4f58f93..ac17951 100644
--- a/tests/auto/uic3/baseline/replacedialog.ui.4
+++ b/tests/auto/uic3/baseline/replacedialog.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/richtextfontdialog.ui b/tests/auto/uic3/baseline/richtextfontdialog.ui
index 6c08ba7..19e73e9 100644
--- a/tests/auto/uic3/baseline/richtextfontdialog.ui
+++ b/tests/auto/uic3/baseline/richtextfontdialog.ui
@@ -2,7 +2,7 @@
 <class>RichTextFontDialog</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/richtextfontdialog.ui.4 b/tests/auto/uic3/baseline/richtextfontdialog.ui.4
index 350a5f1..f9afbd9 100644
--- a/tests/auto/uic3/baseline/richtextfontdialog.ui.4
+++ b/tests/auto/uic3/baseline/richtextfontdialog.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/settingsdialog.ui b/tests/auto/uic3/baseline/settingsdialog.ui
index d848917..d3a0b3a 100644
--- a/tests/auto/uic3/baseline/settingsdialog.ui
+++ b/tests/auto/uic3/baseline/settingsdialog.ui
@@ -2,7 +2,7 @@
 <class>SettingsDialogBase</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/settingsdialog.ui.4 b/tests/auto/uic3/baseline/settingsdialog.ui.4
index 3b2842e..7a649b7 100644
--- a/tests/auto/uic3/baseline/settingsdialog.ui.4
+++ b/tests/auto/uic3/baseline/settingsdialog.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/sqlformwizard.ui b/tests/auto/uic3/baseline/sqlformwizard.ui
index f7897f8..84f747a 100644
--- a/tests/auto/uic3/baseline/sqlformwizard.ui
+++ b/tests/auto/uic3/baseline/sqlformwizard.ui
@@ -2,7 +2,7 @@
 <class>SqlFormWizardBase</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/sqlformwizard.ui.4 b/tests/auto/uic3/baseline/sqlformwizard.ui.4
index 2bd00f2..3215f4f 100644
--- a/tests/auto/uic3/baseline/sqlformwizard.ui.4
+++ b/tests/auto/uic3/baseline/sqlformwizard.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/startdialog.ui b/tests/auto/uic3/baseline/startdialog.ui
index ffa7627..7f99b8f 100644
--- a/tests/auto/uic3/baseline/startdialog.ui
+++ b/tests/auto/uic3/baseline/startdialog.ui
@@ -2,7 +2,7 @@
 <class>StartDialogBase</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/startdialog.ui.4 b/tests/auto/uic3/baseline/startdialog.ui.4
index 6ca0c93..ad883bc 100644
--- a/tests/auto/uic3/baseline/startdialog.ui.4
+++ b/tests/auto/uic3/baseline/startdialog.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/statistics.ui b/tests/auto/uic3/baseline/statistics.ui
index 60a8881..6c2a406 100644
--- a/tests/auto/uic3/baseline/statistics.ui
+++ b/tests/auto/uic3/baseline/statistics.ui
@@ -2,7 +2,7 @@
 <class>Statistics</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/statistics.ui.4 b/tests/auto/uic3/baseline/statistics.ui.4
index 7cb4a52..bad7065 100644
--- a/tests/auto/uic3/baseline/statistics.ui.4
+++ b/tests/auto/uic3/baseline/statistics.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/tabbedbrowser.ui b/tests/auto/uic3/baseline/tabbedbrowser.ui
index f31cc38..1b496b1 100644
--- a/tests/auto/uic3/baseline/tabbedbrowser.ui
+++ b/tests/auto/uic3/baseline/tabbedbrowser.ui
@@ -2,7 +2,7 @@
 <class>TabbedBrowser</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/tabbedbrowser.ui.4 b/tests/auto/uic3/baseline/tabbedbrowser.ui.4
index 4878c95..52402d7 100644
--- a/tests/auto/uic3/baseline/tabbedbrowser.ui.4
+++ b/tests/auto/uic3/baseline/tabbedbrowser.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/tableeditor.ui b/tests/auto/uic3/baseline/tableeditor.ui
index cd350c7..f566278 100644
--- a/tests/auto/uic3/baseline/tableeditor.ui
+++ b/tests/auto/uic3/baseline/tableeditor.ui
@@ -2,7 +2,7 @@
 <class>TableEditorBase</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/tableeditor.ui.4 b/tests/auto/uic3/baseline/tableeditor.ui.4
index c24c90b..ffcb8b4 100644
--- a/tests/auto/uic3/baseline/tableeditor.ui.4
+++ b/tests/auto/uic3/baseline/tableeditor.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/topicchooser.ui b/tests/auto/uic3/baseline/topicchooser.ui
index 6d4d82d..67968cb 100644
--- a/tests/auto/uic3/baseline/topicchooser.ui
+++ b/tests/auto/uic3/baseline/topicchooser.ui
@@ -2,7 +2,7 @@
 <class>TopicChooserBase</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/topicchooser.ui.4 b/tests/auto/uic3/baseline/topicchooser.ui.4
index 14790db..cd51409 100644
--- a/tests/auto/uic3/baseline/topicchooser.ui.4
+++ b/tests/auto/uic3/baseline/topicchooser.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/variabledialog.ui b/tests/auto/uic3/baseline/variabledialog.ui
index 92bfa07..ce13154 100644
--- a/tests/auto/uic3/baseline/variabledialog.ui
+++ b/tests/auto/uic3/baseline/variabledialog.ui
@@ -2,7 +2,7 @@
 <class>VariableDialogBase</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/variabledialog.ui.4 b/tests/auto/uic3/baseline/variabledialog.ui.4
index fbf719d..d105152 100644
--- a/tests/auto/uic3/baseline/variabledialog.ui.4
+++ b/tests/auto/uic3/baseline/variabledialog.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/baseline/wizardeditor.ui b/tests/auto/uic3/baseline/wizardeditor.ui
index 0bb5374..50b1de2 100644
--- a/tests/auto/uic3/baseline/wizardeditor.ui
+++ b/tests/auto/uic3/baseline/wizardeditor.ui
@@ -2,7 +2,7 @@
 <class>WizardEditorBase</class>
 <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)
 **
diff --git a/tests/auto/uic3/baseline/wizardeditor.ui.4 b/tests/auto/uic3/baseline/wizardeditor.ui.4
index ebf2e91..620241e 100644
--- a/tests/auto/uic3/baseline/wizardeditor.ui.4
+++ b/tests/auto/uic3/baseline/wizardeditor.ui.4
@@ -3,7 +3,7 @@
   <author></author>
   <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)
 **
diff --git a/tests/auto/uic3/tst_uic3.cpp b/tests/auto/uic3/tst_uic3.cpp
index 5224a96..ac45bf4 100644
--- a/tests/auto/uic3/tst_uic3.cpp
+++ b/tests/auto/uic3/tst_uic3.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **