Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (31 commits)
  SSL: give protocol enum SecureProtocols an own value
  QMAKE: Fix post build events for VS2010
  SSL backend: avoid setting SNI hostname for old SSL versions
  SSL: Switch default version to TlsV1SslV3 (i.e. use TLS 1 or SSL 3)
  SSL: introduce new option TlsV1SslV3 for SSL communication
  Mac Style: Compile Fix
  Mac: Center the Window title on Cocoa.
  Fix corner of scroll area so it is stylable on Mac.
  QNAM HTTP: Pair channels with requests at a later state.
  tst_qnetworkreply: fix MiniHttpServer crash
  Windows: Activate the context menu on tray icons when shown.
  SSL backend: check at runtime for the right OpenSSL version for SNI
  QNAM HTTP: Fix the ioPostToHttpFromSocket auto test
  Disable capabilities example for symbian-gcce due to a bug in elf2e32
  Fixed documentation for QByteArray
  Improve handling QByteArray with QStringBuilder
  Do not handle posted events in QSplashScreen.
  SSL tests: Be more verbose in on-demand cert test
  Fix qstringbuilder test.
  Wrap qPrintable inside QString
  ...

1 files changed, 1 insertions, 0 deletions

diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp
index b630502..a5837cb 100644
--- a/src/corelib/io/qtextstream.cpp
+++ b/src/corelib/io/qtextstream.cpp
@@ -1264,6 +1264,7 @@ qint64 QTextStream::pos() const
                 return qint64(-1);
         }
         thatd->readBufferOffset = oldReadBufferOffset;
+        thatd->readConverterSavedStateOffset = 0;
 
         // Return the device position.
         return d->device->pos();