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

15 files changed, 15 insertions, 15 deletions

diff --git a/tools/installer/nsis/confirmpage.ini b/tools/installer/nsis/confirmpage.ini
index 21e1e87..b42132c 100644
--- a/tools/installer/nsis/confirmpage.ini
+++ b/tools/installer/nsis/confirmpage.ini
@@ -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/tools/installer/nsis/gwdownload.ini b/tools/installer/nsis/gwdownload.ini
index 5eb1540..c139aaf 100644
--- a/tools/installer/nsis/gwdownload.ini
+++ b/tools/installer/nsis/gwdownload.ini
@@ -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/tools/installer/nsis/gwmirror.ini b/tools/installer/nsis/gwmirror.ini
index 2c3b182..e246080 100644
--- a/tools/installer/nsis/gwmirror.ini
+++ b/tools/installer/nsis/gwmirror.ini
@@ -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/tools/installer/nsis/includes/global.nsh b/tools/installer/nsis/includes/global.nsh
index 31022ef..d91a039 100644
--- a/tools/installer/nsis/includes/global.nsh
+++ b/tools/installer/nsis/includes/global.nsh
@@ -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/tools/installer/nsis/includes/instdir.nsh b/tools/installer/nsis/includes/instdir.nsh
index f42b733..a0957dd 100644
--- a/tools/installer/nsis/includes/instdir.nsh
+++ b/tools/installer/nsis/includes/instdir.nsh
@@ -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/tools/installer/nsis/includes/list.nsh b/tools/installer/nsis/includes/list.nsh
index 486015a..7a2fd0a 100644
--- a/tools/installer/nsis/includes/list.nsh
+++ b/tools/installer/nsis/includes/list.nsh
@@ -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/tools/installer/nsis/includes/qtcommon.nsh b/tools/installer/nsis/includes/qtcommon.nsh
index 3a91e07..a4ec01b 100644
--- a/tools/installer/nsis/includes/qtcommon.nsh
+++ b/tools/installer/nsis/includes/qtcommon.nsh
@@ -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/tools/installer/nsis/includes/qtenv.nsh b/tools/installer/nsis/includes/qtenv.nsh
index fd61810..8a06888 100644
--- a/tools/installer/nsis/includes/qtenv.nsh
+++ b/tools/installer/nsis/includes/qtenv.nsh
@@ -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/tools/installer/nsis/includes/system.nsh b/tools/installer/nsis/includes/system.nsh
index a936c04..3bc5be2 100644
--- a/tools/installer/nsis/includes/system.nsh
+++ b/tools/installer/nsis/includes/system.nsh
@@ -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/tools/installer/nsis/installer.nsi b/tools/installer/nsis/installer.nsi
index fa1294c..af7e9a8 100644
--- a/tools/installer/nsis/installer.nsi
+++ b/tools/installer/nsis/installer.nsi
@@ -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/tools/installer/nsis/modules/environment.nsh b/tools/installer/nsis/modules/environment.nsh
index 889cc42..fa610a7 100644
--- a/tools/installer/nsis/modules/environment.nsh
+++ b/tools/installer/nsis/modules/environment.nsh
@@ -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/tools/installer/nsis/modules/mingw.nsh b/tools/installer/nsis/modules/mingw.nsh
index 42d0340..8694790 100644
--- a/tools/installer/nsis/modules/mingw.nsh
+++ b/tools/installer/nsis/modules/mingw.nsh
@@ -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/tools/installer/nsis/modules/opensource.nsh b/tools/installer/nsis/modules/opensource.nsh
index 8371975..fbd6ef7 100644
--- a/tools/installer/nsis/modules/opensource.nsh
+++ b/tools/installer/nsis/modules/opensource.nsh
@@ -1,5 +1,5 @@
 ;;
-;; Copyright (C) 2009 Nokia Corporation and/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/tools/installer/nsis/modules/registeruiext.nsh b/tools/installer/nsis/modules/registeruiext.nsh
index 706a2ce..f895bde 100644
--- a/tools/installer/nsis/modules/registeruiext.nsh
+++ b/tools/installer/nsis/modules/registeruiext.nsh
@@ -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/tools/installer/nsis/opensource.ini b/tools/installer/nsis/opensource.ini
index 67200ca..4ce40bf 100644
--- a/tools/installer/nsis/opensource.ini
+++ b/tools/installer/nsis/opensource.ini
@@ -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)
 ;;