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 )
  ...

32 files changed, 32 insertions, 32 deletions

diff --git a/tests/auto/uiloader/baseline/batchtranslation.ui b/tests/auto/uiloader/baseline/batchtranslation.ui
index 7165aed..1d173b5 100644
--- a/tests/auto/uiloader/baseline/batchtranslation.ui
+++ b/tests/auto/uiloader/baseline/batchtranslation.ui
@@ -2,7 +2,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/uiloader/baseline/config.ui b/tests/auto/uiloader/baseline/config.ui
index 61fbc52..a5a275e 100644
--- a/tests/auto/uiloader/baseline/config.ui
+++ b/tests/auto/uiloader/baseline/config.ui
@@ -1,7 +1,7 @@
 <ui version="4.0" >
  <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/uiloader/baseline/finddialog.ui b/tests/auto/uiloader/baseline/finddialog.ui
index 6dd17bc..74c1913 100644
--- a/tests/auto/uiloader/baseline/finddialog.ui
+++ b/tests/auto/uiloader/baseline/finddialog.ui
@@ -1,7 +1,7 @@
 <ui version="4.0" >
  <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/uiloader/baseline/formwindowsettings.ui b/tests/auto/uiloader/baseline/formwindowsettings.ui
index d647e1e..cad86a4 100644
--- a/tests/auto/uiloader/baseline/formwindowsettings.ui
+++ b/tests/auto/uiloader/baseline/formwindowsettings.ui
@@ -1,7 +1,7 @@
 <ui version="4.0" >
  <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/uiloader/baseline/helpdialog.ui b/tests/auto/uiloader/baseline/helpdialog.ui
index b21a53a..eb4d07f 100644
--- a/tests/auto/uiloader/baseline/helpdialog.ui
+++ b/tests/auto/uiloader/baseline/helpdialog.ui
@@ -2,7 +2,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/uiloader/baseline/listwidgeteditor.ui b/tests/auto/uiloader/baseline/listwidgeteditor.ui
index 9029293..f7d7dd5 100644
--- a/tests/auto/uiloader/baseline/listwidgeteditor.ui
+++ b/tests/auto/uiloader/baseline/listwidgeteditor.ui
@@ -1,7 +1,7 @@
 <ui version="4.0" >
  <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/uiloader/baseline/mainwindowbase.ui b/tests/auto/uiloader/baseline/mainwindowbase.ui
index 11265a9..dd5c77c 100644
--- a/tests/auto/uiloader/baseline/mainwindowbase.ui
+++ b/tests/auto/uiloader/baseline/mainwindowbase.ui
@@ -2,7 +2,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/uiloader/baseline/newactiondialog.ui b/tests/auto/uiloader/baseline/newactiondialog.ui
index 3475969..97c1085 100644
--- a/tests/auto/uiloader/baseline/newactiondialog.ui
+++ b/tests/auto/uiloader/baseline/newactiondialog.ui
@@ -1,7 +1,7 @@
 <ui version="4.0" >
  <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/uiloader/baseline/newform.ui b/tests/auto/uiloader/baseline/newform.ui
index d6f9e8e..bd4973c 100644
--- a/tests/auto/uiloader/baseline/newform.ui
+++ b/tests/auto/uiloader/baseline/newform.ui
@@ -2,7 +2,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/uiloader/baseline/orderdialog.ui b/tests/auto/uiloader/baseline/orderdialog.ui
index 342cf0d..fdbb197 100644
--- a/tests/auto/uiloader/baseline/orderdialog.ui
+++ b/tests/auto/uiloader/baseline/orderdialog.ui
@@ -1,7 +1,7 @@
 <ui version="4.0" >
  <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/uiloader/baseline/paletteeditor.ui b/tests/auto/uiloader/baseline/paletteeditor.ui
