summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-03-04 23:15:19 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-03-04 23:15:19 (GMT)
commit38ff49e632da2bd61ac5fb59f57f62208c2687fd (patch)
tree0eb6338d005b73ca0eda58378f719c38dc7a2fd5
parent2701b8389eb9cfbdd65b87b00e5406187c57b297 (diff)
downloadQt-38ff49e632da2bd61ac5fb59f57f62208c2687fd.zip
Qt-38ff49e632da2bd61ac5fb59f57f62208c2687fd.tar.gz
Qt-38ff49e632da2bd61ac5fb59f57f62208c2687fd.tar.bz2
MouseRegion is dead. Long live MouseArea.
-rw-r--r--src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp1
-rw-r--r--src/multimedia/effects/qsoundeffect.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
index e0ae2eb..25660f8 100644
--- a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
@@ -106,7 +106,6 @@ void QDeclarativeItemModule::defineModule()
QML_REGISTER_TYPE(Qt,4,6,LayoutItem,QDeclarativeLayoutItem);
QML_REGISTER_TYPE(Qt,4,6,ListView,QDeclarativeListView);
QML_REGISTER_TYPE(Qt,4,6,Loader,QDeclarativeLoader);
- QML_REGISTER_TYPE(Qt,4,6,MouseRegion,QDeclarativeMouseArea);
QML_REGISTER_TYPE(Qt,4,6,MouseArea,QDeclarativeMouseArea);
QML_REGISTER_TYPE(Qt,4,6,Opacity,QGraphicsOpacityEffect);
QML_REGISTER_TYPE(Qt,4,6,ParticleMotion,QDeclarativeParticleMotion);
diff --git a/src/multimedia/effects/qsoundeffect.cpp b/src/multimedia/effects/qsoundeffect.cpp
index 541e6c9..2694023 100644
--- a/src/multimedia/effects/qsoundeffect.cpp
+++ b/src/multimedia/effects/qsoundeffect.cpp
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
id: playSound
source: "test.wav"
}
- MouseRegion {
+ MouseArea {
id: playArea
anchors.fill: parent
onPressed: {