diff options
author | Martin Jones <martin.jones@nokia.com> | 2009-04-27 07:41:55 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2009-04-27 07:41:55 (GMT) |
commit | d545dc70c03eca620275658450402f67af166ef0 (patch) | |
tree | 5bc89fe7637e2be90c8bf70a6fb7f2a7e31c6eea /src/declarative/fx/qfxmouseregion.cpp | |
parent | d782ceee4de31bc4a11cd6cdeacc881bd1c118d8 (diff) | |
parent | d62bc81491b4b3ef76d626fd56f736427ee1e20c (diff) | |
download | Qt-d545dc70c03eca620275658450402f67af166ef0.zip Qt-d545dc70c03eca620275658450402f67af166ef0.tar.gz Qt-d545dc70c03eca620275658450402f67af166ef0.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/fx/qfxitem.cpp
Diffstat (limited to 'src/declarative/fx/qfxmouseregion.cpp')
-rw-r--r-- | src/declarative/fx/qfxmouseregion.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/fx/qfxmouseregion.cpp b/src/declarative/fx/qfxmouseregion.cpp index bfd03f7..be56786 100644 --- a/src/declarative/fx/qfxmouseregion.cpp +++ b/src/declarative/fx/qfxmouseregion.cpp @@ -323,7 +323,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) |