index 0cce1b0..6a9924e 100644
--- a/tests/auto/uiloader/baseline/paletteeditor.ui
+++ b/tests/auto/uiloader/baseline/paletteeditor.ui
@@ -1,7 +1,7 @@
 <ui version="4.0" >
  <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/uiloader/baseline/paletteeditoradvancedbase.ui b/tests/auto/uiloader/baseline/paletteeditoradvancedbase.ui
index 021d557..2d9526d 100644
--- a/tests/auto/uiloader/baseline/paletteeditoradvancedbase.ui
+++ b/tests/auto/uiloader/baseline/paletteeditoradvancedbase.ui
@@ -2,7 +2,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/uiloader/baseline/phrasebookbox.ui b/tests/auto/uiloader/baseline/phrasebookbox.ui
index f5ba7fe..38d22ee 100644
--- a/tests/auto/uiloader/baseline/phrasebookbox.ui
+++ b/tests/auto/uiloader/baseline/phrasebookbox.ui
@@ -1,7 +1,7 @@
 <ui version="4.0" >
  <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/uiloader/baseline/plugindialog.ui b/tests/auto/uiloader/baseline/plugindialog.ui
index 0426917..a5b5cbc 100644
--- a/tests/auto/uiloader/baseline/plugindialog.ui
+++ b/tests/auto/uiloader/baseline/plugindialog.ui
@@ -1,7 +1,7 @@
 <ui version="4.0" >
  <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/uiloader/baseline/previewwidget.ui b/tests/auto/uiloader/baseline/previewwidget.ui
index 5529456..cae6bd8 100644
--- a/tests/auto/uiloader/baseline/previewwidget.ui
+++ b/tests/auto/uiloader/baseline/previewwidget.ui
@@ -1,7 +1,7 @@
 <ui version="4.0" >
  <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/uiloader/baseline/previewwidgetbase.ui b/tests/auto/uiloader/baseline/previewwidgetbase.ui
index e68ab69..5e13e1e 100644
--- a/tests/auto/uiloader/baseline/previewwidgetbase.ui
+++ b/tests/auto/uiloader/baseline/previewwidgetbase.ui
@@ -2,7 +2,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/uiloader/baseline/qfiledialog.ui b/tests/auto/uiloader/baseline/qfiledialog.ui
index 0888f63..1af2967 100644
--- a/tests/auto/uiloader/baseline/qfiledialog.ui
+++ b/tests/auto/uiloader/baseline/qfiledialog.ui
@@ -1,7 +1,7 @@
 <ui version="4.0" >
  <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/uiloader/baseline/qtgradientdialog.ui b/tests/auto/uiloader/baseline/qtgradientdialog.ui
index b82f36c..363a44b 100644
--- a/tests/auto/uiloader/baseline/qtgradientdialog.ui
+++ b/tests/auto/uiloader/baseline/qtgradientdialog.ui
@@ -1,7 +1,7 @@
 <ui version="4.0" >
  <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/uiloader/baseline/qtgradienteditor.ui b/tests/auto/uiloader/baseline/qtgradienteditor.ui
index f62a3a2..d5a0e8f 100644
--- a/tests/auto/uiloader/baseline/qtgradienteditor.ui
+++ b/tests/auto/uiloader/baseline/qtgradienteditor.ui
@@ -1,7 +1,7 @@
 <ui version="4.0" >
  <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/uiloader/baseline/qtgradientviewdialog.ui b/tests/auto/uiloader/baseline/qtgradientviewdialog.ui
index 553b975..06841d4 100644
--- a/tests/auto/uiloader/baseline/qtgradientviewdialog.ui
+++ b/tests/auto/uiloader/baseline/qtgradientviewdialog.ui
@@ -1,7 +1,7 @@
 <ui version="4.0" >
  <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/uiloader/baseline/saveformastemplate.ui b/tests/auto/uiloader/baseline/saveformastemplate.ui
