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/itemrecyclinglist.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/itemrecyclinglist.cpp')
| -rw-r--r-- | tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.cpp index 06c7b14b19..d5cd877bfb 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.cpp +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.cpp @@ -161,10 +161,8 @@ void ItemRecyclingList::themeChange() // Update icons item->icon(ListItem::LeftIcon)->setRotation(Theme::p()->iconRotation(ListItem::LeftIcon)); item->icon(ListItem::RightIcon)->setRotation(Theme::p()->iconRotation(ListItem::RightIcon)); -#if (QT_VERSION >= 0x040600) item->icon(ListItem::LeftIcon)->setOpacityEffectEnabled(Theme::p()->isIconOpacityEffectEnabled(ListItem::LeftIcon)); item->icon(ListItem::RightIcon)->setOpacityEffectEnabled(Theme::p()->isIconOpacityEffectEnabled(ListItem::RightIcon)); -#endif item->icon(ListItem::LeftIcon)->setSmoothTransformationEnabled(Theme::p()->isIconSmoothTransformationEnabled(ListItem::LeftIcon)); item->icon(ListItem::RightIcon)->setSmoothTransformationEnabled(Theme::p()->isIconSmoothTransformationEnabled(ListItem::RightIcon)); } @@ -208,25 +206,17 @@ void ItemRecyclingList::keyPressEvent(QKeyEvent *event) bool ItemRecyclingList::listItemCaching() const { -#if (QT_VERSION >= 0x040600) ListItemContainer *container = static_cast<ListItemContainer *>(m_container); return container->listItemCaching(); -#else - return false; -#endif } void ItemRecyclingList::setListItemCaching(bool enabled) { -#if (QT_VERSION >= 0x040600) ListItemContainer *container = static_cast<ListItemContainer *>(m_container); container->setListItemCaching(enabled); -#else - Q_UNUSED(enabled) -#endif } void ItemRecyclingList::updateListItemBackgrounds(int index) @@ -255,17 +245,13 @@ void ItemRecyclingList::setTwoColumns(const bool enabled) if (twoColumns() == enabled) return; -#if (QT_VERSION >= 0x040600) const bool caching = listItemCaching(); setListItemCaching(false); -#endif m_container->setTwoColumns(enabled); refreshContainerGeometry(); -#if (QT_VERSION >= 0x040600) setListItemCaching(caching); -#endif } bool ItemRecyclingList::twoColumns() |