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>

73 files changed, 313 insertions, 278 deletions

diff --git a/src/imports/contacts/details/qdeclarativecontactaddress_p.h b/src/imports/contacts/details/qdeclarativecontactaddress_p.h
index 28ff89bf6..a048dca75 100644
--- a/src/imports/contacts/details/qdeclarativecontactaddress_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactaddress_p.h
@@ -48,7 +48,9 @@
 
 #include <QSet>
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactAddress : public QDeclarativeContactDetail
 {
@@ -160,9 +162,7 @@ signals:
     void valueChanged();
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactAddress)
 
diff --git a/src/imports/contacts/details/qdeclarativecontactanniversary_p.h b/src/imports/contacts/details/qdeclarativecontactanniversary_p.h
index 28aed9b67..ce9c5159e 100644
--- a/src/imports/contacts/details/qdeclarativecontactanniversary_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactanniversary_p.h
@@ -45,7 +45,9 @@
 #include "qdeclarativecontactdetail_p.h"
 #include "qcontactanniversary.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactAnniversary : public QDeclarativeContactDetail
 {
@@ -135,9 +137,7 @@ signals:
     void valueChanged();
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactAnniversary)
 
diff --git a/src/imports/contacts/details/qdeclarativecontactavatar_p.h b/src/imports/contacts/details/qdeclarativecontactavatar_p.h
index 8e83db714..6d8775039 100644
--- a/src/imports/contacts/details/qdeclarativecontactavatar_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactavatar_p.h
@@ -45,7 +45,9 @@
 #include "qdeclarativecontactdetail_p.h"
 #include "qcontactavatar.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class  QDeclarativeContactAvatar : public QDeclarativeContactDetail
 {
@@ -92,9 +94,7 @@ signals:
 
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactAvatar)
 
diff --git a/src/imports/contacts/details/qdeclarativecontactbirthday_p.h b/src/imports/contacts/details/qdeclarativecontactbirthday_p.h
index b102f6aaa..4af65bf14 100644
--- a/src/imports/contacts/details/qdeclarativecontactbirthday_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactbirthday_p.h
@@ -45,7 +45,9 @@
 #include "qdeclarativecontactdetail_p.h"
 #include "qcontactbirthday.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class  QDeclarativeContactBirthday : public QDeclarativeContactDetail
 {
@@ -81,9 +83,7 @@ signals:
     void valueChanged();
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactBirthday)
 
diff --git a/src/imports/contacts/details/qdeclarativecontactdisplaylabel_p.h b/src/imports/contacts/details/qdeclarativecontactdisplaylabel_p.h
index c7d19ac8d..3e42a749c 100644
--- a/src/imports/contacts/details/qdeclarativecontactdisplaylabel_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactdisplaylabel_p.h
@@ -47,7 +47,9 @@
 #include "qcontactdisplaylabel.h"
 #include <QDebug>
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactDisplayLabel : public QDeclarativeContactDetail
 {
@@ -85,9 +87,7 @@ signals:
     void valueChanged();
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactDisplayLabel)
 
diff --git a/src/imports/contacts/details/qdeclarativecontactemailaddress_p.h b/src/imports/contacts/details/qdeclarativecontactemailaddress_p.h
index be4f4e0c7..19c03fda0 100644
--- a/src/imports/contacts/details/qdeclarativecontactemailaddress_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactemailaddress_p.h
@@ -46,7 +46,9 @@
 #include "qdeclarativecontactdetail_p.h"
 #include "qcontactemailaddress.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactEmailAddress : public QDeclarativeContactDetail
 {
@@ -82,9 +84,7 @@ signals:
     void valueChanged();
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactEmailAddress)
 
diff --git a/src/imports/contacts/details/qdeclarativecontactextendeddetail_p.h b/src/imports/contacts/details/qdeclarativecontactextendeddetail_p.h
index a052e2262..c70558c8f 100644
--- a/src/imports/contacts/details/qdeclarativecontactextendeddetail_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactextendeddetail_p.h
@@ -46,7 +46,9 @@
 #include "qdeclarativecontactdetail_p.h"
 #include "qcontactextendeddetail.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactExtendedDetail : public QDeclarativeContactDetail
 {
@@ -103,9 +105,7 @@ signals:
     void valueChanged();
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactExtendedDetail)
 
diff --git a/src/imports/contacts/details/qdeclarativecontactfamily_p.h b/src/imports/contacts/details/qdeclarativecontactfamily_p.h
index a0f72311b..244b8aa28 100644
--- a/src/imports/contacts/details/qdeclarativecontactfamily_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactfamily_p.h
@@ -47,7 +47,9 @@
 #include "qcontactfamily.h"
 #include <QSet>
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactFamily : public QDeclarativeContactDetail
 {
@@ -91,9 +93,7 @@ signals:
     void valueChanged();
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactFamily)
 
diff --git a/src/imports/contacts/details/qdeclarativecontactfavorite_p.h b/src/imports/contacts/details/qdeclarativecontactfavorite_p.h
index dcf343d96..80d736af6 100644
--- a/src/imports/contacts/details/qdeclarativecontactfavorite_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactfavorite_p.h
@@ -46,7 +46,9 @@
 #include "qdeclarativecontactdetail_p.h"
 #include "qcontactfavorite.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactFavorite : public QDeclarativeContactDetail
 {
@@ -91,9 +93,7 @@ signals:
     void valueChanged();
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactFavorite)
 
diff --git a/src/imports/contacts/details/qdeclarativecontactgender_p.h b/src/imports/contacts/details/qdeclarativecontactgender_p.h
index 1b612bb05..db412742b 100644
--- a/src/imports/contacts/details/qdeclarativecontactgender_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactgender_p.h
@@ -45,7 +45,9 @@
 #include "qdeclarativecontactdetail_p.h"
 #include "qcontactgender.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactGender : public QDeclarativeContactDetail
 {
@@ -102,9 +104,7 @@ signals:
     void valueChanged();
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactGender)
 
diff --git a/src/imports/contacts/details/qdeclarativecontactgeolocation_p.h b/src/imports/contacts/details/qdeclarativecontactgeolocation_p.h
index 076ff80c5..47fded30b 100644
--- a/src/imports/contacts/details/qdeclarativecontactgeolocation_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactgeolocation_p.h
@@ -46,7 +46,9 @@
 #include "qdeclarativecontactdetail_p.h"
 #include "qcontactgeolocation.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactGeoLocation : public QDeclarativeContactDetail
 {
@@ -163,9 +165,7 @@ signals:
     void valueChanged();
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactGeoLocation)
 
diff --git a/src/imports/contacts/details/qdeclarativecontactglobalpresence_p.h b/src/imports/contacts/details/qdeclarativecontactglobalpresence_p.h
index 292c6578d..376841a26 100644
--- a/src/imports/contacts/details/qdeclarativecontactglobalpresence_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactglobalpresence_p.h
@@ -47,7 +47,9 @@
 #include "qcontactglobalpresence.h"
 #include "qdeclarativecontactpresence_p.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactGlobalPresence : public QDeclarativeContactDetail
 {
@@ -138,9 +140,7 @@ signals:
     void valueChanged();
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactGlobalPresence)
 
diff --git a/src/imports/contacts/details/qdeclarativecontactguid_p.h b/src/imports/contacts/details/qdeclarativecontactguid_p.h
index e6ab99961..dc33bde62 100644
--- a/src/imports/contacts/details/qdeclarativecontactguid_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactguid_p.h
@@ -46,7 +46,9 @@
 #include "qdeclarativecontactdetail_p.h"
 #include "qcontactguid.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactGuid : public QDeclarativeContactDetail
 {
@@ -82,9 +84,7 @@ signals:
     void valueChanged();
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactGuid)
 
diff --git a/src/imports/contacts/details/qdeclarativecontacthobby_p.h b/src/imports/contacts/details/qdeclarativecontacthobby_p.h
index 041ceac53..9c70314b1 100644
--- a/src/imports/contacts/details/qdeclarativecontacthobby_p.h
+++ b/src/imports/contacts/details/qdeclarativecontacthobby_p.h
@@ -46,7 +46,9 @@
 #include "qdeclarativecontactdetail_p.h"
 #include "qcontacthobby.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactHobby : public QDeclarativeContactDetail
 {
@@ -82,9 +84,7 @@ signals:
     void valueChanged();
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactHobby)
 
