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

* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
  Merge request: 1111
  Doc: inform better about how you can tweak Qt apps on Mac
  Mac: add support for closing dialogs using Cmd-D
  Cocoa: use mouse location from event
  Cocoa: implement eventdispatcher flag excludeUserInputEvents
  Cocoa: processEvents does not always send posted events
  Added QMdiArea::tabsMovable and tabsClosable
  Enable the widthForHeight() test case.
  Fix some wrong tests in heightForWidth()
  Fix and enable the tests that were disabled.
  Fixed a double selection in QFileDialog when saving
  fix qFadeEffect windowOpacity issue on Windows
  Cleanup unused QAccessWidget
  Fixed a problem with toolbars not relayouting
  Compile fix on solaris
  Autotest illustrating Qt::InitialSortOrderRole
  Mention when the role was introduced
  Add a way to set QHeaderView initial sort order
  Doc: Fixing typo

1 files changed, 1 insertions, 1 deletions

diff --git a/src/gui/graphicsview/qgridlayoutengine.cpp b/src/gui/graphicsview/qgridlayoutengine.cpp
index 375c723..b8586ce 100644
--- a/src/gui/graphicsview/qgridlayoutengine.cpp
+++ b/src/gui/graphicsview/qgridlayoutengine.cpp
@@ -1175,7 +1175,7 @@ QSizeF QGridLayoutEngine::sizeHint(const QLayoutStyleInfo &styleInfo, Qt::SizeHi
                 //constraints to find the column widths
                 q_rowData.calculateGeometries(0, rowCount(), height, sizehint_yy.data(), sizehint_heights.data(),
                         0, sizehint_totalBoxes[Ver], q_infos[Ver]);
-                ensureColumnAndRowData(&q_columnData, &sizehint_totalBoxes[Hor], styleInfo, sizehint_yy.data(), sizehint_heights.data(), Qt::Vertical);
+                ensureColumnAndRowData(&q_columnData, &sizehint_totalBoxes[Hor], styleInfo, sizehint_yy.data(), sizehint_heights.data(), Qt::Horizontal);
                 sizeHintCalculated = true;
             }
         }