Fixed QML bindings.

Register types in QML without namespace.

Task-number: QTBUG-29830

Change-Id: I03c40750b2b8ad4c079c0ea818e058fd5e0d18fb
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>

45 files changed, 178 insertions, 85 deletions

diff --git a/src/imports/contacts/details/qdeclarativecontactaddress_p.h b/src/imports/contacts/details/qdeclarativecontactaddress_p.h
index 6a3524dfc..28ff89bf6 100644
--- a/src/imports/contacts/details/qdeclarativecontactaddress_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactaddress_p.h
@@ -162,7 +162,10 @@ signals:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactAddress))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactAddress)
+
 
 #endif
 
diff --git a/src/imports/contacts/details/qdeclarativecontactanniversary_p.h b/src/imports/contacts/details/qdeclarativecontactanniversary_p.h
index 8a521b67f..28aed9b67 100644
--- a/src/imports/contacts/details/qdeclarativecontactanniversary_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactanniversary_p.h
@@ -137,6 +137,10 @@ signals:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactAnniversary))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactAnniversary)
+
+
 #endif
 
diff --git a/src/imports/contacts/details/qdeclarativecontactavatar_p.h b/src/imports/contacts/details/qdeclarativecontactavatar_p.h
index feddb3e04..8e83db714 100644
--- a/src/imports/contacts/details/qdeclarativecontactavatar_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactavatar_p.h
@@ -94,6 +94,8 @@ signals:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactAvatar))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactAvatar)
 
 #endif
diff --git a/src/imports/contacts/details/qdeclarativecontactbirthday_p.h b/src/imports/contacts/details/qdeclarativecontactbirthday_p.h
index 3fbd497d3..b102f6aaa 100644
--- a/src/imports/contacts/details/qdeclarativecontactbirthday_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactbirthday_p.h
@@ -83,6 +83,9 @@ signals:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactBirthday))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactBirthday)
+
 #endif
 
diff --git a/src/imports/contacts/details/qdeclarativecontactdisplaylabel_p.h b/src/imports/contacts/details/qdeclarativecontactdisplaylabel_p.h
index 8425bc272..c7d19ac8d 100644
--- a/src/imports/contacts/details/qdeclarativecontactdisplaylabel_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactdisplaylabel_p.h
@@ -87,6 +87,8 @@ signals:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactDisplayLabel))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactDisplayLabel)
 
 #endif
diff --git a/src/imports/contacts/details/qdeclarativecontactemailaddress_p.h b/src/imports/contacts/details/qdeclarativecontactemailaddress_p.h
index c69a2c44d..be4f4e0c7 100644
--- a/src/imports/contacts/details/qdeclarativecontactemailaddress_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactemailaddress_p.h
@@ -84,7 +84,9 @@ signals:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactEmailAddress))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactEmailAddress)
 
 #endif
 
diff --git a/src/imports/contacts/details/qdeclarativecontactextendeddetail_p.h b/src/imports/contacts/details/qdeclarativecontactextendeddetail_p.h
index 07473683d..a052e2262 100644
--- a/src/imports/contacts/details/qdeclarativecontactextendeddetail_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactextendeddetail_p.h
@@ -105,6 +105,8 @@ signals:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactExtendedDetail))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactExtendedDetail)
 
 #endif // QDECLARATIVECONTACTEXTENDEDDETAIL_P_H
diff --git a/src/imports/contacts/details/qdeclarativecontactfamily_p.h b/src/imports/contacts/details/qdeclarativecontactfamily_p.h
index c52d07ad5..a0f72311b 100644
--- a/src/imports/contacts/details/qdeclarativecontactfamily_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactfamily_p.h
@@ -93,7 +93,9 @@ signals:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactFamily))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactFamily)
 
 #endif
 
diff --git a/src/imports/contacts/details/qdeclarativecontactfavorite_p.h b/src/imports/contacts/details/qdeclarativecontactfavorite_p.h
index 48f98b0e8..dcf343d96 100644
--- a/src/imports/contacts/details/qdeclarativecontactfavorite_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactfavorite_p.h
@@ -93,6 +93,8 @@ signals:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactFavorite))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactFavorite)
 
 #endif
diff --git a/src/imports/contacts/details/qdeclarativecontactgender_p.h b/src/imports/contacts/details/qdeclarativecontactgender_p.h
index 8635282fb..1b612bb05 100644
--- a/src/imports/contacts/details/qdeclarativecontactgender_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactgender_p.h
@@ -104,7 +104,9 @@ signals:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactGender))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactGender)
 
 #endif
 
diff --git a/src/imports/contacts/details/qdeclarativecontactgeolocation_p.h b/src/imports/contacts/details/qdeclarativecontactgeolocation_p.h
index d2174eae1..076ff80c5 100644
--- a/src/imports/contacts/details/qdeclarativecontactgeolocation_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactgeolocation_p.h
@@ -165,7 +165,9 @@ signals:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactGeoLocation))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactGeoLocation)
 
 #endif
 
diff --git a/src/imports/contacts/details/qdeclarativecontactglobalpresence_p.h b/src/imports/contacts/details/qdeclarativecontactglobalpresence_p.h
index ea6faf289..292c6578d 100644
--- a/src/imports/contacts/details/qdeclarativecontactglobalpresence_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactglobalpresence_p.h
@@ -140,7 +140,9 @@ signals:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactGlobalPresence))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactGlobalPresence)
 
 #endif
 
diff --git a/src/imports/contacts/details/qdeclarativecontactguid_p.h b/src/imports/contacts/details/qdeclarativecontactguid_p.h
index 2d41490b2..e6ab99961 100644
--- a/src/imports/contacts/details/qdeclarativecontactguid_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactguid_p.h
@@ -84,7 +84,9 @@ signals:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactGuid))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactGuid)
 
 #endif
 
diff --git a/src/imports/contacts/details/qdeclarativecontacthobby_p.h b/src/imports/contacts/details/qdeclarativecontacthobby_p.h
index c8376f05e..041ceac53 100644
--- a/src/imports/contacts/details/qdeclarativecontacthobby_p.h
+++ b/src/imports/contacts/details/qdeclarativecontacthobby_p.h
@@ -84,7 +84,9 @@ signals:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactHobby))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactHobby)
 
 #endif
 
diff --git a/src/imports/contacts/details/qdeclarativecontactname_p.h b/src/imports/contacts/details/qdeclarativecontactname_p.h
index afffd51e9..d59038c37 100644
--- a/src/imports/contacts/details/qdeclarativecontactname_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactname_p.h
@@ -128,6 +128,8 @@ signals:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactName))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactName)
 
 #endif
diff --git a/src/imports/contacts/details/qdeclarativecontactnickname_p.h b/src/imports/contacts/details/qdeclarativecontactnickname_p.h
index e58eca6a2..b8cf0e82b 100644
--- a/src/imports/contacts/details/qdeclarativecontactnickname_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactnickname_p.h
@@ -83,7 +83,9 @@ signals:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactNickname))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactNickname)
 
 #endif
 
diff --git a/src/imports/contacts/details/qdeclarativecontactnote_p.h b/src/imports/contacts/details/qdeclarativecontactnote_p.h
index e28950252..7fd36fa28 100644
--- a/src/imports/contacts/details/qdeclarativecontactnote_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactnote_p.h
@@ -84,7 +84,9 @@ signals:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactNote))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactNote)
 
 #endif
 
diff --git a/src/imports/contacts/details/qdeclarativecontactonlineaccount_p.h b/src/imports/contacts/details/qdeclarativecontactonlineaccount_p.h
index 6e62df812..53ce0ea2c 100644
--- a/src/imports/contacts/details/qdeclarativecontactonlineaccount_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactonlineaccount_p.h
@@ -135,7 +135,9 @@ signals:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactOnlineAccount))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactOnlineAccount)
 
 #endif
 
diff --git a/src/imports/contacts/details/qdeclarativecontactorganization_p.h b/src/imports/contacts/details/qdeclarativecontactorganization_p.h
index c03e32b35..9b9385425 100644
--- a/src/imports/contacts/details/qdeclarativecontactorganization_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactorganization_p.h
@@ -147,6 +147,8 @@ signals:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactOrganization))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactOrganization)
 
 #endif
