diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-20 19:45:38 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-20 19:46:19 +0200 |
| commit | d671acd5b296b83440db9836a92189c501c87ff3 (patch) | |
| tree | bd9c1a000e17c70124c207666cfb3276b5518ffd /tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.cpp | |
| parent | 42f5786104f9eef9542df2c7469a03324978281d (diff) | |
| parent | 4f2138ecfbdc58e5cb5b0c7d762197ef69752957 (diff) | |
Merge remote branch 'staging/master' into refactor
Conflicts:
src/opengl/qgl_qpa.cpp
src/plugins/platforms/glxconvenience/qglxconvenience.cpp
src/plugins/platforms/platforms.pro
src/plugins/platforms/wayland/qwaylandwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.h
src/plugins/platforms/xcb/qxcbwindowsurface.cpp
src/widgets/kernel/qwidget_qpa.cpp
tests/auto/qvariant/tst_qvariant.cpp
Diffstat (limited to 'tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.cpp')
| -rw-r--r-- | tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.cpp index 2b1e87ccac..3993cc9e28 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.cpp +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.cpp @@ -84,10 +84,8 @@ bool AbstractItemContainer::event(QEvent *e) bool AbstractItemContainer::eventFilter(QObject *obj, QEvent *event) { if (event->type()==QEvent::GraphicsSceneResize && m_itemView) { -#if (QT_VERSION >= 0x040600) const bool caching = m_itemView->listItemCaching(); m_itemView->setListItemCaching(false); -#endif QSizeF s = m_itemView->size(); s.setWidth(s.width()-m_itemView->verticalScrollBar()->size().width()); @@ -96,9 +94,7 @@ bool AbstractItemContainer::eventFilter(QObject *obj, QEvent *event) m_itemView->updateViewContent(); updateItemBuffer(); -#if (QT_VERSION >= 0x040600) m_itemView->setListItemCaching(caching); -#endif } return QGraphicsWidget::eventFilter(obj, event); @@ -373,7 +369,6 @@ void AbstractItemContainer::updateContent() m_items.at(i)->updateItemContents(); } -#if (QT_VERSION >= 0x040600) void AbstractItemContainer::setSubtreeCacheEnabled(bool enabled) { for (int i = 0; i <m_items.count(); ++i) @@ -381,7 +376,6 @@ void AbstractItemContainer::setSubtreeCacheEnabled(bool enabled) if (m_prototype) m_prototype->setSubtreeCacheEnabled(enabled); } -#endif void AbstractItemContainer::setTwoColumns(const bool enabled) { |