Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Compile IPC tests.
  Always call XInitThreads.
  Remove redundant #ifdef's from benchmarks
  Improve coding style of qdatastream test
  Don't use Qt3Support in arthur test suite.
  Remove Qt3Support code from QMenuBar autotest
  Remove Qt3Support code from QSplitter autotest
  Remove Qt3Support code from QSharedPointer autotest
  Remove Qt3Support code from QComboBox autotest
  Remove Qt3Support test code from accessibility autotest
  tests: allow unstable tests to be marked with CONFIG+=insignificant_test

1 files changed, 1 insertions, 6 deletions

diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.h b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.h
index ea9e9a5cc1..29fafb705b 100644
--- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.h
+++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.h
@@ -46,9 +46,7 @@
 
 #include "gvbwidget.h"
 
-#if (QT_VERSION >= 0x040600)
 class QGraphicsOpacityEffect;
-#endif
 class QPainter;
 
 class IconItem : public GvbWidget
@@ -64,10 +62,9 @@ public:
     QString fileName() const;
     void setFileName(const QString &filename);
 
-#if (QT_VERSION >= 0x040600)
     void setOpacityEffectEnabled(const bool enable);
     bool isOpacityEffectEnabled() const;
-#endif
+
     void setRotation(const qreal rotation) { m_rotation = rotation; }
     qreal rotation() const { return m_rotation; }
 
@@ -87,9 +84,7 @@ private:
     QString m_filename;
     QPixmap m_pixmap;
     qreal m_rotation;
-#if (QT_VERSION >= 0x040600)
     QGraphicsOpacityEffect *m_opacityEffect;
-#endif
     bool m_smoothTransformation;
 };