summaryrefslogtreecommitdiffstats
path: root/src/declarative/fx/qfxmouseregion.cpp
diff options
context:
space:
mode:
authorRoberto Raggi <roberto.raggi@nokia.com>2009-04-27 06:52:38 (GMT)
committerRoberto Raggi <roberto.raggi@nokia.com>2009-04-27 06:52:38 (GMT)
commit6ed9a0b6344cfd0fd9c27f6a69f15b4e709f97eb (patch)
tree68d6c4928dbd91d50e08b5b9d09a1178dffad092 /src/declarative/fx/qfxmouseregion.cpp
parent5d8ce4c43c3c2816cd5dca03ddd429f26b96d34d (diff)
parent7e94543a9b013b6b1140137ba64406b74a363afc (diff)
downloadQt-6ed9a0b6344cfd0fd9c27f6a69f15b4e709f97eb.zip
Qt-6ed9a0b6344cfd0fd9c27f6a69f15b4e709f97eb.tar.gz
Qt-6ed9a0b6344cfd0fd9c27f6a69f15b4e709f97eb.tar.bz2
Merge branch 'kinetic-declarativeui' of git://scm.dev.nokia.troll.no/qt/kinetic into kinetic-declarativeui-qfx
Diffstat (limited to 'src/declarative/fx/qfxmouseregion.cpp')
-rw-r--r--src/declarative/fx/qfxmouseregion.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/fx/qfxmouseregion.cpp b/src/declarative/fx/qfxmouseregion.cpp
index c6a7f96..0af3cea 100644
--- a/src/declarative/fx/qfxmouseregion.cpp
+++ b/src/declarative/fx/qfxmouseregion.cpp
@@ -315,7 +315,8 @@ void QFxMouseRegionPrivate::bindButtonValue(Qt::MouseButton b)
default:
bString = QLatin1String("None"); break;
}
- q->itemContext()->setContextProperty(QLatin1String("mouseButton"), bString);
+ // ### is this needed anymore?
+ qmlContext(q)->setContextProperty(QLatin1String("mouseButton"), bString);
}
void QFxMouseRegion::mousePressEvent(QGraphicsSceneMouseEvent *event)