Finished changing the module name to QtDocGallery.

Change-Id: I2253ab3453fd5bb39870d9d6727aaec5f78f6e81
Reviewed-by: Xizhi Zhu <xizhi.zhu@gmail.com>

77 files changed, 186 insertions, 203 deletions

diff --git a/.gitignore b/.gitignore
index 7f1c37f..4712e59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -123,7 +123,7 @@ translations/*.qm
 translations/*_untranslated.ts
 qrc_*.cpp
 
-src/gallery/qtaddongalleryversion.h
+src/gallery/qtdocgalleryversion.h
 
 # Test generated files
 QObject.log
diff --git a/src/gallery/qabstractgallery.cpp b/src/gallery/qabstractgallery.cpp
index c70c414..be686ae 100644
--- a/src/gallery/qabstractgallery.cpp
+++ b/src/gallery/qabstractgallery.cpp
@@ -42,7 +42,7 @@
 #include "qabstractgallery.h"
 #include "qabstractgallery_p.h"
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 /*!
     \class QAbstractGallery
@@ -50,7 +50,7 @@ QT_ADDON_GALLERY_BEGIN_NAMESPACE
     \ingroup gallery
     \ingroup gallery-galleries
 
-    \inmodule QtAddOnGallery
+    \inmodule QtDocGallery
 
     \brief The QAbstractGallery class provides a base class for gallery
     implementations.
@@ -124,4 +124,4 @@ QAbstractGallery::~QAbstractGallery()
 
 #include "moc_qabstractgallery.cpp"
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
diff --git a/src/gallery/qabstractgallery.h b/src/gallery/qabstractgallery.h
index 4e4ec0d..a6b2ed9 100644
--- a/src/gallery/qabstractgallery.h
+++ b/src/gallery/qabstractgallery.h
@@ -44,7 +44,7 @@
 
 #include <qgalleryabstractrequest.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QAbstractGalleryPrivate;
 
@@ -67,6 +67,6 @@ protected:
     friend class QGalleryAbstractRequest;
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 #endif
diff --git a/src/gallery/qabstractgallery_p.h b/src/gallery/qabstractgallery_p.h
index 22fb1a3..cf3936c 100644
--- a/src/gallery/qabstractgallery_p.h
+++ b/src/gallery/qabstractgallery_p.h
@@ -53,7 +53,7 @@
 #ifndef QABSTRACTGALLERY_P_H
 #define QABSTRACTGALLERY_P_H
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QAbstractGallery;
 
@@ -72,6 +72,6 @@ public:
     QAbstractGallery *q_ptr;
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 #endif
diff --git a/src/gallery/qdocumentgallery.cpp b/src/gallery/qdocumentgallery.cpp
index 2149c32..e1805bf 100644
--- a/src/gallery/qdocumentgallery.cpp
+++ b/src/gallery/qdocumentgallery.cpp
@@ -44,7 +44,7 @@
 
 #include <QtCore/qstringlist.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 /*!
     \class QDocumentGallery
@@ -52,7 +52,7 @@ QT_ADDON_GALLERY_BEGIN_NAMESPACE
     \ingroup gallery
     \ingroup gallery-galleries
 
-    \inmodule QtAddOnGallery
+    \inmodule QtDocGallery
 
     \brief The QDocumentGallery class provides access to a gallery of documents
     and media present on a device.
@@ -975,4 +975,4 @@ QGalleryAbstractResponse *QDocumentGallery::createResponse(QGalleryAbstractReque
 
 #endif // QT_DOCUMENT_GALLERY_NULL
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
diff --git a/src/gallery/qdocumentgallery.h b/src/gallery/qdocumentgallery.h
index e3bc2ba..c3efeba 100644
--- a/src/gallery/qdocumentgallery.h
+++ b/src/gallery/qdocumentgallery.h
@@ -46,7 +46,7 @@
 #include <qgalleryproperty.h>
 #include <qgallerytype.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QDocumentGalleryPrivate;
 
@@ -175,6 +175,6 @@ private:
     Q_DECLARE_PRIVATE(QDocumentGallery)
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 #endif
diff --git a/src/gallery/qgalleryabstractrequest.cpp b/src/gallery/qgalleryabstractrequest.cpp
index d18add7..efe6873 100644
--- a/src/gallery/qgalleryabstractrequest.cpp
+++ b/src/gallery/qgalleryabstractrequest.cpp
@@ -43,7 +43,7 @@
 #include "qgalleryabstractrequest_p.h"
 #include <qabstractgallery.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 void QGalleryAbstractRequestPrivate::_q_finished()
 {
@@ -123,7 +123,7 @@ void QGalleryAbstractRequestPrivate::_q_progressChanged(int current, int maximum
     \ingroup gallery
     \ingroup gallery-requests
 
-    \inmodule QtAddOnGallery
+    \inmodule QtDocGallery
 
     \brief The QGalleryAbstractRequest class provides a base class for gallery
     requests.
@@ -579,4 +579,4 @@ void QGalleryAbstractRequest::clear()
 
 #include "moc_qgalleryabstractrequest.cpp"
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
diff --git a/src/gallery/qgalleryabstractrequest.h b/src/gallery/qgalleryabstractrequest.h
index 8a372bd..3899bf5 100644
--- a/src/gallery/qgalleryabstractrequest.h
+++ b/src/gallery/qgalleryabstractrequest.h
@@ -48,7 +48,7 @@
 #include <QtCore/qstringlist.h>
 
 QT_BEGIN_HEADER
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QAbstractGallery;
 class QGalleryAbstractResponse;
@@ -143,7 +143,7 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_progressChanged(int, int))
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 QT_END_HEADER
 
 #endif
diff --git a/src/gallery/qgalleryabstractrequest_p.h b/src/gallery/qgalleryabstractrequest_p.h
index 2ecab41..1bbdd63 100644
--- a/src/gallery/qgalleryabstractrequest_p.h
+++ b/src/gallery/qgalleryabstractrequest_p.h
@@ -61,7 +61,7 @@
 #include <QtCore/qsharedpointer.h>
 #include <QtCore/qpointer.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QGalleryAbstractRequestPrivate
 {
@@ -100,6 +100,6 @@ public:
     QString errorString;
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 #endif
diff --git a/src/gallery/qgalleryabstractresponse.cpp b/src/gallery/qgalleryabstractresponse.cpp
index 98c43d3..4ad651e 100644
--- a/src/gallery/qgalleryabstractresponse.cpp
+++ b/src/gallery/qgalleryabstractresponse.cpp
@@ -44,14 +44,14 @@
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qtimer.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 /*!
     \class QGalleryAbstractResponse
 
     \ingroup gallery
 
-    \inmodule QtAddOnGallery
+    \inmodule QtDocGallery
 
     \brief The QGalleryAbstractResponse class provides a base class for
     responses to gallery requests.
@@ -330,4 +330,4 @@ void QGalleryAbstractResponse::error(int error, const QString &errorString)
 
 #include "moc_qgalleryabstractresponse.cpp"
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
diff --git a/src/gallery/qgalleryabstractresponse.h b/src/gallery/qgalleryabstractresponse.h
index 666d8ba..004a80a 100644
--- a/src/gallery/qgalleryabstractresponse.h
+++ b/src/gallery/qgalleryabstractresponse.h
@@ -46,7 +46,7 @@
 
 #include <QtCore/qstringlist.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QGalleryAbstractResponsePrivate;
 
@@ -86,6 +86,6 @@ protected:
     QScopedPointer<QGalleryAbstractResponsePrivate> d_ptr;
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 #endif
diff --git a/src/gallery/qgalleryabstractresponse_p.h b/src/gallery/qgalleryabstractresponse_p.h
index efdd12d..1023f8a 100644
--- a/src/gallery/qgalleryabstractresponse_p.h
+++ b/src/gallery/qgalleryabstractresponse_p.h
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 class QEventLoop;
 QT_END_NAMESPACE
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QGalleryAbstractResponsePrivate
 {
@@ -81,6 +81,6 @@ public:
     QString errorString;
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 #endif
diff --git a/src/gallery/qgalleryfilter.cpp b/src/gallery/qgalleryfilter.cpp
index 544bd87..f24fdd1 100644
--- a/src/gallery/qgalleryfilter.cpp
+++ b/src/gallery/qgalleryfilter.cpp
@@ -45,7 +45,7 @@
 #include <QtCore/qstringlist.h>
 #include <QtCore/qurl.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QGalleryFilterPrivate : public QSharedData
 {
@@ -220,7 +220,7 @@ public:
     \ingroup gallery
     \ingroup gallery-filters
 
-    \inmodule QtAddOnGallery
+    \inmodule QtDocGallery
 
     \brief The QGalleryIntersectionFilter class provides a filter which matches
     the intersection of two or more meta-data filters.
@@ -511,7 +511,7 @@ QGalleryIntersectionFilter operator &&(
     \ingroup gallery
     \ingroup gallery-filters
 
-    \inmodule QtAddOnGallery
+    \inmodule QtDocGallery
 
     \brief The QGalleryUnionFilter class provides a filter which matches the
     union of two or more meta-data filters.
@@ -794,7 +794,7 @@ QGalleryUnionFilter operator ||(
     \ingroup gallery
     \ingroup gallery-filters
 
-    \inmodule QtAddOnGallery
+    \inmodule QtDocGallery
 
     \brief The QGalleryMetaDataFilter class provides a filter which accepts
     items with meta-data properties matching a specific value.
@@ -988,7 +988,7 @@ QGalleryMetaDataFilter QGalleryMetaDataFilter::operator !() const
     \ingroup gallery
     \ingroup gallery-filters
 
-    \inmodule QtAddOnGallery
+    \inmodule QtDocGallery
 
     \brief The QGalleryFilter class provides filtering criteria for gallery
     requests.
@@ -1195,4 +1195,4 @@ bool operator !=(const QGalleryFilter &filter1, const QGalleryFilter &filter2)
     return filter1.d != filter2.d && !filter1.d->isEqual(*filter2.d);
 }
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
diff --git a/src/gallery/qgalleryfilter.h b/src/gallery/qgalleryfilter.h
index 24029b3..d0d29ea 100644
--- a/src/gallery/qgalleryfilter.h
+++ b/src/gallery/qgalleryfilter.h
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
 class QDebug;
 QT_END_NAMESPACE
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QGalleryFilter;
 class QGalleryIntersectionFilter;
@@ -266,6 +266,6 @@ private:
     friend class QGalleryFilter;
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 #endif
diff --git a/src/gallery/qgalleryglobal.h b/src/gallery/qgalleryglobal.h
index 81684aa..63af3d5 100644
--- a/src/gallery/qgalleryglobal.h
+++ b/src/gallery/qgalleryglobal.h
@@ -39,24 +39,13 @@
 **
 ****************************************************************************/
 
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
 #ifndef QGALLERYGLOBAL_H
 #define QGALLERYGLOBAL_H
 
 #include <QtCore/qglobal.h>
 
 #ifndef QT_STATIC
