diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-03-20 23:30:31 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-20 23:30:31 +0100 |
commit | e5a11fbb3251a98fafd6bebf0b6fc366acb19088 (patch) | |
tree | 8e1bd6704205307e0a23484221ea1bb67a9f411e /tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.cpp | |
parent | 0646d1131b4bc65cdd9af29f4ce00fdd2398a3df (diff) | |
parent | 76c0be34cd4ff4564693162fa7528463e23ce9d8 (diff) |
Merge "Merge branch 'dev' into stable" into refs/staging/stable
Diffstat (limited to 'tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.cpp')
-rw-r--r-- | tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.cpp b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.cpp index 13713940c8..d68d7f799f 100644 --- a/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.cpp +++ b/tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.cpp @@ -45,7 +45,7 @@ #include "iconitem.h" -IconItem::IconItem(const QString &filename, QGraphicsItem *parent) +IconItem::IconItem(const QString &filename, QGraphicsItem *parent) : GvbWidget(parent) , m_filename(filename) , m_rotation(0.0) @@ -79,7 +79,7 @@ void IconItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, painter->drawPixmap(0,0, m_pixmap); } -QSizeF IconItem::sizeHint(Qt::SizeHint which, +QSizeF IconItem::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const { switch (which) @@ -144,7 +144,7 @@ void IconItem::setOpacityEffectEnabled(const bool enable) gradient.setColorAt(0.0, QColor(0,0,0, 255)); gradient.setColorAt(0.46, QColor(0,0,0, 255)); gradient.setColorAt(0.62, QColor(0,0,0, 0)); - + m_opacityEffect = new QGraphicsOpacityEffect; m_opacityEffect->setOpacityMask(gradient); m_opacityEffect->setOpacity(1.0); |