diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2014-01-06 10:38:48 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-06 10:26:36 +0100 |
| commit | ef85e412310fd155508031021c57eedfa5622e83 (patch) | |
| tree | c55a9b1532b92cc6cf7197185a12cb95994ec1ea /src/imports/contacts/filters/qdeclarativecontactdetailrangefilter_p.h | |
| parent | 75d049f770f86e156e0249f0aa4fad0f2d98e56c (diff) | |
Move the declarative bindings out of the module namespace
This fixes a broken types in QML (the typical error from engine is like
"QMetaProperty::read: Unable to handle unregistered datatype
'QDeclarativeOrganizerItemType::ItemType' for
property 'QtOrganizer::QDeclarativeOrganizerEvent::itemType")
This reverts 75d049f770f86 and magically fixes related issues missed in it.
Task-number: QTBUG-35276
Change-Id: I792cf2bb3ff8f5ea7b59438ddf3107009eb2bc63
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/imports/contacts/filters/qdeclarativecontactdetailrangefilter_p.h')
| -rw-r--r-- | src/imports/contacts/filters/qdeclarativecontactdetailrangefilter_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/imports/contacts/filters/qdeclarativecontactdetailrangefilter_p.h b/src/imports/contacts/filters/qdeclarativecontactdetailrangefilter_p.h index 7032e43ef..71246a188 100644 --- a/src/imports/contacts/filters/qdeclarativecontactdetailrangefilter_p.h +++ b/src/imports/contacts/filters/qdeclarativecontactdetailrangefilter_p.h @@ -47,12 +47,14 @@ #include "qdeclarativecontactdetail_p.h" #include <QQmlParserStatus> -QT_BEGIN_NAMESPACE_CONTACTS +QTCONTACTS_USE_NAMESPACE + +QT_BEGIN_NAMESPACE class QDeclarativeContactDetailRangeFilter : public QDeclarativeContactFilter, public QQmlParserStatus { Q_OBJECT - Q_PROPERTY(QtContacts::QDeclarativeContactDetail::DetailType detail READ detail WRITE setDetail NOTIFY valueChanged) + Q_PROPERTY(QDeclarativeContactDetail::DetailType detail READ detail WRITE setDetail NOTIFY valueChanged) Q_PROPERTY(int field READ field WRITE setField NOTIFY valueChanged) Q_PROPERTY(QVariant min READ minValue WRITE setMinValue NOTIFY valueChanged) Q_PROPERTY(QVariant max READ maxValue WRITE setMaxValue NOTIFY valueChanged) @@ -178,10 +180,8 @@ private: QContactDetailRangeFilter d; }; +QT_END_NAMESPACE - -QT_END_NAMESPACE_CONTACTS - -QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactDetailRangeFilter)) +QML_DECLARE_TYPE(QDeclarativeContactDetailRangeFilter) #endif |