-#  if defined(QT_BUILD_ADDON_GALLERY_LIB)
+#  if defined(QT_BUILD_DOCGALLERY_LIB)
 #    define Q_GALLERY_EXPORT Q_DECL_EXPORT
 #  else
 #    define Q_GALLERY_EXPORT Q_DECL_IMPORT
@@ -77,10 +66,4 @@
 #define QT_DOCGALLERY_PREPEND_NAMESPACE(name) ::QDocGallery::name
 #endif
 
-// compatibility with the older macros
-#define QT_ADDON_GALLERY_BEGIN_NAMESPACE QT_DOCGALLERY_BEGIN_NAMESPACE
-#define QT_ADDON_GALLERY_END_NAMESPACE QT_DOCGALLERY_END_NAMESPACE
-#define QT_ADDON_USE_GALLERY_NAMESPACE QT_USE_DOCGALLERY_NAMESPACE
-#define QT_ADDON_GELLERY_PREPEND_NAMESPACE(name) QT_DOCGALLERY_PREPEND_NAMESPACE(name)
-
 #endif // QGALLERYGLOBAL_H
diff --git a/src/gallery/qgalleryitemrequest.cpp b/src/gallery/qgalleryitemrequest.cpp
index a5847f9..5e3638e 100644
--- a/src/gallery/qgalleryitemrequest.cpp
+++ b/src/gallery/qgalleryitemrequest.cpp
@@ -45,7 +45,7 @@
 #include "qgallerynullresultset_p.h"
 #include "qgalleryresource.h"
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QGalleryItemRequestPrivate : public QGalleryAbstractRequestPrivate
 {
@@ -107,7 +107,7 @@ public:
     \ingroup gallery
     \ingroup gallery-requests
 
-    \inmodule QtAddOnGallery
+    \inmodule QtDocGallery
 
     \brief The QGalleryItemRequest class provides a request for the properties
     of a single item from a gallery.
@@ -430,4 +430,4 @@ void QGalleryItemRequest::setResponse(QGalleryAbstractResponse *response)
 
 #include "moc_qgalleryitemrequest.cpp"
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
diff --git a/src/gallery/qgalleryitemrequest.h b/src/gallery/qgalleryitemrequest.h
index 4eff72e..5df701d 100644
--- a/src/gallery/qgalleryitemrequest.h
+++ b/src/gallery/qgalleryitemrequest.h
@@ -48,7 +48,7 @@
 
 #include <QtCore/qurl.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QGalleryFilter;
 class QGalleryResultSet;
@@ -119,6 +119,6 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_metaDataChanged(int, int, const QList<int> &))
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 #endif
diff --git a/src/gallery/qgallerynullresultset_p.h b/src/gallery/qgallerynullresultset_p.h
index 84079f0..df4de62 100644
--- a/src/gallery/qgallerynullresultset_p.h
+++ b/src/gallery/qgallerynullresultset_p.h
@@ -55,7 +55,7 @@
 
 #include "qgalleryresultset.h"
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QGalleryNullResultSet : public QGalleryResultSet
 {
@@ -79,6 +79,6 @@ public:
     bool fetch(int) { return false; }
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 #endif
diff --git a/src/gallery/qgalleryproperty.h b/src/gallery/qgalleryproperty.h
index 2ae75ef..fce4921 100644
--- a/src/gallery/qgalleryproperty.h
+++ b/src/gallery/qgalleryproperty.h
@@ -46,7 +46,7 @@
 
 #include <QtCore/qstring.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 struct Q_GALLERY_EXPORT QGalleryProperty
 {
@@ -97,9 +97,9 @@ struct Q_GALLERY_EXPORT QGalleryProperty
     const int m_length;
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QGalleryProperty::Attributes))
+Q_DECLARE_OPERATORS_FOR_FLAGS(QT_DOCGALLERY_PREPEND_NAMESPACE(QGalleryProperty::Attributes))
 
 #define Q_DEFINE_GALLERY_PROPERTY(scope, name) const QGalleryProperty scope::name = {#name, sizeof(#name) - 1};
 