index 88263c7..8fc0163 100644
--- a/tests/auto/uiloader/baseline/saveformastemplate.ui
+++ b/tests/auto/uiloader/baseline/saveformastemplate.ui
@@ -1,7 +1,7 @@
 <ui version="4.0" >
  <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/uiloader/baseline/statistics.ui b/tests/auto/uiloader/baseline/statistics.ui
index c734008..383e7b1 100644
--- a/tests/auto/uiloader/baseline/statistics.ui
+++ b/tests/auto/uiloader/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/uiloader/baseline/stringlisteditor.ui b/tests/auto/uiloader/baseline/stringlisteditor.ui
index db32acc..7675ea9 100644
--- a/tests/auto/uiloader/baseline/stringlisteditor.ui
+++ b/tests/auto/uiloader/baseline/stringlisteditor.ui
@@ -1,7 +1,7 @@
 <ui version="4.0" >
  <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/uiloader/baseline/tabbedbrowser.ui b/tests/auto/uiloader/baseline/tabbedbrowser.ui
index 1bf3851..f7b5d0b 100644
--- a/tests/auto/uiloader/baseline/tabbedbrowser.ui
+++ b/tests/auto/uiloader/baseline/tabbedbrowser.ui
@@ -2,7 +2,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/uiloader/baseline/tablewidgeteditor.ui b/tests/auto/uiloader/baseline/tablewidgeteditor.ui
index c60910e..44c7108 100644
--- a/tests/auto/uiloader/baseline/tablewidgeteditor.ui
+++ b/tests/auto/uiloader/baseline/tablewidgeteditor.ui
@@ -1,7 +1,7 @@
 <ui version="4.0" >
  <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/uiloader/baseline/translatedialog.ui b/tests/auto/uiloader/baseline/translatedialog.ui
index 3b28066..49e11e1 100644
--- a/tests/auto/uiloader/baseline/translatedialog.ui
+++ b/tests/auto/uiloader/baseline/translatedialog.ui
@@ -1,7 +1,7 @@
 <ui version="4.0" >
  <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/uiloader/baseline/treewidgeteditor.ui b/tests/auto/uiloader/baseline/treewidgeteditor.ui
index 04a6c61..8c8b095 100644
--- a/tests/auto/uiloader/baseline/treewidgeteditor.ui
+++ b/tests/auto/uiloader/baseline/treewidgeteditor.ui
@@ -1,7 +1,7 @@
 <ui version="4.0" >
  <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/uiloader/baseline/trpreviewtool.ui b/tests/auto/uiloader/baseline/trpreviewtool.ui
index 51a0048..ba99df9 100644
--- a/tests/auto/uiloader/baseline/trpreviewtool.ui
+++ b/tests/auto/uiloader/baseline/trpreviewtool.ui
@@ -2,7 +2,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/uiloader/tst_screenshot/main.cpp b/tests/auto/uiloader/tst_screenshot/main.cpp
index 2af6a28..c8a036a 100644
--- a/tests/auto/uiloader/tst_screenshot/main.cpp
+++ b/tests/auto/uiloader/tst_screenshot/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/tests/auto/uiloader/uiloader/tst_uiloader.cpp b/tests/auto/uiloader/uiloader/tst_uiloader.cpp
index cf1f886..d5dcb23 100644
--- a/tests/auto/uiloader/uiloader/tst_uiloader.cpp
+++ b/tests/auto/uiloader/uiloader/tst_uiloader.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/tests/auto/uiloader/uiloader/uiloader.cpp b/tests/auto/uiloader/uiloader/uiloader.cpp
index 70085b2..c2500c7 100644
--- a/tests/auto/uiloader/uiloader/uiloader.cpp
+++ b/tests/auto/uiloader/uiloader/uiloader.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/tests/auto/uiloader/uiloader/uiloader.h b/tests/auto/uiloader/uiloader/uiloader.h
index d6f12de..e1d3868 100644
--- a/tests/auto/uiloader/uiloader/uiloader.h
+++ b/tests/auto/uiloader/uiloader/uiloader.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **