Rename the created module from QtAddonGallery to QtDocGallery

This brings things more in line with the other Qt addons.

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

7 files changed, 32 insertions, 14 deletions

diff --git a/src/gallery/gallery.pro b/src/gallery/gallery.pro
index 88474cf..db1ce14 100644
--- a/src/gallery/gallery.pro
+++ b/src/gallery/gallery.pro
@@ -1,6 +1,7 @@
 load(qt_build_config)
 
-TARGET = QtAddOnGallery
+TARGET = QtDocGallery
+MODULE = docgallery
 QT = core
 
 load(qt_module)
diff --git a/src/gallery/qgalleryglobal.h b/src/gallery/qgalleryglobal.h
index 1104e05..81684aa 100644
--- a/src/gallery/qgalleryglobal.h
+++ b/src/gallery/qgalleryglobal.h
@@ -65,9 +65,22 @@
 #  define Q_GALLERY_EXPORT
 #endif
 
-#define QT_ADDON_GALLERY_BEGIN_NAMESPACE namespace QtAddOn { namespace Gallery {
-#define QT_ADDON_GALLERY_END_NAMESPACE } }
-#define QT_ADDON_USE_GALLERY_NAMESPACE using namespace QtAddOn::Gallery;
-#define QT_ADDON_GELLERY_PREPEND_NAMESPACE(name) ::QtAddOn::Gallery::name
+#if defined(QT_NAMESPACE)
+#define QT_DOCGALLERY_BEGIN_NAMESPACE namespace QT_NAMESPACE { namespace QDocGallery {
+#define QT_DOCGALLERY_END_NAMESPACE } }
+#define QT_USE_DOCGALLERY_NAMESPACE using namespace QT_NAMESPACE::QDocGallery;
+#define QT_DOCGALLERY_PREPEND_NAMESPACE(name) ::QT_NAMESPACE::QDocGallery::name
+#else
+#define QT_DOCGALLERY_BEGIN_NAMESPACE namespace QDocGallery {
+#define QT_DOCGALLERY_END_NAMESPACE }
+#define QT_USE_DOCGALLERY_NAMESPACE using namespace QDocGallery;
+#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/imports/gallery/gallery.pro b/src/imports/gallery/gallery.pro
index 676cf34..5661eb0 100644
--- a/src/imports/gallery/gallery.pro
+++ b/src/imports/gallery/gallery.pro
@@ -1,6 +1,8 @@
-TARGETPATH = QtAddOn/gallery
+CXX_MODULE = docgallery
+TARGET     = docgalleryplugin
+TARGETPATH = QtDocGallery
 
-QT += qml gallery
+QT += qml docgallery
 
 HEADERS += \
     qdeclarativedocumentgallery.h \
diff --git a/sync.profile b/sync.profile
index 450267d..574c093 100644
--- a/sync.profile
+++ b/sync.profile
@@ -1,5 +1,5 @@
 %modules = ( # path to module name map
-    "QtAddOnGallery" => "$basedir/src/gallery",
+    "QtDocGallery" => "$basedir/src/gallery",
 );
 %moduleheaders = ( # restrict the module headers to those found in relative path
 );
diff --git a/tests/auto/auto.pri b/tests/auto/auto.pri
index acd2b80..cbff713 100644
--- a/tests/auto/auto.pri
+++ b/tests/auto/auto.pri
@@ -1,4 +1,4 @@
 TEMPLATE = app
 CONFIG += qt warn_on console depend_includepath testcase
 
-QT += testlib gallery
+QT += testlib docgallery
diff --git a/tests/auto/cmake/test_modules/CMakeLists.txt b/tests/auto/cmake/test_modules/CMakeLists.txt
index 90ddee0..9d425df 100644
--- a/tests/auto/cmake/test_modules/CMakeLists.txt
+++ b/tests/auto/cmake/test_modules/CMakeLists.txt
@@ -5,19 +5,19 @@ project(test_modules)
 
 find_package(Qt5Core REQUIRED)
 
-find_package(Qt5AddOnGallery REQUIRED)
+find_package(Qt5DocGallery REQUIRED)
 
 include_directories(
-  ${Qt5AddOnGallery_INCLUDE_DIRS}
+  ${Qt5DocGallery_INCLUDE_DIRS}
 )
 
 add_definitions(
-  ${Qt5AddOnGallery_DEFINITIONS}
+  ${Qt5DocGallery_DEFINITIONS}
 )
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
 
 add_executable(mainapp main.cpp)
 target_link_libraries(mainapp
-  ${Qt5AddOnGallery_LIBRARIES}
+  ${Qt5DocGallery_LIBRARIES}
 )
diff --git a/tests/auto/cmake/test_modules/main.cpp b/tests/auto/cmake/test_modules/main.cpp
index 82705fa..a7a9b65 100644
--- a/tests/auto/cmake/test_modules/main.cpp
+++ b/tests/auto/cmake/test_modules/main.cpp
@@ -41,9 +41,11 @@
 
 #include <QGalleryFilter>
 
+QT_USE_DOCGALLERY_NAMESPACE
+
 int main(int argc, char **argv)
 {
-    QtAddOn::Gallery::QGalleryFilter galleryFilter;
+    QGalleryFilter galleryFilter;
 
     return 0;
 }