diff --git a/src/imports/contacts/details/qdeclarativecontactphonenumber_p.h b/src/imports/contacts/details/qdeclarativecontactphonenumber_p.h
index d425d7f2b..97b3659d1 100644
--- a/src/imports/contacts/details/qdeclarativecontactphonenumber_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactphonenumber_p.h
@@ -123,7 +123,9 @@ signals:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactPhoneNumber))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactPhoneNumber)
 
 #endif
 
diff --git a/src/imports/contacts/details/qdeclarativecontactpresence_p.h b/src/imports/contacts/details/qdeclarativecontactpresence_p.h
index 6b23725fd..6e5147217 100644
--- a/src/imports/contacts/details/qdeclarativecontactpresence_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactpresence_p.h
@@ -152,7 +152,9 @@ signals:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactPresence))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactPresence)
 
 #endif
 
diff --git a/src/imports/contacts/details/qdeclarativecontactringtone_p.h b/src/imports/contacts/details/qdeclarativecontactringtone_p.h
index 7f789283d..c9bca68e0 100644
--- a/src/imports/contacts/details/qdeclarativecontactringtone_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactringtone_p.h
@@ -109,6 +109,8 @@ signals:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactRingtone))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactRingtone)
 
 #endif
diff --git a/src/imports/contacts/details/qdeclarativecontactsynctarget_p.h b/src/imports/contacts/details/qdeclarativecontactsynctarget_p.h
index c0228f8f3..6e33aade6 100644
--- a/src/imports/contacts/details/qdeclarativecontactsynctarget_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactsynctarget_p.h
@@ -85,7 +85,9 @@ signals:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactSyncTarget))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactSyncTarget)
 
 #endif
 
diff --git a/src/imports/contacts/details/qdeclarativecontacttag_p.h b/src/imports/contacts/details/qdeclarativecontacttag_p.h
index 0a8e935a7..40d5f38fa 100644
--- a/src/imports/contacts/details/qdeclarativecontacttag_p.h
+++ b/src/imports/contacts/details/qdeclarativecontacttag_p.h
@@ -84,6 +84,8 @@ signals:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactTag))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactTag)
 
 #endif
diff --git a/src/imports/contacts/details/qdeclarativecontacttimestamp_p.h b/src/imports/contacts/details/qdeclarativecontacttimestamp_p.h
index 6d91f5dc8..9d9340424 100644
--- a/src/imports/contacts/details/qdeclarativecontacttimestamp_p.h
+++ b/src/imports/contacts/details/qdeclarativecontacttimestamp_p.h
@@ -93,6 +93,8 @@ signals:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactTimestamp))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactTimestamp)
 
 #endif
diff --git a/src/imports/contacts/details/qdeclarativecontacttype_p.h b/src/imports/contacts/details/qdeclarativecontacttype_p.h
index 0cc6c8bfd..7d6b8433b 100644
--- a/src/imports/contacts/details/qdeclarativecontacttype_p.h
+++ b/src/imports/contacts/details/qdeclarativecontacttype_p.h
@@ -102,7 +102,9 @@ signals:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactType))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactType)
 
 #endif
 
diff --git a/src/imports/contacts/details/qdeclarativecontacturl_p.h b/src/imports/contacts/details/qdeclarativecontacturl_p.h
index 45408297b..9d7999957 100644
--- a/src/imports/contacts/details/qdeclarativecontacturl_p.h
+++ b/src/imports/contacts/details/qdeclarativecontacturl_p.h
@@ -119,7 +119,9 @@ signals:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactUrl))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactUrl)
 
 #endif
 
diff --git a/src/imports/contacts/details/qdeclarativecontactversion_p.h b/src/imports/contacts/details/qdeclarativecontactversion_p.h
index a93e595fe..14890df8f 100644
--- a/src/imports/contacts/details/qdeclarativecontactversion_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactversion_p.h
@@ -101,7 +101,9 @@ signals:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactVersion))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactVersion)
 
 #endif
 
diff --git a/src/imports/contacts/qdeclarativecontact_p.h b/src/imports/contacts/qdeclarativecontact_p.h
index 5538286e6..9abf0d450 100644
--- a/src/imports/contacts/qdeclarativecontact_p.h
+++ b/src/imports/contacts/qdeclarativecontact_p.h
@@ -202,6 +202,8 @@ private:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContact))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContact)
 
 #endif // QDECLARATIVECONTACT_P_H
