Doc: Move the doc artifacts outside of the submodule directory

The qdocconf now lives in 'src/doc' because the documentation
project defined by it covers the whole Qt 3D module. This change
enables qmake to use 'qt3d' as the output directory for doc make
targets. The new 'doc' directory also includes the relevant images,
snippets, and the qdoc files.

Change-Id: Ibc6d0912f8b1e665767e97630b3e5509e10c5710
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>

src/collision/doc/qt3dcollision.qdocconf

@@ -1,62 +0,0 @@
-include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
-
-project                 = Qt3DCollision
-description             = Qt3D Collision Reference Documentation
-version                 = $QT_VERSION
-
-examplesinstallpath     = qt3d
-
-qhp.projects            = Qt3DCollision
-
-qhp.Qt3DCollision.file                = qt3dcollision.qhp
-qhp.Qt3DCollision.namespace           = org.qt-project.qt3dcollision.$QT_VERSION_TAG
-qhp.Qt3DCollision.virtualFolder       = qt3dcollision
-qhp.Qt3DCollision.indexTitle          = Qt3D Module
-qhp.Qt3DCollision.indexRoot           =
-
-qhp.Qt3DCollision.filterAttributes                   = qt3dcollision $QT_VERSION qtrefdoc
-qhp.Qt3DCollision.customFilters.Qt.name              = Qt3DCollision $QT_VERSION
-qhp.Qt3DCollision.customFilters.Qt.filterAttributes  = qt3dcollision $QT_VERSION
-
-qhp.Qt3DCollision.subprojects                    = classes qmltypes
-
-qhp.Qt3DCollision.subprojects.classes.title      = C++ Classes
-qhp.Qt3DCollision.subprojects.classes.indexTitle = Qt3D Collision C++ Classes
-qhp.Qt3DCollision.subprojects.classes.selectors  = class fake:headerfile
-qhp.Qt3DCollision.subprojects.classes.sortPages  = true
-
-qhp.Qt3DCollision.subprojects.qmltypes.title      = QML Types
-qhp.Qt3DCollision.subprojects.qmltypes.indexTitle = Qt3D Collision QML Types
-qhp.Qt3DCollision.subprojects.qmltypes.selectors  = qmlclass
-qhp.Qt3DCollision.subprojects.qmltypes.sortPages  = true
-
-tagfile                 = ../../../doc/qt3dcollision/qt3dcollision.tags
-
-depends                 += qtcore qtqml qtquick qtdoc qt3drenderer
-
-headerdirs += .. \
-              ../../plugins \
-              ../../quick3d/quick3d \
-              ../../input
-
-sourcedirs += .. \
-              ../../plugins \
-              ../../quick3d/quick3d \
-              ../../input
-
-exampledirs += src/snippets
-
-#excludedirs +=
-
-imagedirs   += images \
-               ../../../examples/qt3d/shadow-map-qml/doc/images
-
-Cpp.ignoretokens     += QT3DCOLLISION_PRIVATE_EXPORT \
-                        QT3DINPUTSHARED_EXPORT \
-                        QT3DCOLLISIONSHARED_EXPORT
-
-Cpp.ignoredirectives += Q_DECLARE_LOGGING_CATEGORY
-
-navigation.landingpage = "Qt3D Module"
-navigation.cppclassespage = "Qt3D Collision C++ Classes"
-navigation.qmltypespage = "Qt3D Collision QML Types"

src/core/core.pro

@@ -11,8 +11,6 @@ DEFINES += QT3DCORE_LIBRARY
 #    DEFINES += THREAD_WEAVER
 #}
 
-QMAKE_DOCS = $$PWD/doc/qt3d.qdocconf
-
 gcov {
     CONFIG += static
     QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage

src/doc/doc.pro

@@ -0,0 +1,3 @@
+TEMPLATE = aux
+
+QMAKE_DOCS = $$PWD/qt3d.qdocconf

src/doc/qt3d.qdocconf

@@ -34,25 +34,27 @@ tagfile                 = qt3d.tags
 
 depends                 += qtcore qtqml qtquick qtdoc
 
-headerdirs += .. \
-              ../../render \
-              ../../collision \
-              ../../logic \
-              ../../plugins \
-              ../../quick3d/quick3d \
-              ../../input
+headerdirs += . \
+              ../render \
+              ../core \
+              ../collision \
+              ../logic \
+              ../plugins \
+              ../quick3d/quick3d \
+              ../input
 
 
-sourcedirs += .. \
-              ../../render \
-              ../../collision \
-              ../../logic \
-              ../../plugins \
-              ../../quick3d/quick3d \
-              ../../input
+sourcedirs += . \
+              ../render \
+              ../core \
+              ../collision \
+              ../logic \
+              ../plugins \
+              ../quick3d/quick3d \
+              ../input
 
-exampledirs += ../../../examples/qt3d \
-               src/snippets
+exampledirs += ../../examples/qt3d \
+               snippets
 
 examplesinstallpath = qt3d
 
@@ -62,11 +64,10 @@ examples.imageextensions      += "*.png"
 #excludedirs +=
 
 imagedirs   += images \
-               ../../render/doc/images \
-               ../../../examples/qt3d/shadow-map-qml/doc/images \
-               ../../../examples/qt3d/basicshapes-cpp/doc/images \
-               ../../../examples/qt3d/planets-qml/doc/images \
-               ../../../examples/qt3d/wireframe/doc/images
+               ../../examples/qt3d/shadow-map-qml/doc/images \
+               ../../examples/qt3d/basicshapes-cpp/doc/images \
+               ../../examples/qt3d/planets-qml/doc/images \
+               ../../examples/qt3d/wireframe/doc/images
 
 Cpp.ignoretokens     += QT3DCORE_PRIVATE_EXPORT \
                         QT3DINPUTSHARED_EXPORT \

src/src.pro

@@ -73,6 +73,7 @@ SUBDIRS += \
     src_quick3d_imports_input \
     src_quick3d_imports_logic \
     src_quick3d_imports_collision \
-    src_plugins_sceneparsers
+    src_plugins_sceneparsers \
+    doc