diff -r 5dc02b23752f -r 3e2da88830cd src/gui/graphicsview/qgraphicslinearlayout.cpp --- a/src/gui/graphicsview/qgraphicslinearlayout.cpp Tue Jul 06 15:10:48 2010 +0300 +++ b/src/gui/graphicsview/qgraphicslinearlayout.cpp Wed Aug 18 10:37:55 2010 +0300 @@ -147,7 +147,7 @@ { int index = gridItem->firstRow(orientation); engine.removeItem(gridItem); - engine.removeRow(index, orientation); + engine.removeRows(index, 1, orientation); } void QGraphicsLinearLayoutPrivate::fixIndex(int *index) const @@ -171,14 +171,13 @@ return int(qMin(uint(index), uint(engine.columnCount()))); } +Q_GLOBAL_STATIC(QWidget, globalStyleInfoWidget) + QLayoutStyleInfo QGraphicsLinearLayoutPrivate::styleInfo() const { - static QWidget *wid = 0; - if (!wid) - wid = new QWidget; QGraphicsItem *item = parentItem(); QStyle *style = (item && item->isWidget()) ? static_cast(item)->style() : QApplication::style(); - return QLayoutStyleInfo(style, wid); + return QLayoutStyleInfo(style, globalStyleInfoWidget()); } /*!