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/iconitem.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/iconitem.cpp')
| -rw-r--r-- | tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.cpp index 718c1b8a48..93c3d8acd4 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.cpp +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.cpp @@ -41,10 +41,7 @@ #include <QtGui> #include <QSvgRenderer> - -#if (QT_VERSION >= 0x040600) #include <QGraphicsEffect> -#endif #include "iconitem.h" @@ -52,9 +49,7 @@ IconItem::IconItem(const QString &filename, QGraphicsItem *parent) : GvbWidget(parent) , m_filename(filename) , m_rotation(0.0) -#if (QT_VERSION >= 0x040600) , m_opacityEffect(0) -#endif , m_smoothTransformation(false) { setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); @@ -140,7 +135,6 @@ void IconItem::setFileName(const QString &filename) } } -#if (QT_VERSION >= 0x040600) void IconItem::setOpacityEffectEnabled(const bool enable) { if (!m_opacityEffect) @@ -166,4 +160,3 @@ bool IconItem::isOpacityEffectEnabled() const return false; } -#endif |