diff --git a/src/gallery/qgalleryproperty.qdoc b/src/gallery/qgalleryproperty.qdoc
index 557cf4b..aed9362 100644
--- a/src/gallery/qgalleryproperty.qdoc
+++ b/src/gallery/qgalleryproperty.qdoc
@@ -28,7 +28,7 @@
 /*!
     \class QGalleryProperty
 
-    \inmodule QtAddOnGallery
+    \inmodule QtDocGallery
 
     \brief The QGalleryProperty class provides a string constant identifying a
     gallery property.
diff --git a/src/gallery/qgalleryquerymodel.cpp b/src/gallery/qgalleryquerymodel.cpp
index 3501ddd..4cd66de 100644
--- a/src/gallery/qgalleryquerymodel.cpp
+++ b/src/gallery/qgalleryquerymodel.cpp
@@ -47,7 +47,7 @@
 #include <QtCore/qstringlist.h>
 #include <QtCore/qpointer.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QGalleryQueryModelPrivate
 {
@@ -280,7 +280,7 @@ void QGalleryQueryModelPrivate::_q_metaDataChanged(int index, int count, const Q
 
     \ingroup gallery
 
-    \inmodule QtAddOnGallery
+    \inmodule QtDocGallery
 
     \brief The QGalleryQueryModel class provides a model for the results of a
     gallery query.
@@ -980,4 +980,4 @@ Qt::ItemFlags QGalleryQueryModel::flags(const QModelIndex &index) const
 
 #include "moc_qgalleryquerymodel.cpp"
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
diff --git a/src/gallery/qgalleryquerymodel.h b/src/gallery/qgalleryquerymodel.h
index 31d9ee5..1d7c56e 100644
--- a/src/gallery/qgalleryquerymodel.h
+++ b/src/gallery/qgalleryquerymodel.h
@@ -46,7 +46,7 @@
 
 #include <QtCore/qabstractitemmodel.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QGalleryFilter;
 class QGalleryResultSet;
@@ -167,6 +167,6 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_metaDataChanged(int, int, const QList<int> &))
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 #endif
diff --git a/src/gallery/qgalleryqueryrequest.cpp b/src/gallery/qgalleryqueryrequest.cpp
index b95d441..94fdaa2 100644
--- a/src/gallery/qgalleryqueryrequest.cpp
+++ b/src/gallery/qgalleryqueryrequest.cpp
@@ -45,7 +45,7 @@
 #include "qgallerynullresultset_p.h"
 #include "qgalleryresource.h"
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QGalleryQueryRequestPrivate : public QGalleryAbstractRequestPrivate
 {
@@ -82,7 +82,7 @@ public:
     \ingroup gallery
     \ingroup gallery-requests
 
-    \inmodule QtAddOnGallery
+    \inmodule QtDocGallery
 
     \brief The QGalleryQueryRequest class provides a request for a set of
     items from a gallery.
@@ -691,4 +691,4 @@ void QGalleryQueryRequest::setResponse(QGalleryAbstractResponse *response)
 
 #include "moc_qgalleryqueryrequest.cpp"
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
diff --git a/src/gallery/qgalleryqueryrequest.h b/src/gallery/qgalleryqueryrequest.h
index 947e094..de02b85 100644
--- a/src/gallery/qgalleryqueryrequest.h
+++ b/src/gallery/qgalleryqueryrequest.h
@@ -47,7 +47,7 @@
 #include <qgalleryresource.h>
 #include <QtCore/qurl.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QGalleryFilter;
 class QGalleryResultSet;
@@ -161,6 +161,6 @@ private:
     Q_DECLARE_PRIVATE(QGalleryQueryRequest)
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 #endif
diff --git a/src/gallery/qgalleryresource.cpp b/src/gallery/qgalleryresource.cpp
index 3d5b11a..cda6386 100644
--- a/src/gallery/qgalleryresource.cpp
+++ b/src/gallery/qgalleryresource.cpp
@@ -41,14 +41,14 @@
 
 #include "qgalleryresource.h"
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 /*!
     \class QGalleryResource
 
     \ingroup gallery
 
-    \inmodule QtAddOnGallery
+    \inmodule QtDocGallery
 
     \brief The QGalleryResource class provides a resource identifier for a
     gallery item.
@@ -167,4 +167,4 @@ QVariant QGalleryResource::attribute(int key) const
     return m_attributes.value(key);
 }
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
diff --git a/src/gallery/qgalleryresource.h b/src/gallery/qgalleryresource.h
index 5fdb04c..e88c81b 100644
--- a/src/gallery/qgalleryresource.h
+++ b/src/gallery/qgalleryresource.h
@@ -47,7 +47,7 @@
 #include <QtCore/qurl.h>
 #include <QtCore/qvariant.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class Q_GALLERY_EXPORT QGalleryResource
 {
@@ -73,6 +73,6 @@ private:
     QMap<int, QVariant> m_attributes;
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 #endif
diff --git a/src/gallery/qgalleryresultset.cpp b/src/gallery/qgalleryresultset.cpp
index b983945..e24b389 100644
--- a/src/gallery/qgalleryresultset.cpp
+++ b/src/gallery/qgalleryresultset.cpp
@@ -43,14 +43,14 @@
 
 #include "qgalleryresource.h"
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 /*!
     \class QGalleryResultSet
 
     \ingroup gallery
 
-    \inmodule QtAddOnGallery
+    \inmodule QtDocGallery
 
     \brief The QGalleryResultSet class provides a gallery response which returns
     the results of a query.
@@ -324,4 +324,4 @@ bool QGalleryResultSet::fetchLast()
 
 #include "moc_qgalleryresultset.cpp"
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
diff --git a/src/gallery/qgalleryresultset.h b/src/gallery/qgalleryresultset.h
index a93c610..26c248a 100644
--- a/src/gallery/qgalleryresultset.h
+++ b/src/gallery/qgalleryresultset.h
@@ -50,7 +50,7 @@
 #include <QtCore/qurl.h>
 #include <QtCore/qvariant.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QGalleryResource;
 
@@ -100,6 +100,6 @@ protected:
     QGalleryResultSet(QGalleryResultSetPrivate &dd, QObject *parent);
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 #endif
diff --git a/src/gallery/qgalleryresultset_p.h b/src/gallery/qgalleryresultset_p.h
index abacd93..ad5a0f1 100644
--- a/src/gallery/qgalleryresultset_p.h
+++ b/src/gallery/qgalleryresultset_p.h
@@ -57,7 +57,7 @@
 
 #include "qgalleryabstractresponse_p.h"
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QGalleryResultSetPrivate : public QGalleryAbstractResponsePrivate
 {
@@ -69,6 +69,6 @@ public:
     virtual ~QGalleryResultSetPrivate() {}
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 #endif
diff --git a/src/gallery/qgallerytype.h b/src/gallery/qgallerytype.h
index 3364a23..020ab6b 100644
--- a/src/gallery/qgallerytype.h
+++ b/src/gallery/qgallerytype.h
@@ -46,7 +46,7 @@
 
 #include <QtCore/qstring.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 struct Q_GALLERY_EXPORT QGalleryType
 {
@@ -60,6 +60,6 @@ struct Q_GALLERY_EXPORT QGalleryType
 
 #define Q_DEFINE_GALLERY_TYPE(scope, name) const QGalleryType scope::name = {#name, sizeof(#name) - 1};
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 #endif
diff --git a/src/gallery/qgallerytype.qdoc b/src/gallery/qgallerytype.qdoc
index 24a1877..b8a04d4 100644
--- a/src/gallery/qgallerytype.qdoc
+++ b/src/gallery/qgallerytype.qdoc
@@ -30,7 +30,7 @@
 
     \ingroup gallery
 
-    \inmodule QtAddOnGallery
+    \inmodule QtDocGallery
 
     \brief The QGalleryType class provides a string constant identifying a
     gallery item type.
diff --git a/src/gallery/qgallerytyperequest.cpp b/src/gallery/qgallerytyperequest.cpp
index 8c1ef84..9318fd8 100644
--- a/src/gallery/qgallerytyperequest.cpp
+++ b/src/gallery/qgallerytyperequest.cpp
@@ -45,7 +45,7 @@
 #include "qgallerynullresultset_p.h"
 #include "qgalleryresource.h"
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QGalleryTypeRequestPrivate : public QGalleryAbstractRequestPrivate
 {
@@ -107,7 +107,7 @@ public:
     \ingroup gallery
     \ingroup gallery-requests
 
-    \inmodule QtAddOnGallery
+    \inmodule QtDocGallery
 
     \brief The QGalleryTypeRequest class provides an interface for requesting
     the properties of a type from a gallery.
@@ -377,4 +377,4 @@ void QGalleryTypeRequest::setResponse(QGalleryAbstractResponse *response)
 
 #include "moc_qgallerytyperequest.cpp"
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
diff --git a/src/gallery/qgallerytyperequest.h b/src/gallery/qgallerytyperequest.h
index 4000cdb..7e3ab4e 100644
--- a/src/gallery/qgallerytyperequest.h
+++ b/src/gallery/qgallerytyperequest.h
@@ -46,7 +46,7 @@
 
 #include <qgalleryproperty.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QGalleryFilter;
 class QGalleryResource;
@@ -108,6 +108,6 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_metaDataChanged(int, int, const QList<int> &))
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 #endif
diff --git a/src/gallery/simulator/docgalleryconnection_simulator.cpp b/src/gallery/simulator/docgalleryconnection_simulator.cpp
index 17a127a..fddb00c 100644
--- a/src/gallery/simulator/docgalleryconnection_simulator.cpp
+++ b/src/gallery/simulator/docgalleryconnection_simulator.cpp
@@ -46,7 +46,7 @@
 
 #include <QtNetwork/QLocalSocket>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 using namespace QtSimulatorPrivate;
 
@@ -119,4 +119,4 @@ DocGallerySimulatorData DocGalleryConnection::galleryData() const
 #include "moc_docgalleryconnection_simulator.cpp"
 }
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
diff --git a/src/gallery/simulator/docgalleryconnection_simulator.h b/src/gallery/simulator/docgalleryconnection_simulator.h
index 8025fac..d865f8e 100644
--- a/src/gallery/simulator/docgalleryconnection_simulator.h
+++ b/src/gallery/simulator/docgalleryconnection_simulator.h
@@ -62,7 +62,7 @@ QT_BEGIN_HEADER
 
 class QLocalSocket;
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 namespace Simulator {
 class MobilityConnection;
@@ -92,7 +92,7 @@ private:
 };
 }
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 QT_END_HEADER
 
 #endif // DOCGALLERYCONNECTION_SIMULATOR_P_H
diff --git a/src/gallery/simulator/docgallerysimulatordata.cpp b/src/gallery/simulator/docgallerysimulatordata.cpp
index 9af4c95..5d0bff5 100644
--- a/src/gallery/simulator/docgallerysimulatordata.cpp
+++ b/src/gallery/simulator/docgallerysimulatordata.cpp
@@ -41,7 +41,7 @@
 
 #include "docgallerysimulatordata.h"
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 void qt_registerDocGalleryTypes()
 {
@@ -84,4 +84,4 @@ QDataStream &operator>>(QDataStream &in, DocGalleryImageItem &i)
     return in;
 }
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
diff --git a/src/gallery/simulator/docgallerysimulatordata.h b/src/gallery/simulator/docgallerysimulatordata.h
index 013d6e9..48ba34f 100644
--- a/src/gallery/simulator/docgallerysimulatordata.h
+++ b/src/gallery/simulator/docgallerysimulatordata.h
@@ -58,7 +58,7 @@
 #include <QtCore/QString>
 #include <QtCore/QMetaType>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 struct DocGalleryImageItem
 {
     QString fileName;
@@ -80,7 +80,7 @@ struct DocGallerySimulatorData
 };
 
 void qt_registerDocGalleryTypes();
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 Q_DECLARE_METATYPE(Qt::DocGallerySimulatorData)
 
diff --git a/src/gallery/simulator/qdocumentgallery_simulator.cpp b/src/gallery/simulator/qdocumentgallery_simulator.cpp
index 593d854..8af5d61 100644
--- a/src/gallery/simulator/qdocumentgallery_simulator.cpp
+++ b/src/gallery/simulator/qdocumentgallery_simulator.cpp
@@ -56,7 +56,7 @@
 
 Q_DECLARE_METATYPE(QVector<QStringList>)
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 using namespace Simulator;
 
@@ -134,4 +134,4 @@ QGalleryAbstractResponse *QDocumentGallery::createResponse(QGalleryAbstractReque
     }
 }
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
diff --git a/src/gallery/simulator/qsimulatorgalleryresultset.cpp b/src/gallery/simulator/qsimulatorgalleryresultset.cpp
index 3375112..36cddfd 100644
--- a/src/gallery/simulator/qsimulatorgalleryresultset.cpp
+++ b/src/gallery/simulator/qsimulatorgalleryresultset.cpp
@@ -45,7 +45,7 @@
 
 #include <QtCore/QDateTime>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 namespace Utility {
 enum PropertyKeys {
@@ -261,4 +261,4 @@ QFileInfo QSimulatorGalleryResultSet::currentFileInfo() const
         return QFileInfo(filePath);
 }
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
diff --git a/src/gallery/simulator/qsimulatorgalleryresultset_p.h b/src/gallery/simulator/qsimulatorgalleryresultset_p.h
index 48fd95b..c4d5cbe 100644
--- a/src/gallery/simulator/qsimulatorgalleryresultset_p.h
+++ b/src/gallery/simulator/qsimulatorgalleryresultset_p.h
@@ -62,7 +62,7 @@
 #include <QtCore/QFileInfo>
 #include <QtGui/QImage>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QSimulatorGalleryResultSet  : public QGalleryResultSet
 {
@@ -107,6 +107,6 @@ private:
     int mCurrentIndex;
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 #endif // QSIMULATORGALLERYRESULTSET_H
diff --git a/src/gallery/tracker/qdocumentgallery_tracker.cpp b/src/gallery/tracker/qdocumentgallery_tracker.cpp
index f09186c..82cdb8d 100644
--- a/src/gallery/tracker/qdocumentgallery_tracker.cpp
+++ b/src/gallery/tracker/qdocumentgallery_tracker.cpp
@@ -79,7 +79,7 @@ Q_DECLARE_METATYPE(QVector<QStringList>)
 Q_DECLARE_METATYPE(QGalleryTrackerGraphUpdate)
 Q_DECLARE_METATYPE(QVector<QGalleryTrackerGraphUpdate>)
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QDocumentGalleryPrivate : public QAbstractGalleryPrivate, public QGalleryDBusInterfaceFactory
 {
@@ -368,4 +368,4 @@ QGalleryAbstractResponse *QDocumentGallery::createResponse(QGalleryAbstractReque
     }
 }
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
diff --git a/src/gallery/tracker/qgallerydbusinterface_p.h b/src/gallery/tracker/qgallerydbusinterface_p.h
index 45ed391..f64dddf 100644
--- a/src/gallery/tracker/qgallerydbusinterface_p.h
+++ b/src/gallery/tracker/qgallerydbusinterface_p.h
@@ -66,7 +66,7 @@ struct QGalleryTrackerGraphUpdate
     int object;
 };
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QGalleryDBusInterface : public QDBusAbstractInterface, public QSharedData
 {
@@ -112,6 +112,6 @@ public:
     virtual QGalleryDBusInterfacePointer statisticsInterface() = 0;
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 #endif
diff --git a/src/gallery/tracker/qgallerytrackerchangenotifier.cpp b/src/gallery/tracker/qgallerytrackerchangenotifier.cpp
index 28a3982..cec4b6a 100644
--- a/src/gallery/tracker/qgallerytrackerchangenotifier.cpp
+++ b/src/gallery/tracker/qgallerytrackerchangenotifier.cpp
@@ -44,7 +44,7 @@
 #include "qgallerytrackerschema_p.h"
 #include <QtCore/qdebug.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 QGalleryTrackerChangeNotifier::QGalleryTrackerChangeNotifier(
         const QString &service,
@@ -79,4 +79,4 @@ void QGalleryTrackerChangeNotifier::graphUpdated(
     }
 }
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
diff --git a/src/gallery/tracker/qgallerytrackerchangenotifier_p.h b/src/gallery/tracker/qgallerytrackerchangenotifier_p.h
index 3ce809a..4131f29 100644
--- a/src/gallery/tracker/qgallerytrackerchangenotifier_p.h
+++ b/src/gallery/tracker/qgallerytrackerchangenotifier_p.h
@@ -57,7 +57,7 @@
 
 #include <QtCore/qobject.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QGalleryTrackerChangeNotifier : public QObject
 {
@@ -85,6 +85,6 @@ private:
     QString m_service;
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 #endif
diff --git a/src/gallery/tracker/qgallerytrackereditableresultset.cpp b/src/gallery/tracker/qgallerytrackereditableresultset.cpp
index 35bf505..4fc2a48 100644
--- a/src/gallery/tracker/qgallerytrackereditableresultset.cpp
+++ b/src/gallery/tracker/qgallerytrackereditableresultset.cpp
@@ -49,7 +49,7 @@
 
 Q_DECLARE_METATYPE(QVector<QStringList>)
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QGalleryTrackerEditableResultSetPrivate : public QGalleryTrackerResultSetPrivate
 {
@@ -136,6 +136,6 @@ bool QGalleryTrackerEditableResultSet::setMetaData(int key, const QVariant &valu
     return true;
 }
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 #include "moc_qgallerytrackereditableresultset_p.cpp"
diff --git a/src/gallery/tracker/qgallerytrackereditableresultset_p.h b/src/gallery/tracker/qgallerytrackereditableresultset_p.h
index a1af951..ae80913 100644
--- a/src/gallery/tracker/qgallerytrackereditableresultset_p.h
+++ b/src/gallery/tracker/qgallerytrackereditableresultset_p.h
@@ -55,7 +55,7 @@
 
 #include "qgallerytrackerresultset_p.h"
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QGalleryTrackerMetaDataEdit;
 
@@ -79,6 +79,6 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_editFinished(QGalleryTrackerMetaDataEdit *))
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 #endif
diff --git a/src/gallery/tracker/qgallerytrackerlistcolumn.cpp b/src/gallery/tracker/qgallerytrackerlistcolumn.cpp
index e6c219b..b97333d 100644
--- a/src/gallery/tracker/qgallerytrackerlistcolumn.cpp
+++ b/src/gallery/tracker/qgallerytrackerlistcolumn.cpp
@@ -48,7 +48,7 @@
 #include <QtCore/qurl.h>
 #include <QtCore/qvariant.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 QVariant QGalleryTrackerStringColumn::toVariant(const QString &string) const
 {
@@ -160,4 +160,4 @@ QGalleryTrackerCompositeColumn *QGalleryTrackerFileExtensionColumn::create(const
     return new QGalleryTrackerFileExtensionColumn(QGALLERYTRACKERFILEURLCOLUMN_DEFAULT_COL);
 }
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
diff --git a/src/gallery/tracker/qgallerytrackerlistcolumn_p.h b/src/gallery/tracker/qgallerytrackerlistcolumn_p.h
index da737b2..23922d9 100644
--- a/src/gallery/tracker/qgallerytrackerlistcolumn_p.h
+++ b/src/gallery/tracker/qgallerytrackerlistcolumn_p.h
@@ -60,7 +60,7 @@
 #include <QtCore/qvector.h>
 
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QGalleryTrackerValueColumn
 {
@@ -198,6 +198,6 @@ private:
     const int m_column;
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 #endif
diff --git a/src/gallery/tracker/qgallerytrackermetadataedit.cpp b/src/gallery/tracker/qgallerytrackermetadataedit.cpp
index 28650f8..24732a7 100644
--- a/src/gallery/tracker/qgallerytrackermetadataedit.cpp
+++ b/src/gallery/tracker/qgallerytrackermetadataedit.cpp
@@ -43,7 +43,7 @@
 
 #include <QtDBus/qdbuspendingcall.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 QGalleryTrackerMetaDataEdit::QGalleryTrackerMetaDataEdit(
         const QGalleryDBusInterfacePointer &metaDataInterface,
@@ -126,4 +126,4 @@ void QGalleryTrackerMetaDataEdit::itemsRemoved(int index, int count)
         m_index = -1;
 }
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
diff --git a/src/gallery/tracker/qgallerytrackermetadataedit_p.h b/src/gallery/tracker/qgallerytrackermetadataedit_p.h
index 8f07b12..ee2ffce 100644
--- a/src/gallery/tracker/qgallerytrackermetadataedit_p.h
+++ b/src/gallery/tracker/qgallerytrackermetadataedit_p.h
@@ -58,7 +58,7 @@
 
 #include <QtCore/qstringlist.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QGalleryTrackerMetaDataEdit : public QObject
 {
@@ -103,6 +103,6 @@ private:
     QMap<QString, QString> m_oldValues;
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 #endif
diff --git a/src/gallery/tracker/qgallerytrackerresultset.cpp b/src/gallery/tracker/qgallerytrackerresultset.cpp
index 3137f2f..b534cc5 100644
--- a/src/gallery/tracker/qgallerytrackerresultset.cpp
+++ b/src/gallery/tracker/qgallerytrackerresultset.cpp
@@ -51,7 +51,7 @@
 
 Q_DECLARE_METATYPE(QVector<QStringList>)
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QGalleryTrackerResultSetParser
 {
@@ -748,6 +748,6 @@ void QGalleryTrackerResultSet::refresh(int updateId)
     }
 }
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 #include "moc_qgallerytrackerresultset_p.cpp"
diff --git a/src/gallery/tracker/qgallerytrackerresultset_p.h b/src/gallery/tracker/qgallerytrackerresultset_p.h
index cf09b38..08fa524 100644
--- a/src/gallery/tracker/qgallerytrackerresultset_p.h
+++ b/src/gallery/tracker/qgallerytrackerresultset_p.h
@@ -58,7 +58,7 @@
 #include "qgallerydbusinterface_p.h"
 #include "qgallerytrackerlistcolumn_p.h"
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QDBusPendingCallWatcher;
 class QGalleryDBusInterfaceFactory;
@@ -163,6 +163,6 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_parseFinished())
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 #endif
diff --git a/src/gallery/tracker/qgallerytrackerresultset_p_p.h b/src/gallery/tracker/qgallerytrackerresultset_p_p.h
index de47f53..91f3cf4 100644
--- a/src/gallery/tracker/qgallerytrackerresultset_p_p.h
+++ b/src/gallery/tracker/qgallerytrackerresultset_p_p.h
@@ -70,7 +70,7 @@
 #include <QtCore/qwaitcondition.h>
 #include <QtDBus/qdbusargument.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QGalleryTrackerResultSetThread : public QThread
 {
@@ -378,11 +378,11 @@ public:
     void _q_editFinished(QGalleryTrackerMetaDataEdit *edit);
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
-template <> inline void qSwap<QT_ADDON_GELLERY_PREPEND_NAMESPACE(QGalleryTrackerResultSetPrivate::Row)>(
-        QT_ADDON_GELLERY_PREPEND_NAMESPACE(QGalleryTrackerResultSetPrivate::Row) &row1,
-        QT_ADDON_GELLERY_PREPEND_NAMESPACE(QGalleryTrackerResultSetPrivate::Row) &row2)
+template <> inline void qSwap<QT_DOCGALLERY_PREPEND_NAMESPACE(QGalleryTrackerResultSetPrivate::Row)>(
+        QT_DOCGALLERY_PREPEND_NAMESPACE(QGalleryTrackerResultSetPrivate::Row) &row1,
+        QT_DOCGALLERY_PREPEND_NAMESPACE(QGalleryTrackerResultSetPrivate::Row) &row2)
 {
     typedef QVector<QVariant>::iterator iterator;
 
@@ -392,5 +392,5 @@ template <> inline void qSwap<QT_ADDON_GELLERY_PREPEND_NAMESPACE(QGalleryTracker
 
 #endif
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QGalleryTrackerResultSetPrivate::Flags))
+Q_DECLARE_OPERATORS_FOR_FLAGS(QT_DOCGALLERY_PREPEND_NAMESPACE(QGalleryTrackerResultSetPrivate::Flags))
 
diff --git a/src/gallery/tracker/qgallerytrackerschema.cpp b/src/gallery/tracker/qgallerytrackerschema.cpp
index c4c84d5..951f51d 100644
--- a/src/gallery/tracker/qgallerytrackerschema.cpp
+++ b/src/gallery/tracker/qgallerytrackerschema.cpp
@@ -57,7 +57,7 @@
 #include <QtCore/qxmlstream.h>
 #include <QtCore/qdebug.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 namespace
 {
@@ -1549,4 +1549,4 @@ QString QGalleryTrackerSchema::serviceForType( const QString &galleryType )
     return QString();
 }
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
diff --git a/src/gallery/tracker/qgallerytrackerschema_p.h b/src/gallery/tracker/qgallerytrackerschema_p.h
index 283de98..b9dbf98 100644
--- a/src/gallery/tracker/qgallerytrackerschema_p.h
+++ b/src/gallery/tracker/qgallerytrackerschema_p.h
@@ -61,7 +61,7 @@
 
 #include <QtCore/qstringlist.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 
 class QGalleryDBusInterfaceFactory;
@@ -131,6 +131,6 @@ private:
     const int m_itemIndex;
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 #endif
diff --git a/src/gallery/tracker/qgallerytrackertyperesultset.cpp b/src/gallery/tracker/qgallerytrackertyperesultset.cpp
index 3bdd5ee..052244e 100644
--- a/src/gallery/tracker/qgallerytrackertyperesultset.cpp
+++ b/src/gallery/tracker/qgallerytrackertyperesultset.cpp
@@ -53,7 +53,7 @@
 
 Q_DECLARE_METATYPE(QVector<QStringList>)
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QGalleryTrackerTypeResultSetPrivate : public QGalleryResultSetPrivate
 {
@@ -343,6 +343,6 @@ void QGalleryTrackerTypeResultSet::refresh(int serviceId)
     }
 }
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 #include "moc_qgallerytrackertyperesultset_p.cpp"
diff --git a/src/gallery/tracker/qgallerytrackertyperesultset_p.h b/src/gallery/tracker/qgallerytrackertyperesultset_p.h
index 15265cf..853e297 100644
--- a/src/gallery/tracker/qgallerytrackertyperesultset_p.h
+++ b/src/gallery/tracker/qgallerytrackertyperesultset_p.h
@@ -60,7 +60,7 @@
 #include <QtDBus/qdbusinterface.h>
 #include <QtDBus/qdbuspendingcall.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 struct QGalleryTrackerTypeResultSetArguments
 {
@@ -112,6 +112,6 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_queryFinished(QDBusPendingCallWatcher *))
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
 #endif
diff --git a/src/imports/gallery/qdeclarativedocumentgallery.cpp b/src/imports/gallery/qdeclarativedocumentgallery.cpp
index 4e2a0cd..001692a 100644
--- a/src/imports/gallery/qdeclarativedocumentgallery.cpp
+++ b/src/imports/gallery/qdeclarativedocumentgallery.cpp
@@ -47,7 +47,7 @@
 #include <QtQml/qqmlcontext.h>
 #include <QtQml/qqmlengine.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 Q_GLOBAL_STATIC(QDocumentGallery, qt_declarativeDocumentGalleryInstance)
 
@@ -85,4 +85,4 @@ QAbstractGallery *QDeclarativeDocumentGallery::gallery(QObject *object)
 
 #include "moc_qdeclarativedocumentgallery.cpp"
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
diff --git a/src/imports/gallery/qdeclarativedocumentgallery.h b/src/imports/gallery/qdeclarativedocumentgallery.h
index 7680d56..170c11f 100644
--- a/src/imports/gallery/qdeclarativedocumentgallery.h
+++ b/src/imports/gallery/qdeclarativedocumentgallery.h
@@ -57,7 +57,7 @@
 
 #include <QtCore/qcoreevent.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QDeclarativeDocumentGallery : public QObject
 {
@@ -88,8 +88,8 @@ public:
     static QAbstractGallery *gallery(QObject *object);
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeDocumentGallery::ItemType))
+Q_DECLARE_METATYPE(QT_DOCGALLERY_PREPEND_NAMESPACE(QDeclarativeDocumentGallery::ItemType))
 
 #endif
diff --git a/src/imports/gallery/qdeclarativegallery.cpp b/src/imports/gallery/qdeclarativegallery.cpp
index 3c513c7..5e849b6 100644
--- a/src/imports/gallery/qdeclarativegallery.cpp
+++ b/src/imports/gallery/qdeclarativegallery.cpp
@@ -50,7 +50,7 @@
 #include "qdeclarativegalleryquerymodel.h"
 #include "qdeclarativegallerytype.h"
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QGalleryDeclarativeModule : public QQmlExtensionPlugin
 {
@@ -60,7 +60,7 @@ class QGalleryDeclarativeModule : public QQmlExtensionPlugin
 public:
     virtual void registerTypes(const char *uri)
     {
-        Q_ASSERT(QLatin1String(uri) == QLatin1String("QtAddOn.gallery"));
+        Q_ASSERT(QLatin1String(uri) == QLatin1String("QtDocGallery"));
 
         qRegisterMetaType<QDeclarativeDocumentGallery::ItemType>();
 
@@ -87,4 +87,4 @@ public:
 
 #include "qdeclarativegallery.moc"
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
diff --git a/src/imports/gallery/qdeclarativegalleryfilter.cpp b/src/imports/gallery/qdeclarativegalleryfilter.cpp
index 17fbe2e..851132f 100644
--- a/src/imports/gallery/qdeclarativegalleryfilter.cpp
+++ b/src/imports/gallery/qdeclarativegalleryfilter.cpp
@@ -43,7 +43,7 @@
 
 #include <qgalleryfilter.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 void QDeclarativeGalleryValueFilter::setValue(const QVariant &value)
 {
@@ -624,4 +624,4 @@ QGalleryFilter QDeclarativeGalleryFilterIntersection::filter() const
 
 #include "moc_qdeclarativegalleryfilter.cpp"
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
diff --git a/src/imports/gallery/qdeclarativegalleryfilter.h b/src/imports/gallery/qdeclarativegalleryfilter.h
index 327676a..eb7c062 100644
--- a/src/imports/gallery/qdeclarativegalleryfilter.h
+++ b/src/imports/gallery/qdeclarativegalleryfilter.h
@@ -56,7 +56,7 @@
 #include <qgalleryfilter.h>
 #include <QtQml/qqml.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QGalleryFilter;
 
@@ -309,19 +309,19 @@ public:
     QGalleryFilter filter() const;
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
-
-QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeGalleryFilterBase))
-QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeGalleryEqualsFilter))
-QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeGalleryLessThanFilter))
-QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeGalleryLessThanEqualsFilter))
-QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeGalleryGreaterThanFilter))
-QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeGalleryGreaterThanEqualsFilter))
-QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeGalleryContainsFilter))
-QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeGalleryStartsWithFilter))
-QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeGalleryEndsWithFilter))
-QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeGalleryWildcardFilter))
-QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeGalleryFilterUnion))
-QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeGalleryFilterIntersection))
+QT_DOCGALLERY_END_NAMESPACE
+
+QML_DECLARE_TYPE(QT_DOCGALLERY_PREPEND_NAMESPACE(QDeclarativeGalleryFilterBase))
+QML_DECLARE_TYPE(QT_DOCGALLERY_PREPEND_NAMESPACE(QDeclarativeGalleryEqualsFilter))
+QML_DECLARE_TYPE(QT_DOCGALLERY_PREPEND_NAMESPACE(QDeclarativeGalleryLessThanFilter))
+QML_DECLARE_TYPE(QT_DOCGALLERY_PREPEND_NAMESPACE(QDeclarativeGalleryLessThanEqualsFilter))
+QML_DECLARE_TYPE(QT_DOCGALLERY_PREPEND_NAMESPACE(QDeclarativeGalleryGreaterThanFilter))
+QML_DECLARE_TYPE(QT_DOCGALLERY_PREPEND_NAMESPACE(QDeclarativeGalleryGreaterThanEqualsFilter))
+QML_DECLARE_TYPE(QT_DOCGALLERY_PREPEND_NAMESPACE(QDeclarativeGalleryContainsFilter))
+QML_DECLARE_TYPE(QT_DOCGALLERY_PREPEND_NAMESPACE(QDeclarativeGalleryStartsWithFilter))
+QML_DECLARE_TYPE(QT_DOCGALLERY_PREPEND_NAMESPACE(QDeclarativeGalleryEndsWithFilter))
+QML_DECLARE_TYPE(QT_DOCGALLERY_PREPEND_NAMESPACE(QDeclarativeGalleryWildcardFilter))
+QML_DECLARE_TYPE(QT_DOCGALLERY_PREPEND_NAMESPACE(QDeclarativeGalleryFilterUnion))
+QML_DECLARE_TYPE(QT_DOCGALLERY_PREPEND_NAMESPACE(QDeclarativeGalleryFilterIntersection))
 
 #endif
diff --git a/src/imports/gallery/qdeclarativegalleryitem.cpp b/src/imports/gallery/qdeclarativegalleryitem.cpp
index 29916a2..cc0dd74 100644
--- a/src/imports/gallery/qdeclarativegalleryitem.cpp
+++ b/src/imports/gallery/qdeclarativegalleryitem.cpp
@@ -47,7 +47,7 @@
 #include <QtQml/qqmlinfo.h>
 #include <QtQml/qqmlpropertymap.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 QDeclarativeGalleryItem::QDeclarativeGalleryItem(QObject *parent)
     : QObject(parent)
@@ -261,7 +261,7 @@ void QDeclarativeGalleryItem::_q_metaDataChanged(const QList<int> &keys)
     \qmltype DocumentGalleryItem
     \instantiates QDeclarativeDocumentGalleryItem
 
-    \inmodule QtAddOnGallery
+    \inmodule QtDocGallery
     \ingroup qml-gallery
 
     \brief The DocumentGalleryItem element allows you to request information
@@ -398,4 +398,4 @@ QDeclarativeDocumentGallery::ItemType QDeclarativeDocumentGalleryItem::itemType(
 
 #include "moc_qdeclarativegalleryitem.cpp"
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
diff --git a/src/imports/gallery/qdeclarativegalleryitem.h b/src/imports/gallery/qdeclarativegalleryitem.h
index 57880c6..4d9c181 100644
--- a/src/imports/gallery/qdeclarativegalleryitem.h
+++ b/src/imports/gallery/qdeclarativegalleryitem.h
@@ -62,7 +62,7 @@
 #include <QtQml/qqml.h>
 #include <QtQml/qqmlpropertymap.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QDeclarativeGalleryItem : public QObject, public QQmlParserStatus
 {
@@ -173,8 +173,8 @@ Q_SIGNALS:
     void itemTypeChanged();
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
-QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeDocumentGalleryItem))
+QML_DECLARE_TYPE(QT_DOCGALLERY_PREPEND_NAMESPACE(QDeclarativeDocumentGalleryItem))
 
 #endif
diff --git a/src/imports/gallery/qdeclarativegalleryquerymodel.cpp b/src/imports/gallery/qdeclarativegalleryquerymodel.cpp
index e4bf4b7..b6af536 100644
--- a/src/imports/gallery/qdeclarativegalleryquerymodel.cpp
+++ b/src/imports/gallery/qdeclarativegalleryquerymodel.cpp
@@ -49,7 +49,7 @@
 #include <QtQml/qjsengine.h>
 #include <QtCore/qcoreapplication.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 QDeclarativeGalleryQueryModel::QDeclarativeGalleryQueryModel(QObject *parent)
     : QAbstractListModel(parent)
@@ -504,7 +504,7 @@ void QDeclarativeGalleryQueryModel::_q_itemsChanged(int index, int count)
     \qmltype DocumentGalleryModel
     \instantiates QDeclarativeDocumentGalleryModel
 
-    \inmodule QtAddOnGallery
+    \inmodule QtDocGallery
 
     \brief The DocumentGalleryModel element is used to specify a model
     containing items from the document gallery.
@@ -762,4 +762,4 @@ QVariant QDeclarativeDocumentGalleryModel::itemType(const QString &type) const
 
 #include "moc_qdeclarativegalleryquerymodel.cpp"
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
diff --git a/src/imports/gallery/qdeclarativegalleryquerymodel.h b/src/imports/gallery/qdeclarativegalleryquerymodel.h
index 2d944d1..fc1a056 100644
--- a/src/imports/gallery/qdeclarativegalleryquerymodel.h
+++ b/src/imports/gallery/qdeclarativegalleryquerymodel.h
@@ -63,7 +63,7 @@
 #include <QtQml/qqml.h>
 #include <QtQml/qjsvalue.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QDeclarativeGalleryFilterBase;
 
@@ -229,9 +229,9 @@ protected:
     QVariant itemType(const QString &type) const;
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
-QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeDocumentGalleryModel))
+QML_DECLARE_TYPE(QT_DOCGALLERY_PREPEND_NAMESPACE(QDeclarativeDocumentGalleryModel))
 
 #endif
 
diff --git a/src/imports/gallery/qdeclarativegallerytype.cpp b/src/imports/gallery/qdeclarativegallerytype.cpp
index c28667c..43d004a 100644
--- a/src/imports/gallery/qdeclarativegallerytype.cpp
+++ b/src/imports/gallery/qdeclarativegallerytype.cpp
@@ -48,7 +48,7 @@
 #include <QtQml/qqmlinfo.h>
 #include <QtQml/qqmlpropertymap.h>
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 QDeclarativeGalleryType::QDeclarativeGalleryType(QObject *parent)
     : QObject(parent)
@@ -244,7 +244,7 @@ void QDeclarativeGalleryType::_q_metaDataChanged(const QList<int> &keys)
     \qmltype DocumentGalleryType
     \instantiates QDeclarativeDocumentGalleryType
 
-    \inmodule QtAddOnGallery
+    \inmodule QtDocGallery
     \ingroup qml-gallery
 
     \brief The DocumentGalleryType element allows you to request information
@@ -386,4 +386,4 @@ void QDeclarativeDocumentGalleryType::setItemType(QDeclarativeDocumentGallery::I
 
 #include "moc_qdeclarativegallerytype.cpp"
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
diff --git a/src/imports/gallery/qdeclarativegallerytype.h b/src/imports/gallery/qdeclarativegallerytype.h
index 0088fdc..f612eee 100644
--- a/src/imports/gallery/qdeclarativegallerytype.h
+++ b/src/imports/gallery/qdeclarativegallerytype.h
@@ -63,7 +63,7 @@
 #include "qdeclarativedocumentgallery.h"
 #include "qdeclarativegalleryfilter.h"
 
-QT_ADDON_GALLERY_BEGIN_NAMESPACE
+QT_DOCGALLERY_BEGIN_NAMESPACE
 
 class QDeclarativeGalleryType : public QObject, public QQmlParserStatus
 {
@@ -166,8 +166,8 @@ Q_SIGNALS:
 
 };
 
-QT_ADDON_GALLERY_END_NAMESPACE
+QT_DOCGALLERY_END_NAMESPACE
 
-QML_DECLARE_TYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QDeclarativeDocumentGalleryType))
+QML_DECLARE_TYPE(QT_DOCGALLERY_PREPEND_NAMESPACE(QDeclarativeDocumentGalleryType))
 
 #endif
diff --git a/tests/auto/qdocumentgallery/tst_qdocumentgallery.cpp b/tests/auto/qdocumentgallery/tst_qdocumentgallery.cpp
index 67b0b20..589439d 100644
--- a/tests/auto/qdocumentgallery/tst_qdocumentgallery.cpp
+++ b/tests/auto/qdocumentgallery/tst_qdocumentgallery.cpp
@@ -45,9 +45,9 @@
 
 #include <QtTest/QtTest>
 
-Q_DECLARE_METATYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QGalleryProperty::Attributes))
+Q_DECLARE_METATYPE(QT_DOCGALLERY_PREPEND_NAMESPACE(QGalleryProperty::Attributes))
 
-QT_ADDON_USE_GALLERY_NAMESPACE
+QT_USE_DOCGALLERY_NAMESPACE
 
 class tst_QDocumentGallery : public QObject
 {
diff --git a/tests/auto/qgalleryabstractrequest/tst_qgalleryabstractrequest.cpp b/tests/auto/qgalleryabstractrequest/tst_qgalleryabstractrequest.cpp
index 74b704a..a4ef2d5 100644
--- a/tests/auto/qgalleryabstractrequest/tst_qgalleryabstractrequest.cpp
+++ b/tests/auto/qgalleryabstractrequest/tst_qgalleryabstractrequest.cpp
@@ -48,7 +48,7 @@
 
 #include <QtTest/QtTest>
 
-QT_ADDON_USE_GALLERY_NAMESPACE
+QT_USE_DOCGALLERY_NAMESPACE
 
 Q_DECLARE_METATYPE(QGalleryAbstractRequest::State)
 
diff --git a/tests/auto/qgalleryabstractresponse/tst_qgalleryabstractresponse.cpp b/tests/auto/qgalleryabstractresponse/tst_qgalleryabstractresponse.cpp
index 105b434..2a4ccbc 100644
--- a/tests/auto/qgalleryabstractresponse/tst_qgalleryabstractresponse.cpp
+++ b/tests/auto/qgalleryabstractresponse/tst_qgalleryabstractresponse.cpp
@@ -45,7 +45,7 @@
 
 #include <QtTest/QtTest>
 
-QT_ADDON_USE_GALLERY_NAMESPACE
+QT_USE_DOCGALLERY_NAMESPACE
 
 class tst_QGalleryAbstractResponse : public QObject
 {
diff --git a/tests/auto/qgalleryfilter/tst_qgalleryfilter.cpp b/tests/auto/qgalleryfilter/tst_qgalleryfilter.cpp
index 27f5575..1185dd0 100644
--- a/tests/auto/qgalleryfilter/tst_qgalleryfilter.cpp
+++ b/tests/auto/qgalleryfilter/tst_qgalleryfilter.cpp
@@ -48,11 +48,11 @@
 #include <QtTest/QtTest>
 
 Q_DECLARE_METATYPE(QT_PREPEND_NAMESPACE(QVariant))
-Q_DECLARE_METATYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QGalleryFilter))
-Q_DECLARE_METATYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QGalleryFilter::Comparator))
-Q_DECLARE_METATYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QGalleryMetaDataFilter))
+Q_DECLARE_METATYPE(QT_DOCGALLERY_PREPEND_NAMESPACE(QGalleryFilter))
+Q_DECLARE_METATYPE(QT_DOCGALLERY_PREPEND_NAMESPACE(QGalleryFilter::Comparator))
+Q_DECLARE_METATYPE(QT_DOCGALLERY_PREPEND_NAMESPACE(QGalleryMetaDataFilter))
 
-QT_ADDON_USE_GALLERY_NAMESPACE
+QT_USE_DOCGALLERY_NAMESPACE
 
 class tst_QGalleryFilter : public QObject
 {
diff --git a/tests/auto/qgalleryitemrequest/tst_qgalleryitemrequest.cpp b/tests/auto/qgalleryitemrequest/tst_qgalleryitemrequest.cpp
index bbec930..dedc1de 100644
--- a/tests/auto/qgalleryitemrequest/tst_qgalleryitemrequest.cpp
+++ b/tests/auto/qgalleryitemrequest/tst_qgalleryitemrequest.cpp
@@ -53,7 +53,7 @@
 
 Q_DECLARE_METATYPE(QList<int>)
 
-QT_ADDON_USE_GALLERY_NAMESPACE
+QT_USE_DOCGALLERY_NAMESPACE
 
 Q_DECLARE_METATYPE(QGalleryResultSet*)
 
diff --git a/tests/auto/qgalleryquerymodel/tst_qgalleryquerymodel.cpp b/tests/auto/qgalleryquerymodel/tst_qgalleryquerymodel.cpp
index 65fa505..c1e7ab0 100644
--- a/tests/auto/qgalleryquerymodel/tst_qgalleryquerymodel.cpp
+++ b/tests/auto/qgalleryquerymodel/tst_qgalleryquerymodel.cpp
@@ -53,7 +53,7 @@
 
 Q_DECLARE_METATYPE(QModelIndex)
 
-QT_ADDON_USE_GALLERY_NAMESPACE
+QT_USE_DOCGALLERY_NAMESPACE
 
 Q_DECLARE_METATYPE(QGalleryAbstractRequest::State)
 
diff --git a/tests/auto/qgalleryqueryrequest/tst_qgalleryqueryrequest.cpp b/tests/auto/qgalleryqueryrequest/tst_qgalleryqueryrequest.cpp
index 17d463d..5483f17 100644
--- a/tests/auto/qgalleryqueryrequest/tst_qgalleryqueryrequest.cpp
+++ b/tests/auto/qgalleryqueryrequest/tst_qgalleryqueryrequest.cpp
@@ -51,7 +51,7 @@
 
 #include <QtTest/QtTest>
 
-QT_ADDON_USE_GALLERY_NAMESPACE
+QT_USE_DOCGALLERY_NAMESPACE
 
 Q_DECLARE_METATYPE(QGalleryResultSet*)
 
diff --git a/tests/auto/qgalleryresource/tst_qgalleryresource.cpp b/tests/auto/qgalleryresource/tst_qgalleryresource.cpp
index 0b6c7a5..d7d0418 100644
--- a/tests/auto/qgalleryresource/tst_qgalleryresource.cpp
+++ b/tests/auto/qgalleryresource/tst_qgalleryresource.cpp
@@ -45,9 +45,9 @@
 
 #include <QtTest/QtTest>
 
-Q_DECLARE_METATYPE(QT_ADDON_GELLERY_PREPEND_NAMESPACE(QGalleryResource))
+Q_DECLARE_METATYPE(QT_DOCGALLERY_PREPEND_NAMESPACE(QGalleryResource))
 
-QT_ADDON_USE_GALLERY_NAMESPACE
+QT_USE_DOCGALLERY_NAMESPACE
 
 class tst_QGalleryResource : public QObject
 {
diff --git a/tests/auto/qgallerytyperequest/tst_qgallerytyperequest.cpp b/tests/auto/qgallerytyperequest/tst_qgallerytyperequest.cpp
index 94dcf2d..66e2dfc 100644
--- a/tests/auto/qgallerytyperequest/tst_qgallerytyperequest.cpp
+++ b/tests/auto/qgallerytyperequest/tst_qgallerytyperequest.cpp
@@ -53,7 +53,7 @@
 
 Q_DECLARE_METATYPE(QList<int>)
 
-QT_ADDON_USE_GALLERY_NAMESPACE
+QT_USE_DOCGALLERY_NAMESPACE
 
 Q_DECLARE_METATYPE(QGalleryResultSet*)