diff --git a/src/imports/contacts/qdeclarativecontactdetail_p.h b/src/imports/contacts/qdeclarativecontactdetail_p.h
index 24d6c46aa..14465007e 100644
--- a/src/imports/contacts/qdeclarativecontactdetail_p.h
+++ b/src/imports/contacts/qdeclarativecontactdetail_p.h
@@ -144,6 +144,8 @@ public:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactDetail))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactDetail)
 
 #endif // QDECLARATIVECONTACTDETAIL_P_H
diff --git a/src/imports/contacts/qdeclarativecontactfetchhint_p.h b/src/imports/contacts/qdeclarativecontactfetchhint_p.h
index 8a561bb56..3a6cf3fa7 100644
--- a/src/imports/contacts/qdeclarativecontactfetchhint_p.h
+++ b/src/imports/contacts/qdeclarativecontactfetchhint_p.h
@@ -97,6 +97,8 @@ private:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactFetchHint))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactFetchHint)
 
 #endif
diff --git a/src/imports/contacts/qdeclarativecontactfilter_p.h b/src/imports/contacts/qdeclarativecontactfilter_p.h
index d9fe521b6..3f9c91d66 100644
--- a/src/imports/contacts/qdeclarativecontactfilter_p.h
+++ b/src/imports/contacts/qdeclarativecontactfilter_p.h
@@ -125,7 +125,9 @@ protected:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactFilter))
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactCompoundFilter))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactFilter)
+QML_DECLARE_TYPE(QDeclarativeContactCompoundFilter)
 
 #endif
diff --git a/src/imports/contacts/qdeclarativecontactmodel_p.h b/src/imports/contacts/qdeclarativecontactmodel_p.h
index 80e84957b..2860b7cf1 100644
--- a/src/imports/contacts/qdeclarativecontactmodel_p.h
+++ b/src/imports/contacts/qdeclarativecontactmodel_p.h
@@ -209,4 +209,8 @@ private:
 
 QT_END_NAMESPACE_CONTACTS
 
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactModel)
+
 #endif // QDECLARATIVECONTACTMODEL_P_H
diff --git a/src/imports/contacts/qdeclarativecontactrelationship_p.h b/src/imports/contacts/qdeclarativecontactrelationship_p.h
index 60cbcb9b0..f35b8675e 100644
--- a/src/imports/contacts/qdeclarativecontactrelationship_p.h
+++ b/src/imports/contacts/qdeclarativecontactrelationship_p.h
@@ -96,7 +96,9 @@ private:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactRelationship))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactRelationship)
 
 #endif
 
diff --git a/src/imports/contacts/qdeclarativecontactrelationshipmodel_p.h b/src/imports/contacts/qdeclarativecontactrelationshipmodel_p.h
index afecdd80a..564f2efe1 100644
--- a/src/imports/contacts/qdeclarativecontactrelationshipmodel_p.h
+++ b/src/imports/contacts/qdeclarativecontactrelationshipmodel_p.h
@@ -109,6 +109,8 @@ private:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactRelationshipModel))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactRelationshipModel)
 
 #endif // QDECLARATIVECONTACTRELATIONSHIPMODEL_P_H
diff --git a/src/imports/contacts/qdeclarativecontactsortorder_p.h b/src/imports/contacts/qdeclarativecontactsortorder_p.h
index 6960510d1..659b12a4f 100644
--- a/src/imports/contacts/qdeclarativecontactsortorder_p.h
+++ b/src/imports/contacts/qdeclarativecontactsortorder_p.h
@@ -101,6 +101,8 @@ private:
 
 QT_END_NAMESPACE_CONTACTS
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactSortOrder))
+QTCONTACTS_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeContactSortOrder)
 
 #endif
diff --git a/src/imports/organizer/qdeclarativeorganizercollection_p.h b/src/imports/organizer/qdeclarativeorganizercollection_p.h
index 2399d2990..1a90c5b94 100644
--- a/src/imports/organizer/qdeclarativeorganizercollection_p.h
+++ b/src/imports/organizer/qdeclarativeorganizercollection_p.h
@@ -105,6 +105,8 @@ private:
 
 QT_END_NAMESPACE_ORGANIZER
 
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerCollection))
+QTORGANIZER_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeOrganizerCollection)
 
 #endif // QDECLARATIVEORGANIZERCOLLECTION_H