diff --git a/src/imports/contacts/details/qdeclarativecontactmoc_p.cpp b/src/imports/contacts/details/qdeclarativecontactmoc_p.cpp
index f158ad5c1..df0ab240f 100644
--- a/src/imports/contacts/details/qdeclarativecontactmoc_p.cpp
+++ b/src/imports/contacts/details/qdeclarativecontactmoc_p.cpp
@@ -41,7 +41,7 @@
 
 #include "qdeclarativecontactdetails_p.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QT_BEGIN_NAMESPACE
 
 #include "moc_qdeclarativecontactaddress_p.cpp"
 #include "moc_qdeclarativecontactanniversary_p.cpp"
@@ -72,4 +72,4 @@ QT_BEGIN_NAMESPACE_CONTACTS
 #include "moc_qdeclarativecontacturl_p.cpp"
 #include "moc_qdeclarativecontactversion_p.cpp"
 
-QT_END_NAMESPACE_CONTACTS
+QT_END_NAMESPACE
diff --git a/src/imports/contacts/details/qdeclarativecontactname_p.h b/src/imports/contacts/details/qdeclarativecontactname_p.h
index d59038c37..2b54cd46a 100644
--- a/src/imports/contacts/details/qdeclarativecontactname_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactname_p.h
@@ -46,7 +46,9 @@
 #include "qdeclarativecontactdetail_p.h"
 #include "qcontactname.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactName : public QDeclarativeContactDetail
 {
@@ -126,9 +128,7 @@ signals:
     void valueChanged();
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactName)
 
diff --git a/src/imports/contacts/details/qdeclarativecontactnickname_p.h b/src/imports/contacts/details/qdeclarativecontactnickname_p.h
index b8cf0e82b..8b1a0249c 100644
--- a/src/imports/contacts/details/qdeclarativecontactnickname_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactnickname_p.h
@@ -45,7 +45,9 @@
 #include "qdeclarativecontactdetail_p.h"
 #include "qcontactnickname.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactNickname : public QDeclarativeContactDetail
 {
@@ -81,9 +83,7 @@ signals:
     void valueChanged();
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactNickname)
 
diff --git a/src/imports/contacts/details/qdeclarativecontactnote_p.h b/src/imports/contacts/details/qdeclarativecontactnote_p.h
index 7fd36fa28..2d6f93b55 100644
--- a/src/imports/contacts/details/qdeclarativecontactnote_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactnote_p.h
@@ -45,7 +45,9 @@
 #include "qdeclarativecontactdetail_p.h"
 #include "qcontactnote.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactNote : public QDeclarativeContactDetail
 {
@@ -82,9 +84,7 @@ signals:
     void valueChanged();
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactNote)
 
diff --git a/src/imports/contacts/details/qdeclarativecontactonlineaccount_p.h b/src/imports/contacts/details/qdeclarativecontactonlineaccount_p.h
index 7b69337d6..9221a80aa 100644
--- a/src/imports/contacts/details/qdeclarativecontactonlineaccount_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactonlineaccount_p.h
@@ -47,7 +47,9 @@
 #include "qcontactonlineaccount.h"
 #include <QSet>
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactOnlineAccount : public QDeclarativeContactDetail
 {
@@ -160,9 +162,7 @@ signals:
     void valueChanged();
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactOnlineAccount)
 
diff --git a/src/imports/contacts/details/qdeclarativecontactorganization_p.h b/src/imports/contacts/details/qdeclarativecontactorganization_p.h
index 9b9385425..02efd7004 100644
--- a/src/imports/contacts/details/qdeclarativecontactorganization_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactorganization_p.h
@@ -46,7 +46,9 @@
 #include "qcontactorganization.h"
 #include <QSet>
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactOrganization : public QDeclarativeContactDetail
 {
@@ -145,9 +147,7 @@ signals:
 
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactOrganization)
 
diff --git a/src/imports/contacts/details/qdeclarativecontactphonenumber_p.h b/src/imports/contacts/details/qdeclarativecontactphonenumber_p.h
index 97b3659d1..d17bdcf0e 100644
--- a/src/imports/contacts/details/qdeclarativecontactphonenumber_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactphonenumber_p.h
@@ -47,7 +47,9 @@
 #include "qcontactphonenumber.h"
 #include <QSet>
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class  QDeclarativeContactPhoneNumber : public QDeclarativeContactDetail
 {
@@ -121,9 +123,7 @@ signals:
 
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactPhoneNumber)
 
diff --git a/src/imports/contacts/details/qdeclarativecontactpresence_p.h b/src/imports/contacts/details/qdeclarativecontactpresence_p.h
index 6e5147217..77dcf9776 100644
--- a/src/imports/contacts/details/qdeclarativecontactpresence_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactpresence_p.h
@@ -46,7 +46,9 @@
 #include "qdeclarativecontactdetail_p.h"
 #include "qcontactpresence.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactPresence : public QDeclarativeContactDetail
 {
@@ -150,9 +152,7 @@ signals:
     void valueChanged();
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactPresence)
 
diff --git a/src/imports/contacts/details/qdeclarativecontactringtone_p.h b/src/imports/contacts/details/qdeclarativecontactringtone_p.h
index c9bca68e0..6f860e62d 100644
--- a/src/imports/contacts/details/qdeclarativecontactringtone_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactringtone_p.h
@@ -47,7 +47,9 @@
 #include "qdeclarativecontactdetail_p.h"
 #include "qcontactringtone.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactRingtone : public QDeclarativeContactDetail
 {
@@ -107,9 +109,7 @@ signals:
 
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactRingtone)
 
diff --git a/src/imports/contacts/details/qdeclarativecontactsynctarget_p.h b/src/imports/contacts/details/qdeclarativecontactsynctarget_p.h
index 6e33aade6..a137f7f39 100644
--- a/src/imports/contacts/details/qdeclarativecontactsynctarget_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactsynctarget_p.h
@@ -46,7 +46,9 @@
 #include "qdeclarativecontactdetail_p.h"
 #include "qcontactsynctarget.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class  QDeclarativeContactSyncTarget : public QDeclarativeContactDetail
 {
@@ -83,9 +85,7 @@ signals:
 
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactSyncTarget)
 
diff --git a/src/imports/contacts/details/qdeclarativecontacttag_p.h b/src/imports/contacts/details/qdeclarativecontacttag_p.h
index 40d5f38fa..65e5111e6 100644
--- a/src/imports/contacts/details/qdeclarativecontacttag_p.h
+++ b/src/imports/contacts/details/qdeclarativecontacttag_p.h
@@ -46,7 +46,9 @@
 #include "qdeclarativecontactdetail_p.h"
 #include "qcontacttag.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactTag : public QDeclarativeContactDetail
 {
@@ -82,9 +84,7 @@ signals:
     void valueChanged();
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactTag)
 
diff --git a/src/imports/contacts/details/qdeclarativecontacttimestamp_p.h b/src/imports/contacts/details/qdeclarativecontacttimestamp_p.h
index 9d9340424..ab1eeedd7 100644
--- a/src/imports/contacts/details/qdeclarativecontacttimestamp_p.h
+++ b/src/imports/contacts/details/qdeclarativecontacttimestamp_p.h
@@ -45,7 +45,9 @@
 #include "qdeclarativecontactdetail_p.h"
 #include "qcontacttimestamp.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactTimestamp : public QDeclarativeContactDetail
 {
@@ -91,9 +93,7 @@ signals:
     void valueChanged();
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactTimestamp)
 
diff --git a/src/imports/contacts/details/qdeclarativecontacttype_p.h b/src/imports/contacts/details/qdeclarativecontacttype_p.h
index 7d6b8433b..5a2058216 100644
--- a/src/imports/contacts/details/qdeclarativecontacttype_p.h
+++ b/src/imports/contacts/details/qdeclarativecontacttype_p.h
@@ -45,7 +45,9 @@
 #include "qdeclarativecontactdetail_p.h"
 #include "qcontacttype.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactType : public QDeclarativeContactDetail
 {
@@ -100,9 +102,7 @@ signals:
     void valueChanged();
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactType)
 
