diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-04-17 13:54:20 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-09 00:56:16 +0200 |
| commit | c4fab1011b9de42f43a95d598743da505847e139 (patch) | |
| tree | 64ca12106f9a624fcd9bd7dee0ceb8928b77895e /src/qml/qml/qqmlaccessors.cpp | |
| parent | 3b04bbde6356797368114fce1b45b85271e9fed8 (diff) | |
Remove QQmlData::objectNameChanged callback.
The objectName property now has a proper NOTIFY signal. Also
remove the objectName accessor, as it is no longer required.
Task-number: QTBUG-23526
Change-Id: Ib18ba7335bf62a2fe2a9e489cb4c0f1fb142d74c
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlaccessors.cpp')
| -rw-r--r-- | src/qml/qml/qqmlaccessors.cpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/qml/qml/qqmlaccessors.cpp b/src/qml/qml/qqmlaccessors.cpp index ceb4f44789..65d6ccedf7 100644 --- a/src/qml/qml/qqmlaccessors.cpp +++ b/src/qml/qml/qqmlaccessors.cpp @@ -55,20 +55,6 @@ struct AccessorProperties { Q_GLOBAL_STATIC(AccessorProperties, accessorProperties) -QML_PRIVATE_ACCESSOR(QObject, QString, objectName, objectName) - -static void QObject_objectNameNotifier(QObject *object, intptr_t, QQmlNotifier **notifier) -{ - *notifier = QQmlData::get(object, true)->objectNameNotifier(); -} - -static QQmlAccessors QObject_objectName = { QObject_objectNameRead, - QObject_objectNameNotifier }; - -QML_DECLARE_PROPERTIES(QObject) { - { QML_PROPERTY_NAME(objectName), 0, &QObject_objectName } -}; - static void buildNameMask(QQmlAccessorProperties::Properties &properties) { quint32 mask = 0; @@ -85,12 +71,6 @@ static void buildNameMask(QQmlAccessorProperties::Properties &properties) AccessorProperties::AccessorProperties() { - // Pre-seed QObject::objectName accessor - typedef QQmlAccessorProperties::Properties P; - properties.insert(&QObject::staticMetaObject, - P(qqml_accessor_properties_QObject, - sizeof(qqml_accessor_properties_QObject) / - sizeof(QQmlAccessorProperties::Property))); } QQmlAccessorProperties::Properties::Properties(Property *properties, int count) |