diff --git a/src/imports/organizer/qdeclarativeorganizeritem_p.h b/src/imports/organizer/qdeclarativeorganizeritem_p.h
index f59cfb715..5d275651e 100644
--- a/src/imports/organizer/qdeclarativeorganizeritem_p.h
+++ b/src/imports/organizer/qdeclarativeorganizeritem_p.h
@@ -356,12 +356,14 @@ Q_SIGNALS:
 
 QT_END_NAMESPACE_ORGANIZER
 
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItem))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerEvent))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerEventOccurrence))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerJournal))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerNote))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerTodo))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerTodoOccurrence))
+QTORGANIZER_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeOrganizerItem)
+QML_DECLARE_TYPE(QDeclarativeOrganizerEvent)
+QML_DECLARE_TYPE(QDeclarativeOrganizerEventOccurrence)
+QML_DECLARE_TYPE(QDeclarativeOrganizerJournal)
+QML_DECLARE_TYPE(QDeclarativeOrganizerNote)
+QML_DECLARE_TYPE(QDeclarativeOrganizerTodo)
+QML_DECLARE_TYPE(QDeclarativeOrganizerTodoOccurrence)
 
 #endif // QDECLARATIVEORGANIZERITEM_H
diff --git a/src/imports/organizer/qdeclarativeorganizeritemdetail_p.h b/src/imports/organizer/qdeclarativeorganizeritemdetail_p.h
index 3320fa563..899b6a312 100644
--- a/src/imports/organizer/qdeclarativeorganizeritemdetail_p.h
+++ b/src/imports/organizer/qdeclarativeorganizeritemdetail_p.h
@@ -963,30 +963,32 @@ public:
 
 QT_END_NAMESPACE_ORGANIZER
 
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemDetail))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerEventTime))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemComment))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemDescription))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemDisplayLabel))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemGuid))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemLocation))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemParent))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemPriority))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemRecurrence))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemTag))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemTimestamp))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemType))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerJournalTime))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerTodoProgress))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerTodoTime))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemReminder))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemAudibleReminder))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemEmailReminder))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemVisualReminder))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemExtendedDetail))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerEventAttendee))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerEventRsvp))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemClassification))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemVersion))
+QTORGANIZER_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemDetail)
+QML_DECLARE_TYPE(QDeclarativeOrganizerEventTime)
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemComment)
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemDescription)
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemDisplayLabel)
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemGuid)
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemLocation)
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemParent)
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemPriority)
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemRecurrence)
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemTag)
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemTimestamp)
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemType)
+QML_DECLARE_TYPE(QDeclarativeOrganizerJournalTime)
+QML_DECLARE_TYPE(QDeclarativeOrganizerTodoProgress)
+QML_DECLARE_TYPE(QDeclarativeOrganizerTodoTime)
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemReminder)
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemAudibleReminder)
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemEmailReminder)
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemVisualReminder)
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemExtendedDetail)
+QML_DECLARE_TYPE(QDeclarativeOrganizerEventAttendee)
+QML_DECLARE_TYPE(QDeclarativeOrganizerEventRsvp)
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemClassification)
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemVersion)
 
 #endif // QDECLARATIVEORGANIZERITEMDETAIL_H
diff --git a/src/imports/organizer/qdeclarativeorganizeritemfetchhint_p.h b/src/imports/organizer/qdeclarativeorganizeritemfetchhint_p.h
index 90f6bdbc3..172379b7e 100644
--- a/src/imports/organizer/qdeclarativeorganizeritemfetchhint_p.h
+++ b/src/imports/organizer/qdeclarativeorganizeritemfetchhint_p.h
@@ -81,6 +81,8 @@ private:
 
 QT_END_NAMESPACE_ORGANIZER
 
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemFetchHint))
+QTORGANIZER_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemFetchHint)
 
 #endif // QDECLARATIVEORGANIZERITEMFETCHHINT_H