diff --git a/src/imports/contacts/details/qdeclarativecontacturl_p.h b/src/imports/contacts/details/qdeclarativecontacturl_p.h
index 9d7999957..2cb8db6b9 100644
--- a/src/imports/contacts/details/qdeclarativecontacturl_p.h
+++ b/src/imports/contacts/details/qdeclarativecontacturl_p.h
@@ -46,7 +46,9 @@
 #include "qdeclarativecontactdetail_p.h"
 #include "qcontacturl.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactUrl : public QDeclarativeContactDetail
 {
@@ -117,9 +119,7 @@ signals:
     void valueChanged();
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactUrl)
 
diff --git a/src/imports/contacts/details/qdeclarativecontactversion_p.h b/src/imports/contacts/details/qdeclarativecontactversion_p.h
index 14890df8f..441f86c8b 100644
--- a/src/imports/contacts/details/qdeclarativecontactversion_p.h
+++ b/src/imports/contacts/details/qdeclarativecontactversion_p.h
@@ -46,7 +46,9 @@
 #include "qdeclarativecontactdetail_p.h"
 #include "qcontactversion.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactVersion : public QDeclarativeContactDetail
 {
@@ -99,9 +101,7 @@ signals:
     void valueChanged();
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactVersion)
 
diff --git a/src/imports/contacts/filters/qdeclarativecontactactionfilter_p.h b/src/imports/contacts/filters/qdeclarativecontactactionfilter_p.h
index 258c13c3b..a6026c8ce 100644
--- a/src/imports/contacts/filters/qdeclarativecontactactionfilter_p.h
+++ b/src/imports/contacts/filters/qdeclarativecontactactionfilter_p.h
@@ -44,7 +44,9 @@
 #include "qdeclarativecontactfilter_p.h"
 #include "qcontactactionfilter.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactActionFilter : public QDeclarativeContactFilter
 {
@@ -80,9 +82,8 @@ private:
     QContactActionFilter d;
 };
 
+QT_END_NAMESPACE
 
-QT_END_NAMESPACE_CONTACTS
-
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactActionFilter))
+QML_DECLARE_TYPE(QDeclarativeContactActionFilter)
 
 #endif
diff --git a/src/imports/contacts/filters/qdeclarativecontactchangelogfilter_p.h b/src/imports/contacts/filters/qdeclarativecontactchangelogfilter_p.h
index ae32982be..16f7b09ca 100644
--- a/src/imports/contacts/filters/qdeclarativecontactchangelogfilter_p.h
+++ b/src/imports/contacts/filters/qdeclarativecontactchangelogfilter_p.h
@@ -45,7 +45,9 @@
 #include "qdeclarativecontactfilter_p.h"
 #include "qcontactchangelogfilter.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactChangeLogFilter: public QDeclarativeContactFilter
 {
@@ -104,10 +106,8 @@ private:
     QContactChangeLogFilter d;
 };
 
+QT_END_NAMESPACE
 
-
-QT_END_NAMESPACE_CONTACTS
-
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactChangeLogFilter))
+QML_DECLARE_TYPE(QDeclarativeContactChangeLogFilter)
 
 #endif
diff --git a/src/imports/contacts/filters/qdeclarativecontactdetailfilter_p.h b/src/imports/contacts/filters/qdeclarativecontactdetailfilter_p.h
index 7ef351341..8ccda2e36 100644
--- a/src/imports/contacts/filters/qdeclarativecontactdetailfilter_p.h
+++ b/src/imports/contacts/filters/qdeclarativecontactdetailfilter_p.h
@@ -47,12 +47,14 @@
 #include "qdeclarativecontactdetail_p.h"
 #include <QQmlParserStatus>
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactDetailFilter : 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 value READ value WRITE setValue NOTIFY valueChanged)
     Q_PROPERTY(MatchFlags matchFlags READ matchFlags WRITE setMatchFlags NOTIFY valueChanged)
@@ -146,10 +148,8 @@ private:
     QContactDetailFilter d;
 };
 
+QT_END_NAMESPACE
 
-
-QT_END_NAMESPACE_CONTACTS
-
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactDetailFilter))
+QML_DECLARE_TYPE(QDeclarativeContactDetailFilter)
 
 #endif
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
diff --git a/src/imports/contacts/filters/qdeclarativecontactfiltermoc.cpp b/src/imports/contacts/filters/qdeclarativecontactfiltermoc.cpp
index a52f08643..9a83d1d03 100644
--- a/src/imports/contacts/filters/qdeclarativecontactfiltermoc.cpp
+++ b/src/imports/contacts/filters/qdeclarativecontactfiltermoc.cpp
@@ -41,7 +41,7 @@
 
 #include "qdeclarativecontactfilters_p.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QT_BEGIN_NAMESPACE
 
 #include "moc_qdeclarativecontactactionfilter_p.cpp"
 #include "moc_qdeclarativecontactchangelogfilter_p.cpp"
@@ -53,4 +53,4 @@ QT_BEGIN_NAMESPACE_CONTACTS
 #include "moc_qdeclarativecontactrelationshipfilter_p.cpp"
 #include "moc_qdeclarativecontactunionfilter_p.cpp"
 
-QT_END_NAMESPACE_CONTACTS
+QT_END_NAMESPACE
diff --git a/src/imports/contacts/filters/qdeclarativecontactidfilter_p.h b/src/imports/contacts/filters/qdeclarativecontactidfilter_p.h
index 416b7a9e4..9d4a3e52d 100644
--- a/src/imports/contacts/filters/qdeclarativecontactidfilter_p.h
+++ b/src/imports/contacts/filters/qdeclarativecontactidfilter_p.h
@@ -48,7 +48,9 @@
 #include <QStringList>
 #include <QSet>
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactIdFilter : public QDeclarativeContactFilter
 {
@@ -105,10 +107,8 @@ private:
         QStringList m_ids;
 };
 
+QT_END_NAMESPACE
 
-
-QT_END_NAMESPACE_CONTACTS
-
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactIdFilter))
+QML_DECLARE_TYPE(QDeclarativeContactIdFilter)
 
 #endif
diff --git a/src/imports/contacts/filters/qdeclarativecontactintersectionfilter_p.h b/src/imports/contacts/filters/qdeclarativecontactintersectionfilter_p.h
index c5722a8df..1b4872689 100644
--- a/src/imports/contacts/filters/qdeclarativecontactintersectionfilter_p.h
+++ b/src/imports/contacts/filters/qdeclarativecontactintersectionfilter_p.h
@@ -47,7 +47,9 @@
 
 #include <QQmlListProperty>
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactIntersectionFilter : public QDeclarativeContactCompoundFilter
 {
@@ -71,9 +73,8 @@ public:
     }
 };
 
+QT_END_NAMESPACE
 
-QT_END_NAMESPACE_CONTACTS
-
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactIntersectionFilter))
+QML_DECLARE_TYPE(QDeclarativeContactIntersectionFilter)
 
 #endif
diff --git a/src/imports/contacts/filters/qdeclarativecontactinvalidfilter_p.h b/src/imports/contacts/filters/qdeclarativecontactinvalidfilter_p.h
index 901e714a3..319c5a8ad 100644
--- a/src/imports/contacts/filters/qdeclarativecontactinvalidfilter_p.h
+++ b/src/imports/contacts/filters/qdeclarativecontactinvalidfilter_p.h
@@ -45,7 +45,9 @@
 #include "qdeclarativecontactfilter_p.h"
 #include "qcontactinvalidfilter.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactInvalidFilter : public QDeclarativeContactFilter
 {
@@ -62,8 +64,6 @@ public:
     }
 };
 
-
-
-QT_END_NAMESPACE_CONTACTS
+QT_END_NAMESPACE
 
 #endif
diff --git a/src/imports/contacts/filters/qdeclarativecontactrelationshipfilter_p.h b/src/imports/contacts/filters/qdeclarativecontactrelationshipfilter_p.h
index 2d3826284..9998dfd6e 100644
--- a/src/imports/contacts/filters/qdeclarativecontactrelationshipfilter_p.h
+++ b/src/imports/contacts/filters/qdeclarativecontactrelationshipfilter_p.h
@@ -49,7 +49,9 @@
 #include <qcontactmanager.h>
 #include <QDebug>
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactRelationshipFilter : public QDeclarativeContactFilter
 {
@@ -161,9 +163,8 @@ private:
     QContactRelationshipFilter d;
 };
 
+QT_END_NAMESPACE
 
