Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Sat, 9 Jan 2010 08:39:29 +0000 (09:39 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Sat, 9 Jan 2010 08:39:29 +0000 (09:39 +0100)
commit83d9dc81898d1e5b2cfe01f12c6e4c5a04a04a56
treeea73e67dc8b9d9be09337cf717665ab00dfb182a
parentec82a2e2c596fd623c58a4a003dd2e7603931993
parent148401f3a1b8f9203c3f45465f0ec29fefcd61d3
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 )
  ...
14 files changed:
demos/qmediaplayer/mediaplayer.cpp
demos/qmediaplayer/mediaplayer.h
doc/src/platforms/symbian-introduction.qdoc
qmake/generators/symbian/symmake.cpp
src/corelib/global/qnamespace.h
src/corelib/global/qnamespace.qdoc
src/gui/dialogs/qdialog.cpp
src/gui/kernel/qapplication_s60.cpp
src/gui/kernel/qsoftkeymanager.cpp
src/gui/painting/qpaintengine_s60.cpp
src/gui/s60framework/qs60mainappui.cpp
tests/auto/qapplication/tst_qapplication.cpp
tools/runonphone/main.cpp
tools/runonphone/serenum_win.cpp