diff --git a/src/imports/organizer/qdeclarativeorganizeritemfilter_p.h b/src/imports/organizer/qdeclarativeorganizeritemfilter_p.h
index 4e6183312..391094308 100644
--- a/src/imports/organizer/qdeclarativeorganizeritemfilter_p.h
+++ b/src/imports/organizer/qdeclarativeorganizeritemfilter_p.h
@@ -333,15 +333,17 @@ private:
 
 QT_END_NAMESPACE_ORGANIZER
 
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemFilter))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemInvalidFilter))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemCompoundFilter))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemIntersectionFilter))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemUnionFilter))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemCollectionFilter))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemDetailFilter))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemDetailFieldFilter))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemDetailRangeFilter))
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemIdFilter))
+QTORGANIZER_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemFilter)
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemInvalidFilter)
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemCompoundFilter)
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemIntersectionFilter)
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemUnionFilter)
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemCollectionFilter)
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemDetailFilter)
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemDetailFieldFilter)
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemDetailRangeFilter)
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemIdFilter)
 
 #endif // QDECLARATIVEORGANIZERITEMFILTER_P_H
diff --git a/src/imports/organizer/qdeclarativeorganizeritemsortorder_p.h b/src/imports/organizer/qdeclarativeorganizeritemsortorder_p.h
index fc81420a4..d8057411f 100644
--- a/src/imports/organizer/qdeclarativeorganizeritemsortorder_p.h
+++ b/src/imports/organizer/qdeclarativeorganizeritemsortorder_p.h
@@ -104,6 +104,8 @@ private:
 
 QT_END_NAMESPACE_ORGANIZER
 
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerItemSortOrder))
+QTORGANIZER_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeOrganizerItemSortOrder)
 
 #endif // QDECLARATIVEORGANIZERITEMSORTORDER_H
diff --git a/src/imports/organizer/qdeclarativeorganizermodel_p.h b/src/imports/organizer/qdeclarativeorganizermodel_p.h
index f4445ba97..fd1d0b634 100644
--- a/src/imports/organizer/qdeclarativeorganizermodel_p.h
+++ b/src/imports/organizer/qdeclarativeorganizermodel_p.h
@@ -244,4 +244,8 @@ private:
 
 QT_END_NAMESPACE_ORGANIZER
 
+QTORGANIZER_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeOrganizerModel)
+
 #endif // QDECLARATIVEORGANIZERMODEL_H
diff --git a/src/imports/organizer/qdeclarativeorganizerrecurrencerule_p.h b/src/imports/organizer/qdeclarativeorganizerrecurrencerule_p.h
index f624fa123..8b838bc22 100644
--- a/src/imports/organizer/qdeclarativeorganizerrecurrencerule_p.h
+++ b/src/imports/organizer/qdeclarativeorganizerrecurrencerule_p.h
@@ -131,6 +131,8 @@ private:
 
 QT_END_NAMESPACE_ORGANIZER
 
-QML_DECLARE_TYPE(QTORGANIZER_PREPEND_NAMESPACE(QDeclarativeOrganizerRecurrenceRule))
+QTORGANIZER_USE_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativeOrganizerRecurrenceRule)
 
 #endif // QDECLARATIVEORGANIZERITEMRECURRENCERULE_H
diff --git a/src/plugins/organizer/jsondb/qorganizerjsondbengine.cpp b/src/plugins/organizer/jsondb/qorganizerjsondbengine.cpp
index 0befd5663..fabe2b34d 100644
--- a/src/plugins/organizer/jsondb/qorganizerjsondbengine.cpp
+++ b/src/plugins/organizer/jsondb/qorganizerjsondbengine.cpp
@@ -607,6 +607,3 @@ const QList<int> QOrganizerJsonDbEngine::supportedDetailFields(QOrganizerItemDet
 #include "moc_qorganizerjsondbengine.cpp"
 
 QT_END_NAMESPACE_ORGANIZER
-
-Q_DECLARE_METATYPE(QTORGANIZER_PREPEND_NAMESPACE(QOrganizerAbstractRequest::State))
-Q_DECLARE_METATYPE(QList<QTORGANIZER_PREPEND_NAMESPACE(QOrganizerItemId)>)