1 files changed, 32 insertions, 23 deletions

diff --git a/src/widgets/graphicsview/qgraphicsgridlayout.cpp b/src/widgets/graphicsview/qgraphicsgridlayout.cpp
index 6d9dd98839..0ecb4af6bd 100644
--- a/src/widgets/graphicsview/qgraphicsgridlayout.cpp
+++ b/src/widgets/graphicsview/qgraphicsgridlayout.cpp
@@ -89,30 +89,35 @@
 #include "qgraphicslayoutitem.h"
 #include "qgraphicsgridlayout.h"
 #include "qgraphicswidget.h"
-#include "qgridlayoutengine_p.h"
-#include <QtCore/qdebug.h>
+#include "qgraphicsgridlayoutengine_p.h"
+#include "qgraphicslayoutstyleinfo_p.h"
+#ifdef QT_DEBUG
+# include <QtCore/qdebug.h>
+#endif
 
 QT_BEGIN_NAMESPACE
 
 class QGraphicsGridLayoutPrivate : public QGraphicsLayoutPrivate
 {
 public:
-    QGraphicsGridLayoutPrivate() { }
-    QLayoutStyleInfo styleInfo() const;
+    QGraphicsGridLayoutPrivate(): m_styleInfo(0) { }
+    QGraphicsLayoutStyleInfo *styleInfo() const;
 
-    QGridLayoutEngine engine;
-#ifdef QT_DEBUG
+    mutable QGraphicsLayoutStyleInfo *m_styleInfo;
+    QGraphicsGridLayoutEngine engine;
+
+#ifdef QGRIDLAYOUTENGINE_DEBUG
     void dump(int indent) const;
 #endif
 };
 
-Q_GLOBAL_STATIC(QWidget, globalStyleInfoWidget);
 
-QLayoutStyleInfo QGraphicsGridLayoutPrivate::styleInfo() const
+QGraphicsLayoutStyleInfo *QGraphicsGridLayoutPrivate::styleInfo() const
 {
-    QGraphicsItem *item = parentItem();
-    QStyle *style = (item && item->isWidget()) ? static_cast<QGraphicsWidget*>(item)->style() : QApplication::style();
-    return QLayoutStyleInfo(style, globalStyleInfoWidget());
+    if (!m_styleInfo)
+        m_styleInfo = new QGraphicsLayoutStyleInfo(this);
+    m_styleInfo->updateChanged(QAbstractLayoutStyleInfo::Unknown);
+    return m_styleInfo;
 }
 
 /*!
@@ -172,7 +177,8 @@ void QGraphicsGridLayout::addItem(QGraphicsLayoutItem *item, int row, int column
 
     d->addChildLayoutItem(item);
 
-    new QGridLayoutItem(&d->engine, item, row, column, rowSpan, columnSpan, alignment);
+    QGraphicsGridLayoutEngineItem *gridEngineItem = new QGraphicsGridLayoutEngineItem(item, row, column, rowSpan, columnSpan, alignment);
+    d->engine.insertItem(gridEngineItem, -1);
     invalidate();
 }
 
@@ -199,7 +205,7 @@ void QGraphicsGridLayout::setHorizontalSpacing(qreal spacing)
 qreal QGraphicsGridLayout::horizontalSpacing() const
 {
     Q_D(const QGraphicsGridLayout);
-    return d->engine.spacing(d->styleInfo(), Qt::Horizontal);
+    return d->engine.spacing(Qt::Horizontal, d->styleInfo());
 }
 
 /*!
@@ -218,7 +224,7 @@ void QGraphicsGridLayout::setVerticalSpacing(qreal spacing)
 qreal QGraphicsGridLayout::verticalSpacing() const
 {
     Q_D(const QGraphicsGridLayout);
-    return d->engine.spacing(d->styleInfo(), Qt::Vertical);
+    return d->engine.spacing(Qt::Vertical, d->styleInfo());
 }
 
 /*!
@@ -535,8 +541,8 @@ QGraphicsLayoutItem *QGraphicsGridLayout::itemAt(int row, int column) const
         qWarning("QGraphicsGridLayout::itemAt: invalid row, column %d, %d", row, column);
         return 0;
     }
-    if (QGridLayoutItem *item = d->engine.itemAt(row, column))
-        return item->layoutItem();
+    if (QGraphicsGridLayoutEngineItem *engineItem = static_cast<QGraphicsGridLayoutEngineItem*>(d->engine.itemAt(row, column)))
+        return engineItem->layoutItem();
     return 0;
 }
 
@@ -561,8 +567,8 @@ QGraphicsLayoutItem *QGraphicsGridLayout::itemAt(int index) const
         return 0;
     }
     QGraphicsLayoutItem *item = 0;
-    if (QGridLayoutItem *gridItem = d->engine.itemAt(index))
-        item = gridItem->layoutItem();
+    if (QGraphicsGridLayoutEngineItem *engineItem = static_cast<QGraphicsGridLayoutEngineItem*>(d->engine.itemAt(index)))
+        item = engineItem->layoutItem();
     return item;
 }
 
@@ -579,7 +585,8 @@ void QGraphicsGridLayout::removeAt(int index)
         qWarning("QGraphicsGridLayout::removeAt: invalid index %d", index);
         return;
     }
-    if (QGridLayoutItem *gridItem = d->engine.itemAt(index)) {
+
+    if (QGraphicsGridLayoutEngineItem *gridItem = static_cast<QGraphicsGridLayoutEngineItem*>(d->engine.itemAt(index))) {
         if (QGraphicsLayoutItem *layoutItem = gridItem->layoutItem())
             layoutItem->setParentLayoutItem(0);
         d->engine.removeItem(gridItem);
@@ -619,10 +626,12 @@ void QGraphicsGridLayout::invalidate()
 {
     Q_D(QGraphicsGridLayout);
     d->engine.invalidate();
+    if (d->m_styleInfo)
+        d->m_styleInfo->invalidate();
     QGraphicsLayout::invalidate();
 }
 
-#ifdef QT_DEBUG
+#ifdef QGRIDLAYOUTENGINE_DEBUG
 void QGraphicsGridLayoutPrivate::dump(int indent) const
 {
     if (qt_graphicsLayoutDebug()) {
@@ -646,8 +655,8 @@ void QGraphicsGridLayout::setGeometry(const QRectF &rect)
     if (visualDir == Qt::RightToLeft)
         qSwap(left, right);
     effectiveRect.adjust(+left, +top, -right, -bottom);
-    d->engine.setGeometries(d->styleInfo(), effectiveRect);
-#ifdef QT_DEBUG
+    d->engine.setGeometries(effectiveRect, d->styleInfo());
+#ifdef QGRIDLAYOUTENGINE_DEBUG
     if (qt_graphicsLayoutDebug()) {
         static int counter = 0;
         qDebug("==== BEGIN DUMP OF QGraphicsGridLayout (%d)====", counter++);
@@ -666,7 +675,7 @@ QSizeF QGraphicsGridLayout::sizeHint(Qt::SizeHint which, const QSizeF &constrain
     qreal left, top, right, bottom;
     getContentsMargins(&left, &top, &right, &bottom);
     const QSizeF extraMargins(left + right, top + bottom);
-    return d->engine.sizeHint(d->styleInfo(), which , constraint - extraMargins) + extraMargins;
+    return d->engine.sizeHint(which , constraint - extraMargins, d->styleInfo()) + extraMargins;
 }