-QT_END_NAMESPACE_CONTACTS
-
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactRelationshipFilter))
+QML_DECLARE_TYPE(QDeclarativeContactRelationshipFilter)
 
 #endif
diff --git a/src/imports/contacts/filters/qdeclarativecontactunionfilter_p.h b/src/imports/contacts/filters/qdeclarativecontactunionfilter_p.h
index d5c0a300e..158abd46a 100644
--- a/src/imports/contacts/filters/qdeclarativecontactunionfilter_p.h
+++ b/src/imports/contacts/filters/qdeclarativecontactunionfilter_p.h
@@ -47,7 +47,9 @@
 
 #include <QQmlListProperty>
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactUnionFilter : public QDeclarativeContactCompoundFilter
 {
@@ -70,8 +72,8 @@ public:
     }
 };
 
-QT_END_NAMESPACE_CONTACTS
+QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QTCONTACTS_PREPEND_NAMESPACE(QDeclarativeContactUnionFilter))
+QML_DECLARE_TYPE(QDeclarativeContactUnionFilter)
 
 #endif
diff --git a/src/imports/contacts/plugin.cpp b/src/imports/contacts/plugin.cpp
index ade9222e3..8cffa66ba 100644
--- a/src/imports/contacts/plugin.cpp
+++ b/src/imports/contacts/plugin.cpp
@@ -53,7 +53,9 @@
 #include "qdeclarativecontactfetchhint_p.h"
 #include "qdeclarativecontactfilters_p.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QContactQmlPlugin : public QQmlExtensionPlugin
 {
@@ -130,4 +132,4 @@ public:
 
 #include "plugin.moc"
 
-QT_END_NAMESPACE_CONTACTS
+QT_END_NAMESPACE
diff --git a/src/imports/contacts/qdeclarativecontact.cpp b/src/imports/contacts/qdeclarativecontact.cpp
index 76c20d6e7..30a7d294d 100644
--- a/src/imports/contacts/qdeclarativecontact.cpp
+++ b/src/imports/contacts/qdeclarativecontact.cpp
@@ -49,6 +49,10 @@
 #include <QUrl>
 #include <QQmlListProperty>
 
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
+
 /*!
     \qmltype Contact
     \instantiates QDeclarativeContact
@@ -74,10 +78,6 @@
     \sa QContact
 */
 
-
-QT_BEGIN_NAMESPACE_CONTACTS
-
-
 // call-back function templates for list properties
 template <typename T, QDeclarativeContactDetail::DetailType detailType>
 static void list_property_append(QQmlListProperty<T> *, T *)
@@ -879,4 +879,4 @@ int QDeclarativeContact::_q_detail_count(QQmlListProperty<QDeclarativeContactDet
 
 #include "moc_qdeclarativecontact_p.cpp"
 
-QT_END_NAMESPACE_CONTACTS
+QT_END_NAMESPACE
diff --git a/src/imports/contacts/qdeclarativecontact_p.h b/src/imports/contacts/qdeclarativecontact_p.h
index 2cd00953c..ce6a9d212 100644
--- a/src/imports/contacts/qdeclarativecontact_p.h
+++ b/src/imports/contacts/qdeclarativecontact_p.h
@@ -49,7 +49,9 @@
 #include "qdeclarativecontactdetail_p.h"
 #include <QtQml/qqmllist.h>
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContact : public QObject
 {
@@ -209,9 +211,7 @@ private:
     static int _q_detail_count(QQmlListProperty<QDeclarativeContactDetail> *property);
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContact)
 
diff --git a/src/imports/contacts/qdeclarativecontactdetail.cpp b/src/imports/contacts/qdeclarativecontactdetail.cpp
index 139ccbc01..07cc22561 100644
--- a/src/imports/contacts/qdeclarativecontactdetail.cpp
+++ b/src/imports/contacts/qdeclarativecontactdetail.cpp
@@ -44,6 +44,10 @@
 #include "qcontactdetails.h"
 #include <QDebug>
 
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
+
 /* ==================== QDeclarativeContactDetail ======================= */
 
 /*!
@@ -58,8 +62,6 @@
     The ContactDetail element is part of the \b{QtContacts} module.
 */
 
-QT_BEGIN_NAMESPACE_CONTACTS
-
 QDeclarativeContactDetail::QDeclarativeContactDetail(QObject* parent)
     :QObject(parent)
 {
@@ -1301,4 +1303,4 @@ QDeclarativeContactDetail *QDeclarativeContactDetailFactory::createContactDetail
 
 #include "moc_qdeclarativecontactdetail_p.cpp"
 
-QT_END_NAMESPACE_CONTACTS
+QT_END_NAMESPACE
diff --git a/src/imports/contacts/qdeclarativecontactdetail_p.h b/src/imports/contacts/qdeclarativecontactdetail_p.h
index 14465007e..37697891e 100644
--- a/src/imports/contacts/qdeclarativecontactdetail_p.h
+++ b/src/imports/contacts/qdeclarativecontactdetail_p.h
@@ -46,7 +46,9 @@
 #include "qcontact.h"
 #include "qcontactdetail.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactDetail : public QObject
 {
@@ -142,9 +144,7 @@ public:
     static QDeclarativeContactDetail *createContactDetail(const QDeclarativeContactDetail::DetailType type);
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactDetail)
 
diff --git a/src/imports/contacts/qdeclarativecontactfetchhint.cpp b/src/imports/contacts/qdeclarativecontactfetchhint.cpp
index 440ffc07f..d1c25c3ba 100644
--- a/src/imports/contacts/qdeclarativecontactfetchhint.cpp
+++ b/src/imports/contacts/qdeclarativecontactfetchhint.cpp
@@ -43,7 +43,9 @@
 
 #include <QSet>
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 /*!
    \qmltype FetchHint
@@ -195,4 +197,4 @@ void QDeclarativeContactFetchHint::setFetchHint(const QContactFetchHint& fetchHi
 
 #include "moc_qdeclarativecontactfetchhint_p.cpp"
 
-QT_END_NAMESPACE_CONTACTS
+QT_END_NAMESPACE
diff --git a/src/imports/contacts/qdeclarativecontactfetchhint_p.h b/src/imports/contacts/qdeclarativecontactfetchhint_p.h
index 3a6cf3fa7..b6262a8c4 100644
--- a/src/imports/contacts/qdeclarativecontactfetchhint_p.h
+++ b/src/imports/contacts/qdeclarativecontactfetchhint_p.h
@@ -51,7 +51,9 @@
 
 #include "qcontactfetchhint.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactFetchHint : public QObject
 {
@@ -95,9 +97,7 @@ private:
     QContactFetchHint m_fetchHint;
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactFetchHint)
 
diff --git a/src/imports/contacts/qdeclarativecontactfilter.cpp b/src/imports/contacts/qdeclarativecontactfilter.cpp
index b8e1b35cd..4eb470b28 100644
--- a/src/imports/contacts/qdeclarativecontactfilter.cpp
+++ b/src/imports/contacts/qdeclarativecontactfilter.cpp
@@ -41,7 +41,9 @@
 
 #include "qdeclarativecontactfilter_p.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 /*!
    \qmltype Filter
@@ -419,4 +421,4 @@ void QDeclarativeContactCompoundFilter::filters_clear(QQmlListProperty<QDeclarat
 
 #include "moc_qdeclarativecontactfilter_p.cpp"
 
-QT_END_NAMESPACE_CONTACTS
+QT_END_NAMESPACE
diff --git a/src/imports/contacts/qdeclarativecontactfilter_p.h b/src/imports/contacts/qdeclarativecontactfilter_p.h
index 3f9c91d66..f28389e66 100644
--- a/src/imports/contacts/qdeclarativecontactfilter_p.h
+++ b/src/imports/contacts/qdeclarativecontactfilter_p.h
@@ -45,7 +45,9 @@
 #include <QQmlExtensionPlugin>
 #include <qcontactfilter.h>
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactFilter : public QObject
 {
@@ -123,9 +125,7 @@ protected:
     QList<QDeclarativeContactFilter*> m_filters;
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactFilter)
 QML_DECLARE_TYPE(QDeclarativeContactCompoundFilter)
diff --git a/src/imports/contacts/qdeclarativecontactmodel.cpp b/src/imports/contacts/qdeclarativecontactmodel.cpp
index 39fd8b9a8..2f816f3da 100644
--- a/src/imports/contacts/qdeclarativecontactmodel.cpp
+++ b/src/imports/contacts/qdeclarativecontactmodel.cpp
@@ -62,6 +62,11 @@
 
 #include "qcontactrequests.h"
 
+QTCONTACTS_USE_NAMESPACE
+QTVERSIT_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
+
 /*!
     \qmltype ContactModel
     \instantiates QDeclarativeContactModel
@@ -86,8 +91,6 @@
     \sa RelationshipModel, Contact, {QContactManager}
 */
 
-QT_BEGIN_NAMESPACE_CONTACTS
-
 class QDeclarativeContactModelPrivate
 {
 public:
@@ -1270,4 +1273,4 @@ int QDeclarativeContactModel::contactIndex(const QDeclarativeContact* contact)
 
 #include "moc_qdeclarativecontactmodel_p.cpp"
 
-QT_END_NAMESPACE_CONTACTS
+QT_END_NAMESPACE
diff --git a/src/imports/contacts/qdeclarativecontactmodel_p.h b/src/imports/contacts/qdeclarativecontactmodel_p.h
index 41df92f67..aee401b0d 100644
--- a/src/imports/contacts/qdeclarativecontactmodel_p.h
+++ b/src/imports/contacts/qdeclarativecontactmodel_p.h
@@ -60,9 +60,10 @@ QT_BEGIN_NAMESPACE_VERSIT
 class QVersitReader;
 QT_END_NAMESPACE_VERSIT
 
+QTCONTACTS_USE_NAMESPACE
 QTVERSIT_USE_NAMESPACE
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactModelPrivate;
 class QDeclarativeContactModel : public QAbstractListModel, public QQmlParserStatus
@@ -208,9 +209,7 @@ private:
     QDeclarativeContactModelPrivate *d;
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactModel)
 
diff --git a/src/imports/contacts/qdeclarativecontactrelationship.cpp b/src/imports/contacts/qdeclarativecontactrelationship.cpp
index 8c22a63be..bb592b8cc 100644
--- a/src/imports/contacts/qdeclarativecontactrelationship.cpp
+++ b/src/imports/contacts/qdeclarativecontactrelationship.cpp
@@ -42,7 +42,9 @@
 #include "qdeclarativecontactrelationship_p.h"
 #include <QDebug>
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 /*!
    \qmltype Relationship
@@ -169,4 +171,4 @@ void QDeclarativeContactRelationship::setRelationship(const QContactRelationship
 
 #include "moc_qdeclarativecontactrelationship_p.cpp"
 
-QT_END_NAMESPACE_CONTACTS
+QT_END_NAMESPACE
diff --git a/src/imports/contacts/qdeclarativecontactrelationship_p.h b/src/imports/contacts/qdeclarativecontactrelationship_p.h
index f35b8675e..762299131 100644
--- a/src/imports/contacts/qdeclarativecontactrelationship_p.h
+++ b/src/imports/contacts/qdeclarativecontactrelationship_p.h
@@ -48,7 +48,9 @@
 #include "qcontactrelationship.h"
 #include "qdeclarativecontact_p.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactRelationship : public QObject
 {
@@ -94,9 +96,7 @@ private:
     QContactRelationship m_relationship;
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactRelationship)
 
diff --git a/src/imports/contacts/qdeclarativecontactrelationshipmodel.cpp b/src/imports/contacts/qdeclarativecontactrelationshipmodel.cpp
index 63b5a0018..cdb265d0f 100644
--- a/src/imports/contacts/qdeclarativecontactrelationshipmodel.cpp
+++ b/src/imports/contacts/qdeclarativecontactrelationshipmodel.cpp
@@ -45,7 +45,9 @@
 
 #include <QPixmap>
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 /*!
    \qmltype RelationshipModel
@@ -422,4 +424,4 @@ void QDeclarativeContactRelationshipModel::relationshipsRemoved()
 
 #include "moc_qdeclarativecontactrelationshipmodel_p.cpp"
 
-QT_END_NAMESPACE_CONTACTS
+QT_END_NAMESPACE
diff --git a/src/imports/contacts/qdeclarativecontactrelationshipmodel_p.h b/src/imports/contacts/qdeclarativecontactrelationshipmodel_p.h
index 564f2efe1..da225dcfd 100644
--- a/src/imports/contacts/qdeclarativecontactrelationshipmodel_p.h
+++ b/src/imports/contacts/qdeclarativecontactrelationshipmodel_p.h
@@ -46,7 +46,9 @@
 
 #include "qdeclarativecontactrelationship_p.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactRelationshipModelPrivate;
 class QDeclarativeContactRelationshipModel : public QAbstractListModel
@@ -107,9 +109,7 @@ private:
     QDeclarativeContactRelationshipModelPrivate* d;
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactRelationshipModel)
 
diff --git a/src/imports/contacts/qdeclarativecontactsortorder.cpp b/src/imports/contacts/qdeclarativecontactsortorder.cpp
index 2b9ca3330..5fa70676e 100644
--- a/src/imports/contacts/qdeclarativecontactsortorder.cpp
+++ b/src/imports/contacts/qdeclarativecontactsortorder.cpp
@@ -41,7 +41,9 @@
 #include "qdeclarativecontactsortorder_p.h"
 #include <QDebug>
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 /*!
    \qmltype SortOrder
@@ -182,4 +184,4 @@ void QDeclarativeContactSortOrder::setSortOrder(const QContactSortOrder& sortOrd
 
 #include "moc_qdeclarativecontactsortorder_p.cpp"
 
-QT_END_NAMESPACE_CONTACTS
+QT_END_NAMESPACE
diff --git a/src/imports/contacts/qdeclarativecontactsortorder_p.h b/src/imports/contacts/qdeclarativecontactsortorder_p.h
index 659b12a4f..8991e1dff 100644
--- a/src/imports/contacts/qdeclarativecontactsortorder_p.h
+++ b/src/imports/contacts/qdeclarativecontactsortorder_p.h
@@ -48,7 +48,9 @@
 #include "qcontactsortorder.h"
 #include "qdeclarativecontactdetail_p.h"
 
-QT_BEGIN_NAMESPACE_CONTACTS
+QTCONTACTS_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeContactSortOrder :public QObject, public QQmlParserStatus
 {
@@ -99,9 +101,7 @@ private:
     QContactSortOrder m_sortOrder;
 };
 
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeContactSortOrder)
 
diff --git a/src/imports/organizer/plugin.cpp b/src/imports/organizer/plugin.cpp
index 51fb7dafb..1390cfdf1 100644
--- a/src/imports/organizer/plugin.cpp
+++ b/src/imports/organizer/plugin.cpp
@@ -51,7 +51,7 @@
 #include "qdeclarativeorganizeritemsortorder_p.h"
 #include "qdeclarativeorganizercollection_p.h"
 
-QT_BEGIN_NAMESPACE_ORGANIZER
+QT_BEGIN_NAMESPACE
 
 class QOrganizerQmlPlugin : public QQmlExtensionPlugin
 {
@@ -124,4 +124,4 @@ public:
 
 #include "plugin.moc"
 
-QT_END_NAMESPACE_ORGANIZER
+QT_END_NAMESPACE
diff --git a/src/imports/organizer/qdeclarativeorganizercollection.cpp b/src/imports/organizer/qdeclarativeorganizercollection.cpp
index 645869c62..73fea8fec 100644
--- a/src/imports/organizer/qdeclarativeorganizercollection.cpp
+++ b/src/imports/organizer/qdeclarativeorganizercollection.cpp
@@ -41,7 +41,9 @@
 
 #include "qdeclarativeorganizercollection_p.h"
 
-QT_BEGIN_NAMESPACE_ORGANIZER
+QTORGANIZER_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype Collection
@@ -216,4 +218,4 @@ void QDeclarativeOrganizerCollection::setCollection(const QOrganizerCollection &
 
 #include "moc_qdeclarativeorganizercollection_p.cpp"
 
-QT_END_NAMESPACE_ORGANIZER
+QT_END_NAMESPACE
diff --git a/src/imports/organizer/qdeclarativeorganizercollection_p.h b/src/imports/organizer/qdeclarativeorganizercollection_p.h
index 1a90c5b94..2b9fec14a 100644
--- a/src/imports/organizer/qdeclarativeorganizercollection_p.h
+++ b/src/imports/organizer/qdeclarativeorganizercollection_p.h
@@ -47,7 +47,9 @@
 #include <QtQml/qqml.h>
 #include <QtGui/qcolor.h>
 
-QT_BEGIN_NAMESPACE_ORGANIZER
+QTORGANIZER_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeOrganizerCollection : public QObject
 {
@@ -103,9 +105,7 @@ private:
     QOrganizerCollection d;
 };
 
-QT_END_NAMESPACE_ORGANIZER
-
-QTORGANIZER_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeOrganizerCollection)
 
diff --git a/src/imports/organizer/qdeclarativeorganizeritem.cpp b/src/imports/organizer/qdeclarativeorganizeritem.cpp
index 6a59591c4..4b5cd8f33 100644
--- a/src/imports/organizer/qdeclarativeorganizeritem.cpp
+++ b/src/imports/organizer/qdeclarativeorganizeritem.cpp
@@ -44,7 +44,9 @@
 
 #include <QtQml/qqmlengine.h>
 
-QT_BEGIN_NAMESPACE_ORGANIZER
+QTORGANIZER_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype OrganizerItem
@@ -1970,4 +1972,4 @@ QString QDeclarativeOrganizerTodoOccurrence::parentId() const
 
 #include "moc_qdeclarativeorganizeritem_p.cpp"
 
-QT_END_NAMESPACE_ORGANIZER
+QT_END_NAMESPACE
diff --git a/src/imports/organizer/qdeclarativeorganizeritem_p.h b/src/imports/organizer/qdeclarativeorganizeritem_p.h
index 8e1b6ccef..74a0e3cfb 100644
--- a/src/imports/organizer/qdeclarativeorganizeritem_p.h
+++ b/src/imports/organizer/qdeclarativeorganizeritem_p.h
@@ -47,7 +47,9 @@
 
 #include <QtQml/qqmllist.h>
 
-QT_BEGIN_NAMESPACE_ORGANIZER
+QTORGANIZER_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeOrganizerItem : public QObject
 {
@@ -56,7 +58,7 @@ class QDeclarativeOrganizerItem : public QObject
     // basic information
     Q_PROPERTY(bool modified READ modified NOTIFY itemChanged)
 
-    Q_PROPERTY(QtOrganizer::QDeclarativeOrganizerItemType::ItemType itemType READ itemType NOTIFY itemChanged)
+    Q_PROPERTY(QDeclarativeOrganizerItemType::ItemType itemType READ itemType NOTIFY itemChanged)
     Q_PROPERTY(QQmlListProperty<QDeclarativeOrganizerItemDetail> itemDetails READ itemDetails NOTIFY itemChanged)
     Q_PROPERTY(QString itemId READ itemId NOTIFY itemChanged)
     Q_PROPERTY(QString manager READ manager NOTIFY itemChanged)
@@ -149,7 +151,7 @@ class QDeclarativeOrganizerEvent : public QDeclarativeOrganizerItem
     Q_PROPERTY(bool allDay READ isAllDay WRITE setAllDay NOTIFY valueChanged)
     Q_PROPERTY(QDateTime startDateTime READ startDateTime WRITE setStartDateTime NOTIFY valueChanged)
     Q_PROPERTY(QDateTime endDateTime READ endDateTime WRITE setEndDateTime NOTIFY valueChanged)
-    Q_PROPERTY(QtOrganizer::QDeclarativeOrganizerItemPriority::Priority priority READ priority WRITE setPriority NOTIFY valueChanged)
+    Q_PROPERTY(QDeclarativeOrganizerItemPriority::Priority priority READ priority WRITE setPriority NOTIFY valueChanged)
     Q_PROPERTY(QDeclarativeOrganizerItemRecurrence *recurrence READ recurrence NOTIFY valueChanged)
     Q_PROPERTY(QString location READ location WRITE setLocation NOTIFY valueChanged)
     Q_PROPERTY(QQmlListProperty<QDeclarativeOrganizerEventAttendee> attendees READ attendees NOTIFY valueChanged)
@@ -200,7 +202,7 @@ class QDeclarativeOrganizerEventOccurrence : public QDeclarativeOrganizerItem
     Q_PROPERTY(QDateTime originalDate READ originalDate WRITE setOriginalDate NOTIFY valueChanged)
     Q_PROPERTY(QDateTime startDateTime READ startDateTime WRITE setStartDateTime NOTIFY valueChanged)
     Q_PROPERTY(QDateTime endDateTime READ endDateTime WRITE setEndDateTime NOTIFY valueChanged)
-    Q_PROPERTY(QtOrganizer::QDeclarativeOrganizerItemPriority::Priority priority READ priority WRITE setPriority NOTIFY valueChanged)
+    Q_PROPERTY(QDeclarativeOrganizerItemPriority::Priority priority READ priority WRITE setPriority NOTIFY valueChanged)
     Q_PROPERTY(QString location READ location WRITE setLocation NOTIFY valueChanged)
     Q_PROPERTY(QString parentId READ parentId WRITE setParentId NOTIFY valueChanged)
 
@@ -271,8 +273,8 @@ class QDeclarativeOrganizerTodo : public QDeclarativeOrganizerItem
     Q_PROPERTY(QDateTime startDateTime READ startDateTime WRITE setStartDateTime NOTIFY valueChanged)
     Q_PROPERTY(QDateTime dueDateTime READ dueDateTime WRITE setDueDateTime NOTIFY valueChanged)
     Q_PROPERTY(QDateTime finishedDateTime READ finishedDateTime WRITE setFinishedDateTime NOTIFY valueChanged)
-    Q_PROPERTY(QtOrganizer::QDeclarativeOrganizerItemPriority::Priority priority READ priority WRITE setPriority NOTIFY valueChanged)
-    Q_PROPERTY(QtOrganizer::QDeclarativeOrganizerTodoProgress::StatusType status READ status WRITE setStatus NOTIFY valueChanged)
+    Q_PROPERTY(QDeclarativeOrganizerItemPriority::Priority priority READ priority WRITE setPriority NOTIFY valueChanged)
+    Q_PROPERTY(QDeclarativeOrganizerTodoProgress::StatusType status READ status WRITE setStatus NOTIFY valueChanged)
     Q_PROPERTY(QDeclarativeOrganizerItemRecurrence* recurrence READ recurrence NOTIFY valueChanged)
 
 public:
@@ -316,8 +318,8 @@ class QDeclarativeOrganizerTodoOccurrence : public QDeclarativeOrganizerItem
     Q_PROPERTY(QDateTime startDateTime READ startDateTime WRITE setStartDateTime NOTIFY valueChanged)
     Q_PROPERTY(QDateTime dueDateTime READ dueDateTime WRITE setDueDateTime NOTIFY valueChanged)
     Q_PROPERTY(QDateTime finishedDateTime READ finishedDateTime WRITE setFinishedDateTime NOTIFY valueChanged)
-    Q_PROPERTY(QtOrganizer::QDeclarativeOrganizerItemPriority::Priority priority READ priority WRITE setPriority NOTIFY valueChanged)
-    Q_PROPERTY(QtOrganizer::QDeclarativeOrganizerTodoProgress::StatusType status READ status WRITE setStatus NOTIFY valueChanged)
+    Q_PROPERTY(QDeclarativeOrganizerItemPriority::Priority priority READ priority WRITE setPriority NOTIFY valueChanged)
+    Q_PROPERTY(QDeclarativeOrganizerTodoProgress::StatusType status READ status WRITE setStatus NOTIFY valueChanged)
     Q_PROPERTY(QString parentId READ parentId WRITE setParentId NOTIFY valueChanged)
 
 public:
@@ -354,9 +356,7 @@ Q_SIGNALS:
     void valueChanged();
 };
 
-QT_END_NAMESPACE_ORGANIZER
-
-QTORGANIZER_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeOrganizerItem)
 QML_DECLARE_TYPE(QDeclarativeOrganizerEvent)
diff --git a/src/imports/organizer/qdeclarativeorganizeritemdetail.cpp b/src/imports/organizer/qdeclarativeorganizeritemdetail.cpp
index 7103b379a..b72c4a7b2 100644
--- a/src/imports/organizer/qdeclarativeorganizeritemdetail.cpp
+++ b/src/imports/organizer/qdeclarativeorganizeritemdetail.cpp
@@ -44,7 +44,9 @@
 #include <qorganizeritemdetails.h>
 #include <qorganizeritemid.h>
 
-QT_BEGIN_NAMESPACE_ORGANIZER
+QTORGANIZER_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype Detail
@@ -373,7 +375,7 @@ QString QDeclarativeOrganizerItemDescription::description() const
 
 
 /*!
-    \qmltype QtOrganizer::DisplayLabel
+    \qmltype DisplayLabel
     \instantiates QDeclarativeOrganizerItemDisplayLabel
     \brief The DisplayLabel element contains the display label of an organizer item.
     \inqmlmodule QtOrganizer 5.0
@@ -2434,4 +2436,4 @@ QDeclarativeOrganizerItemDetail *QDeclarativeOrganizerItemDetailFactory::createI
 
 #include "moc_qdeclarativeorganizeritemdetail_p.cpp"
 
-QT_END_NAMESPACE_ORGANIZER
+QT_END_NAMESPACE
diff --git a/src/imports/organizer/qdeclarativeorganizeritemdetail_p.h b/src/imports/organizer/qdeclarativeorganizeritemdetail_p.h
index 6557deb9d..21d9fb586 100644
--- a/src/imports/organizer/qdeclarativeorganizeritemdetail_p.h
+++ b/src/imports/organizer/qdeclarativeorganizeritemdetail_p.h
@@ -45,7 +45,9 @@
 #include <qorganizeritemdetails.h>
 #include "qdeclarativeorganizerrecurrencerule_p.h"
 
-QT_BEGIN_NAMESPACE_ORGANIZER
+QTORGANIZER_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeOrganizerItemDetail : public QObject
 {
@@ -839,8 +841,8 @@ Q_SIGNALS:
 class QDeclarativeOrganizerEventRsvp : public QDeclarativeOrganizerItemDetail
 {
     Q_OBJECT
-    Q_PROPERTY(QtOrganizer::QDeclarativeOrganizerEventAttendee::ParticipationStatus participationStatus READ participationStatus WRITE setParticipationStatus NOTIFY valueChanged)
-    Q_PROPERTY(QtOrganizer::QDeclarativeOrganizerEventAttendee::ParticipationRole participationRole READ participationRole WRITE setParticipationRole NOTIFY valueChanged)
+    Q_PROPERTY(QDeclarativeOrganizerEventAttendee::ParticipationStatus participationStatus READ participationStatus WRITE setParticipationStatus NOTIFY valueChanged)
+    Q_PROPERTY(QDeclarativeOrganizerEventAttendee::ParticipationRole participationRole READ participationRole WRITE setParticipationRole NOTIFY valueChanged)
     Q_PROPERTY(ResponseRequirement responseRequirement READ responseRequirement WRITE setResponseRequirement NOTIFY valueChanged)
     Q_PROPERTY(QDateTime responseDeadline READ responseDeadline WRITE setResponseDeadline NOTIFY valueChanged)
     Q_PROPERTY(QDateTime responseDate READ responseDate WRITE setResponseDate NOTIFY valueChanged)
@@ -961,9 +963,7 @@ public:
     static QDeclarativeOrganizerItemDetail *createItemDetail(QDeclarativeOrganizerItemDetail::DetailType type);
 };
 
-QT_END_NAMESPACE_ORGANIZER
-
-QTORGANIZER_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeOrganizerItemDetail)
 QML_DECLARE_TYPE(QDeclarativeOrganizerEventTime)
diff --git a/src/imports/organizer/qdeclarativeorganizeritemfetchhint.cpp b/src/imports/organizer/qdeclarativeorganizeritemfetchhint.cpp
index 2d280a256..d47a0d3a7 100644
--- a/src/imports/organizer/qdeclarativeorganizeritemfetchhint.cpp
+++ b/src/imports/organizer/qdeclarativeorganizeritemfetchhint.cpp
@@ -41,10 +41,12 @@
 
 #include "qdeclarativeorganizeritemfetchhint_p.h"
 
-QT_BEGIN_NAMESPACE_ORGANIZER
+QTORGANIZER_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 /*!
-    \qmltype QtOrganizer::FetchHint
+    \qmltype FetchHint
     \instantiates QDeclarativeOrganizerItemFetchHint
     \brief The FetchHint element provides hints to the manager about which organizer item
            information needs to be retrieved in an asynchronous fetch request or a synchronous
@@ -116,4 +118,4 @@ void QDeclarativeOrganizerItemFetchHint::setFetchHint(const QOrganizerItemFetchH
 
 #include "moc_qdeclarativeorganizeritemfetchhint_p.cpp"
 
-QT_END_NAMESPACE_ORGANIZER
+QT_END_NAMESPACE
diff --git a/src/imports/organizer/qdeclarativeorganizeritemfetchhint_p.h b/src/imports/organizer/qdeclarativeorganizeritemfetchhint_p.h
index 172379b7e..e09951d62 100644
--- a/src/imports/organizer/qdeclarativeorganizeritemfetchhint_p.h
+++ b/src/imports/organizer/qdeclarativeorganizeritemfetchhint_p.h
@@ -45,7 +45,9 @@
 #include <qorganizeritemfetchhint.h>
 #include <QtQml/qqml.h>
 
-QT_BEGIN_NAMESPACE_ORGANIZER
+QTORGANIZER_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeOrganizerItemFetchHint : public QObject
 {
@@ -79,9 +81,7 @@ private:
     QOrganizerItemFetchHint d;
 };
 
-QT_END_NAMESPACE_ORGANIZER
-
-QTORGANIZER_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeOrganizerItemFetchHint)
 
diff --git a/src/imports/organizer/qdeclarativeorganizeritemfilter.cpp b/src/imports/organizer/qdeclarativeorganizeritemfilter.cpp
index f16cd236c..f090c49bb 100644
--- a/src/imports/organizer/qdeclarativeorganizeritemfilter.cpp
+++ b/src/imports/organizer/qdeclarativeorganizeritemfilter.cpp
@@ -41,7 +41,9 @@
 
 #include "qdeclarativeorganizeritemfilter_p.h"
 
-QT_BEGIN_NAMESPACE_ORGANIZER
+QTORGANIZER_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype Filter
@@ -923,4 +925,4 @@ QOrganizerItemFilter QDeclarativeOrganizerItemIdFilter::filter() const
 
 #include "moc_qdeclarativeorganizeritemfilter_p.cpp"
 
-QT_END_NAMESPACE_ORGANIZER
+QT_END_NAMESPACE
diff --git a/src/imports/organizer/qdeclarativeorganizeritemfilter_p.h b/src/imports/organizer/qdeclarativeorganizeritemfilter_p.h
index 077b3ae50..ab76668e0 100644
--- a/src/imports/organizer/qdeclarativeorganizeritemfilter_p.h
+++ b/src/imports/organizer/qdeclarativeorganizeritemfilter_p.h
@@ -45,7 +45,9 @@
 #include "qdeclarativeorganizeritemdetail_p.h"
 #include <qorganizeritemfilters.h>
 
-QT_BEGIN_NAMESPACE_ORGANIZER
+QTORGANIZER_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeOrganizerItemFilter : public QObject
 {
@@ -207,9 +209,9 @@ class QDeclarativeOrganizerItemDetailFieldFilter : public QDeclarativeOrganizerI
 {
     Q_OBJECT
     Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged)
-    Q_PROPERTY(QtOrganizer::QDeclarativeOrganizerItemFilter::MatchFlags matchFlags READ matchFlags WRITE setMatchFlags NOTIFY valueChanged)
+    Q_PROPERTY(QDeclarativeOrganizerItemFilter::MatchFlags matchFlags READ matchFlags WRITE setMatchFlags NOTIFY valueChanged)
     Q_PROPERTY(int field READ field WRITE setField NOTIFY valueChanged)
-    Q_PROPERTY(QtOrganizer::QDeclarativeOrganizerItemDetail::DetailType detail READ detail WRITE setDetail NOTIFY valueChanged)
+    Q_PROPERTY(QDeclarativeOrganizerItemDetail::DetailType detail READ detail WRITE setDetail NOTIFY valueChanged)
     Q_INTERFACES(QQmlParserStatus)
 
 public:
@@ -254,9 +256,9 @@ class QDeclarativeOrganizerItemDetailRangeFilter : public QDeclarativeOrganizerI
     Q_FLAGS(RangeFlags)
     Q_PROPERTY(QVariant min READ minValue WRITE setMinValue NOTIFY valueChanged)
     Q_PROPERTY(QVariant max READ maxValue WRITE setMaxValue NOTIFY valueChanged)
-    Q_PROPERTY(QtOrganizer::QDeclarativeOrganizerItemFilter::MatchFlags matchFlags READ matchFlags WRITE setMatchFlags NOTIFY valueChanged)
+    Q_PROPERTY(QDeclarativeOrganizerItemFilter::MatchFlags matchFlags READ matchFlags WRITE setMatchFlags NOTIFY valueChanged)
     Q_PROPERTY(RangeFlags rangeFlags READ rangeFlags WRITE setRangeFlags NOTIFY valueChanged)
-    Q_PROPERTY(QtOrganizer::QDeclarativeOrganizerItemDetail::DetailType detail READ detail WRITE setDetail NOTIFY valueChanged)
+    Q_PROPERTY(QDeclarativeOrganizerItemDetail::DetailType detail READ detail WRITE setDetail NOTIFY valueChanged)
     Q_PROPERTY(int field READ field WRITE setField NOTIFY valueChanged)
     Q_INTERFACES(QQmlParserStatus)
 
@@ -331,9 +333,7 @@ private:
     QStringList m_ids;
 };
 
-QT_END_NAMESPACE_ORGANIZER
-
-QTORGANIZER_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeOrganizerItemFilter)
 QML_DECLARE_TYPE(QDeclarativeOrganizerItemInvalidFilter)
diff --git a/src/imports/organizer/qdeclarativeorganizeritemsortorder.cpp b/src/imports/organizer/qdeclarativeorganizeritemsortorder.cpp
index 108d64b21..b3005bae4 100644
--- a/src/imports/organizer/qdeclarativeorganizeritemsortorder.cpp
+++ b/src/imports/organizer/qdeclarativeorganizeritemsortorder.cpp
@@ -41,7 +41,9 @@
 
 #include "qdeclarativeorganizeritemsortorder_p.h"
 
-QT_BEGIN_NAMESPACE_ORGANIZER
+QTORGANIZER_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype SortOrder
@@ -208,4 +210,4 @@ void QDeclarativeOrganizerItemSortOrder::setDetailDefinitionName()
 
 #include "moc_qdeclarativeorganizeritemsortorder_p.cpp"
 
-QT_END_NAMESPACE_ORGANIZER
+QT_END_NAMESPACE
diff --git a/src/imports/organizer/qdeclarativeorganizeritemsortorder_p.h b/src/imports/organizer/qdeclarativeorganizeritemsortorder_p.h
index 24a0cc1cc..2055e70df 100644
--- a/src/imports/organizer/qdeclarativeorganizeritemsortorder_p.h
+++ b/src/imports/organizer/qdeclarativeorganizeritemsortorder_p.h
@@ -47,12 +47,14 @@
 #include <QtQml/qqml.h>
 #include <QtQml/qqmlparserstatus.h>
 
-QT_BEGIN_NAMESPACE_ORGANIZER
+QTORGANIZER_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeOrganizerItemSortOrder : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
-    Q_PROPERTY(QtOrganizer::QDeclarativeOrganizerItemDetail::DetailType detail READ detail WRITE setDetail NOTIFY sortOrderChanged)
+    Q_PROPERTY(QDeclarativeOrganizerItemDetail::DetailType detail READ detail WRITE setDetail NOTIFY sortOrderChanged)
     Q_PROPERTY(int field READ field WRITE setField NOTIFY sortOrderChanged)
     Q_PROPERTY(BlankPolicy blankPolicy READ blankPolicy WRITE setBlankPolicy NOTIFY sortOrderChanged)
     Q_PROPERTY(Qt::SortOrder direction READ direction WRITE setDirection NOTIFY sortOrderChanged)
@@ -102,9 +104,7 @@ private:
     QOrganizerItemSortOrder d;
 };
 
-QT_END_NAMESPACE_ORGANIZER
-
-QTORGANIZER_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeOrganizerItemSortOrder)
 
diff --git a/src/imports/organizer/qdeclarativeorganizermodel.cpp b/src/imports/organizer/qdeclarativeorganizermodel.cpp
index 3b9b90a35..f7ec3ede0 100644
--- a/src/imports/organizer/qdeclarativeorganizermodel.cpp
+++ b/src/imports/organizer/qdeclarativeorganizermodel.cpp
@@ -53,9 +53,10 @@
 #include <QtCore/qmath.h>
 
 
+QTORGANIZER_USE_NAMESPACE
 QTVERSITORGANIZER_USE_NAMESPACE
 
-QT_BEGIN_NAMESPACE_ORGANIZER
+QT_BEGIN_NAMESPACE
 
 // TODO:
 // - Improve handling of itemsModified signal. Instead of fetching all items each time the
@@ -1831,4 +1832,4 @@ QDeclarativeOrganizerCollection* QDeclarativeOrganizerModel::collection_at(QQmlL
 
 #include "moc_qdeclarativeorganizermodel_p.cpp"
 
-QT_END_NAMESPACE_ORGANIZER
+QT_END_NAMESPACE
diff --git a/src/imports/organizer/qdeclarativeorganizermodel_p.h b/src/imports/organizer/qdeclarativeorganizermodel_p.h
index fd1d0b634..d97c9ad5a 100644
--- a/src/imports/organizer/qdeclarativeorganizermodel_p.h
+++ b/src/imports/organizer/qdeclarativeorganizermodel_p.h
@@ -62,9 +62,10 @@ class QVersitReader;
 class QVersitWriter;
 QT_END_NAMESPACE_VERSIT
 
+QTORGANIZER_USE_NAMESPACE
 QTVERSIT_USE_NAMESPACE
 
-QT_BEGIN_NAMESPACE_ORGANIZER
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeOrganizerModelPrivate;
 class QDeclarativeOrganizerModel : public QAbstractListModel, public QQmlParserStatus
@@ -242,9 +243,7 @@ private:
     Q_DECLARE_PRIVATE(QDeclarativeOrganizerModel)
 };
 
-QT_END_NAMESPACE_ORGANIZER
-
-QTORGANIZER_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeOrganizerModel)
 
diff --git a/src/imports/organizer/qdeclarativeorganizerrecurrencerule.cpp b/src/imports/organizer/qdeclarativeorganizerrecurrencerule.cpp
index 4ad1445d7..02dead513 100644
--- a/src/imports/organizer/qdeclarativeorganizerrecurrencerule.cpp
+++ b/src/imports/organizer/qdeclarativeorganizerrecurrencerule.cpp
@@ -42,7 +42,9 @@
 #include "qdeclarativeorganizerrecurrencerule_p.h"
 #include <QtQml/qqmlinfo.h>
 
-QT_BEGIN_NAMESPACE_ORGANIZER
+QTORGANIZER_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype RecurrenceRule
@@ -354,4 +356,4 @@ void QDeclarativeOrganizerRecurrenceRule::setRule(const QOrganizerRecurrenceRule
 
 #include "moc_qdeclarativeorganizerrecurrencerule_p.cpp"
 
-QT_END_NAMESPACE_ORGANIZER
+QT_END_NAMESPACE
diff --git a/src/imports/organizer/qdeclarativeorganizerrecurrencerule_p.h b/src/imports/organizer/qdeclarativeorganizerrecurrencerule_p.h
index 8b838bc22..4302ee354 100644
--- a/src/imports/organizer/qdeclarativeorganizerrecurrencerule_p.h
+++ b/src/imports/organizer/qdeclarativeorganizerrecurrencerule_p.h
@@ -45,7 +45,9 @@
 #include <qorganizerrecurrencerule.h>
 #include <QtQml/qqml.h>
 
-QT_BEGIN_NAMESPACE_ORGANIZER
+QTORGANIZER_USE_NAMESPACE
+
+QT_BEGIN_NAMESPACE
 
 class QDeclarativeOrganizerRecurrenceRule : public QObject
 {
@@ -129,9 +131,7 @@ private:
     QOrganizerRecurrenceRule m_rule;
 };
 
-QT_END_NAMESPACE_ORGANIZER
-
-QTORGANIZER_USE_NAMESPACE
+QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QDeclarativeOrganizerRecurrenceRule)