diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-02-05 01:13:24 (GMT) |
|---|---|---|
| committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-02-05 01:13:24 (GMT) |
| commit | 5fae580d87add7fab16a9bda20bcc5e42df02879 (patch) | |
| tree | 150f1c7c7d1d0c63679115c1f2e9e42b3b05e09f /src/multimedia | |
| parent | e6c91eacfefcaf9cab83f5cb82d1487b8a870117 (diff) | |
| download | Qt-5fae580d87add7fab16a9bda20bcc5e42df02879.zip Qt-5fae580d87add7fab16a9bda20bcc5e42df02879.tar.gz Qt-5fae580d87add7fab16a9bda20bcc5e42df02879.tar.bz2 | |
Don't emit the metaDataChanged signal twice on a meta-data write.
The QMetaDataControl implementation will emeit the changed signal
when appropriate, so it's not necessary to emit it in
QMetaDataControlMetaObject as well.
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/qml/qmetadatacontrolmetaobject.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/multimedia/qml/qmetadatacontrolmetaobject.cpp b/src/multimedia/qml/qmetadatacontrolmetaobject.cpp index 6b0164b..c4b2b42 100644 --- a/src/multimedia/qml/qmetadatacontrolmetaobject.cpp +++ b/src/multimedia/qml/qmetadatacontrolmetaobject.cpp @@ -213,8 +213,8 @@ namespace QMetaDataControlMetaObject::QMetaDataControlMetaObject(QMetaDataControl *control, QObject *object) : m_control(control) , m_object(object) - , m_data(0) , m_string(0) + , m_data(0) , m_propertyOffset(0) , m_signalOffset(0) { @@ -343,8 +343,6 @@ int QMetaDataControlMetaObject::metaCall(QMetaObject::Call c, int id, void **a) m_control->setMetaData(qt_metaDataKeys[propId].key, *reinterpret_cast<QVariant *>(a[0])); - activate(m_object, m_signalOffset, 0); - return -1; } else { return m_object->qt_metacall(c, id, a); |