Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (24 commits)
  rebuild configure
  fix misleading uppercasing deprecation warning
  Enable Phonon on Symbian by default.
  Disable OpenGL on Symbian only by default instead of always
  VFP type on ARM option in Linux configure script
  Adding -dont-process option to Unix configure script
  Synchronized configure.exe OpenGL options with Unix configure
  build lrelease as part of the "libs" part.
  QGraphicsLayoutItem - fix invalidating sizehint-with-constraints cache
  purge vestiges of imageformat-plugins
  Unify epocroot usage in createpackage and patch_capabilities scripts
  Update visual tests for the recent qmlviewer change
  Fix integer overflow in bitfield
  Do not use openGL on Mac OS X for QML visual tests
  Give qmlviewer a minimum size if root object has no size.
  Add 'Writing New Components' docs, and document the connect() function.
  Mention that image providers should be added before loading QML files
  Update QML visual tests
  Cleaned up sis_targets.prf
  Append qml import path individually for each available drive on Symbian
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/src/gui/graphicsview/qgridlayoutengine_p.h b/src/gui/graphicsview/qgridlayoutengine_p.h
index 44efbba..1b2e2ec 100644
--- a/src/gui/graphicsview/qgridlayoutengine_p.h
+++ b/src/gui/graphicsview/qgridlayoutengine_p.h
@@ -433,7 +433,7 @@ private:
     // Lazily computed from the above user input
     mutable int q_cachedEffectiveFirstRows[NOrientations];
     mutable int q_cachedEffectiveLastRows[NOrientations];
-    mutable quint8 q_cachedConstraintOrientation : 2;
+    mutable quint8 q_cachedConstraintOrientation : 3;
 
     // Layout item input
     mutable QLayoutStyleInfo q_cachedDataForStyleInfo;