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

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (37 commits)
  Small fix in iteviews for sizeHintForColumn/Row
  Incorrect assertion in item views
  Track the GL DCs we use across different threads under Windows.
  Add copyright header
  Avoid static local QHash
  Remove explicit 'virtual' specifiers to conform to Qt coding standard
  Use Q_ASSERT_X() rather than Q_ASSERT(!"message") idiom
  Add eglnullws QScreen driver
  Fixes the double spinbox not updating geometry when suffix is changed
  Made QGL2GradientCache thread safe.
  Add QItemSelectionRange::operator<()
  Don't call GetDC() nedlessly.
  Make QScriptAnalysis fit in two bytes again
  QGLPixelBuffer should not rely on temporary QGLWidgets.
  Initialize pex.
  Remove warning.
  Fix the tests for the internal GL resource system.
  Rework how QGLTextureGlyphCache makes use of the resource system.
  The group pointer should no longer be a part of the 64 bit int.
  Enable glyph uploads from a thread in the X11 font engine.
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h
index 7270efb..407cf7d 100644
--- a/src/gui/text/qtextengine_p.h
+++ b/src/gui/text/qtextengine_p.h
@@ -128,7 +128,7 @@ struct Q_AUTOTEST_EXPORT QScriptAnalysis
         TabOrObject = Tab,
         Object = 7
     };
-    unsigned short script    : 8;
+    unsigned short script    : 7;
     unsigned short bidiLevel : 6;  // Unicode Bidi algorithm embedding level (0-61)
     unsigned short flags     : 3;
     inline bool operator == (const QScriptAnalysis &other) const {